Francois Gouget : testbot/LibvirtTool: Revert() does not need its own VM object.
Alexandre Julliard
julliard at winehq.org
Wed Feb 9 16:03:16 CST 2022
Module: tools
Branch: master
Commit: 769aa02afbc0f223376d984c1fe979b4827ee40a
URL: https://source.winehq.org/git/tools.git/?a=commit;h=769aa02afbc0f223376d984c1fe979b4827ee40a
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Tue Feb 8 23:43:24 2022 +0100
testbot/LibvirtTool: Revert() does not need its own VM object.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/bin/LibvirtTool.pl | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl
index 51ed8e7..b572d15 100755
--- a/testbot/bin/LibvirtTool.pl
+++ b/testbot/bin/LibvirtTool.pl
@@ -446,9 +446,9 @@ sub CheckOff()
return ChangeStatus("dirty", "off", "done");
}
-sub SetupTestAgentd($$$$)
+sub SetupTestAgentd($$$)
{
- my ($VM, $Booting, $UpgradeTestAgentd, $ResetStartCount) = @_;
+ my ($Booting, $UpgradeTestAgentd, $ResetStartCount) = @_;
Debug(Elapsed($Start), " Setting up the $VMKey TestAgent server\n");
LogMsg "Setting up the $VMKey TestAgent server\n";
@@ -571,7 +571,6 @@ sub CreateSnapshot($$)
sub Revert()
{
- my $VM = CreateVMs()->GetItem($VMKey);
if (!$Debug and $VM->Status ne "reverting")
{
Error("The VM is not ready to be reverted (". $VM->Status .")\n");
@@ -647,7 +646,7 @@ sub Revert()
# Set up the TestAgent server. Note that setting the locale will require a
# reboot so reset start.count in that case.
- SetupTestAgentd($VM, $Booting, ($CreateSnapshot or $SetLocale), $SetLocale);
+ SetupTestAgentd($Booting, ($CreateSnapshot or $SetLocale), $SetLocale);
if ($CreateSnapshot)
{
More information about the wine-cvs
mailing list