[tools 2/2] testbot/LibvirtTool: Use SetWinLocale's --vm option.
Francois Gouget
fgouget at codeweavers.com
Wed Apr 6 07:17:20 CDT 2022
This ensures SetWinLocale will use the right options to connect to the
VM's TestAgentd server.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
This fixes the deadlock that happened when using LibvirtTool to create
the locale-specific snapshots. The reason was that passing just the
hostname caused SetWinLocale try to establish a plain network connection
which is blocked by the firewall. This is also why I could not reproduce
the issue here: there's no firewall blocking access to my local VMs.
---
testbot/bin/LibvirtTool.pl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl
index bd676f03d..33760d365 100755
--- a/testbot/bin/LibvirtTool.pl
+++ b/testbot/bin/LibvirtTool.pl
@@ -719,7 +719,9 @@ sub CreateSnapshot($$$$)
if (@Locale)
{
Debug(Elapsed($Start), " Setting up the @Locale locale on $VMKey\n");
- my @Cmd = ("$BinDir/SetWinLocale", $VM->Hostname);
+ # Use the --vm option to make sure SetWinLocale uses the right TestAgent
+ # connection parameters: port, ssh tunneling, etc.
+ my @Cmd = ("$BinDir/SetWinLocale", "--vm", $VMKey);
if ($Config->{locale})
{
push @Cmd, "--default", $Config->{locale};
--
2.30.2
More information about the wine-devel
mailing list