October 2017 - Wine-commits

Zebediah Figura : msacm32: Don' t write cbSize if the format is WAVE_FORMAT_PCM.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 1089b1ab6c84f1fcec48f09c66fc59758ce3efea URL: http://source.winehq.org/git/wine.git/?a=commit;h=1089b1ab6c84f1fcec48f09c6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 1 14:16:43 2017 -0500 msacm32: Don't write cbSize if the format is WAVE_FORMAT_PCM. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4e0c3707c3af8019db2c41ed6287bdde6e0b6fd3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msacm32/format.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index de07cba..3f3ee54 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -78,7 +78,8 @@ static BOOL CALLBACK MSACM_FillFormatTagsCB(HACMDRIVERID hadid, afd.pwfx = HeapAlloc(MSACM_hHeap, 0, paftd->cbFormatSize); if (!afd.pwfx) return FALSE; afd.pwfx->wFormatTag = paftd->dwFormatTag; - afd.pwfx->cbSize = paftd->cbFormatSize; + if (paftd->dwFormatTag != WAVE_FORMAT_PCM) + afd.pwfx->cbSize = paftd->cbFormatSize - sizeof(WAVEFORMATEX); afd.cbwfx = paftd->cbFormatSize; for (i = 0; i < paftd->cStandardFormats; i++) {

1 0

Hans Leidekker : winhttp: Reset content length when a redirect creates a new connection.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 6d4d378b5d2f902d70468c9e7dfb71eff95d73b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d4d378b5d2f902d70468c9e7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 22 14:16:58 2017 +0200 winhttp: Reset content length when a redirect creates a new connection. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f2bb2064bfdf0e7b369f22c34d680dec6c12493c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winhttp/request.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index fc04794..97fd1de 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2349,9 +2349,9 @@ static BOOL handle_redirect( request_t *request, DWORD status ) netconn_close( &request->netconn ); if (!(ret = netconn_init( &request->netconn ))) goto end; + request->content_length = request->content_read = 0; request->read_pos = request->read_size = 0; - request->read_chunked = FALSE; - request->read_chunked_eof = FALSE; + request->read_chunked = request->read_chunked_eof = FALSE; } else heap_free( hostname );

1 0

Sebastian Lackner : ntoskrnl.exe: Add KeReleaseInStackQueuedSpinLock stub.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: b5ee94f0a436e8bed43b93a0cd9ac5c9aad1a555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ee94f0a436e8bed43b93a0c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Mar 7 16:01:48 2017 +0100 ntoskrnl.exe: Add KeReleaseInStackQueuedSpinLock stub. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 83b9fdb23b20f3b12d0364f5400c5a6d3840fa2b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hal/hal.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 13 +++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index f441ac5..414e49b 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -9,7 +9,7 @@ @ stub KeAcquireQueuedSpinLock @ stub KeAcquireQueuedSpinLockRaiseToSynch @ stub KeAcquireSpinLockRaiseToSynch -@ stub KeReleaseInStackQueuedSpinLock +@ stdcall -norelay KeReleaseInStackQueuedSpinLock(ptr) ntoskrnl.exe.KeReleaseInStackQueuedSpinLock @ stub KeReleaseQueuedSpinLock @ stub KeTryToAcquireQueuedSpinLock @ stub KeTryToAcquireQueuedSpinLockRaiseToSynch diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c2d3127..5a7f348 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3215,3 +3215,16 @@ void WINAPI KeAcquireInStackQueuedSpinLock( KSPIN_LOCK *spinlock, KLOCK_QUEUE_HA { FIXME( "stub: %p %p\n", spinlock, handle ); } + +/*********************************************************************** + * KeReleaseInStackQueuedSpinLock (NTOSKRNL.EXE.@) + */ +#ifdef DEFINE_FASTCALL1_ENTRYPOINT +DEFINE_FASTCALL1_ENTRYPOINT( KeReleaseInStackQueuedSpinLock ) +void WINAPI __regs_KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *handle ) +#else +void WINAPI KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *handle ) +#endif +{ + FIXME( "stub: %p\n", handle); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index cb92d80..53e3c94 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -43,6 +43,7 @@ @ stdcall -norelay IofCompleteRequest(ptr long) @ stdcall -norelay KeAcquireInStackQueuedSpinLock(ptr ptr) @ stub KeAcquireInStackQueuedSpinLockAtDpcLevel +@ stdcall -norelay KeReleaseInStackQueuedSpinLock(ptr) @ stub KeReleaseInStackQueuedSpinLockFromDpcLevel @ stub KeSetTimeUpdateNotifyRoutine @ stub KefAcquireSpinLockAtDpcLevel

1 0

Austin English : ntoskrnl.exe: Add KeReleaseSpinLock stub.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 87498d362da1796af34510f3f707a2380a26d1b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87498d362da1796af34510f3f… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jun 21 13:29:37 2017 -0500 ntoskrnl.exe: Add KeReleaseSpinLock stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 362ceb2e5625c2a2162c6c5b432a36fc45b7ca1c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hal/hal.spec | 2 +- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 414e49b..ae706e0 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -76,7 +76,7 @@ @ stub KeRaiseIrql @ stub KeRaiseIrqlToDpcLevel @ stub KeRaiseIrqlToSynchLevel -@ stub KeReleaseSpinLock +@ stdcall KeReleaseSpinLock(ptr long) ntoskrnl.exe.KeReleaseSpinLock @ stub KeStallExecutionProcessor @ stub READ_PORT_BUFFER_UCHAR @ stub READ_PORT_BUFFER_ULONG diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 5a7f348..3f945b6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3228,3 +3228,11 @@ void WINAPI KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *handle ) { FIXME( "stub: %p\n", handle); } + +/*********************************************************************** + * KeReleaseSpinLock (NTOSKRNL.EXE.@) + */ +VOID WINAPI KeReleaseSpinLock( KSPIN_LOCK *spinlock, KIRQL irql ) +{ + FIXME( "stub: %p %u\n", spinlock, irql ); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 53e3c94..20dadbc 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -591,6 +591,7 @@ @ stub KeReleaseMutant @ stdcall KeReleaseMutex(ptr long) @ stdcall KeReleaseSemaphore(ptr long long long) +@ stdcall KeReleaseSpinLock(ptr long) @ stub KeReleaseSpinLockFromDpcLevel @ stub KeRemoveByKeyDeviceQueue @ stub KeRemoveByKeyDeviceQueueIfBusy

1 0

Austin English : ntoskrnl: Add KeAcquireSpinLockRaiseToDpc stub.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 7ece76cb7a5d57d33b128152fd3a782910d542c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ece76cb7a5d57d33b128152f… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jun 15 14:41:19 2017 -0500 ntoskrnl: Add KeAcquireSpinLockRaiseToDpc stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0c3a2a67a2fe6d84d9db17468271ced18a018191) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 ++++++++++- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3f945b6..7cae375 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3226,7 +3226,16 @@ void WINAPI __regs_KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *handle ) void WINAPI KeReleaseInStackQueuedSpinLock( KLOCK_QUEUE_HANDLE *handle ) #endif { - FIXME( "stub: %p\n", handle); + FIXME( "stub: %p\n", handle ); +} + +/*********************************************************************** + * KeAcquireSpinLockRaiseToDpc (NTOSKRNL.EXE.@) + */ +KIRQL WINAPI KeAcquireSpinLockRaiseToDpc(KSPIN_LOCK *spinlock) +{ + FIXME( "stub: %p\n", spinlock ); + return 0; } /*********************************************************************** diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 20dadbc..4da6f4e 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -510,6 +510,7 @@ @ stdcall Ke386SetIoAccessMap(long ptr) @ stub KeAcquireInterruptSpinLock @ stub KeAcquireSpinLockAtDpcLevel +@ stdcall -arch=x86_64 KeAcquireSpinLockRaiseToDpc(ptr) @ stub KeAddSystemServiceTable @ stub KeAreApcsDisabled @ stub KeAttachProcess

1 0

Alistair Leslie-Hughes : dplayx: Implement IDirectPlay4 EnumConnections.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: dc2d790deeba6c3b0b13f24c89ee1d26e4cdd461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc2d790deeba6c3b0b13f24c8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 8 05:37:40 2017 +0000 dplayx: Implement IDirectPlay4 EnumConnections. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2ef274b6087feeefdeb2750bf119a58b50c64046) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dplayx/dplay.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 92062d3..845c840 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -4482,8 +4482,8 @@ static HRESULT WINAPI IDirectPlay4Impl_EnumConnections( IDirectPlay4 *iface, const GUID *application, LPDPENUMCONNECTIONSCALLBACK enumcb, void *context, DWORD flags ) { IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); - FIXME( "(%p)->(%p,%p,%p,0x%08x): stub\n", This, application, enumcb, context, flags ); - return DP_OK; + return IDirectPlayX_EnumConnections( &This->IDirectPlay4A_iface, application, enumcb, context, + flags ); } static HRESULT WINAPI IDirectPlay3AImpl_EnumGroupsInGroup( IDirectPlay3A *iface, DPID group,

1 0

Henri Verbeet : wined3d: Only warn about 0 stencil ops in gl_stencil_op().
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: f1d111d99a71dc0341089ef0c651dc5f6cdfac2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1d111d99a71dc0341089ef0c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 25 12:04:06 2017 +0200 wined3d: Only warn about 0 stencil ops in gl_stencil_op(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 059784221822f00dde5810f2c8a1e4b08f862246) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/state.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3c0bb5e..d61fa23 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -827,7 +827,10 @@ static GLenum gl_stencil_op(enum wined3d_stencil_op op) case WINED3D_STENCIL_OP_DECR: return GL_DECR_WRAP; default: - FIXME("Unrecognized stencil op %#x.\n", op); + if (!op) + WARN("Unrecognized stencil op %#x.\n", op); + else + FIXME("Unrecognized stencil op %#x.\n", op); return GL_KEEP; } }

1 0

Francois Gouget : testbot: Monitor offline VMs and automatically put them back online.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: tools Branch: master Commit: 51b379e666f7962a00d143208f1384282dfd1306 URL: http://source.winehq.org/git/tools.git/?a=commit;h=51b379e666f7962a00d14320… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 19 14:53:27 2017 +0200 testbot: Monitor offline VMs and automatically put them back online. When a VM goes offline, start a LibvirtTool process to monitor it and put it back online as soon as we can access it again. This makes the TestBot resilient to temporary network outages and VM host reboots. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 4 ++- testbot/bin/LibvirtTool.pl | 60 ++++++++++++++++++++++++++++++++++++++--- testbot/lib/WineTestBot/Jobs.pm | 18 ++++++++----- testbot/lib/WineTestBot/VMs.pm | 31 ++++++++++++++++++--- 4 files changed, 100 insertions(+), 13 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 02c361c..e6755bc 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -181,7 +181,9 @@ sub Cleanup(;$$) if ($KillVMs) { $VM->KillChild(); - $VM->RunPowerOff(); + # $KillVMs is normally used on shutdown so don't start a process that + # will get stuck 'forever' waiting for an offline VM. + $VM->RunPowerOff() if ($VM->Status ne "offline"); } elsif (!$VM->CanHaveChild()) { diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index fcc0e81..ab97261 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -Tw # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # -# Performs poweroff and revert operations on the specified VM. +# Performs poweroff, revert and other operations on the specified VM. # These operations can take quite a bit of time, particularly in case of # network trouble, and thus are best performed in a separate process. # @@ -104,7 +104,7 @@ while (@ARGV) { $LogOnly = 1; } - elsif ($Arg =~ /^(?:checkidle|poweroff|revert)$/) + elsif ($Arg =~ /^(?:checkidle|monitor|poweroff|revert)$/) { $Action = $Arg; } @@ -163,7 +163,7 @@ if (!defined $Usage) } if (defined $Usage) { - print "Usage: $Name0 [--debug] [--log-only] [--help] (checkidle|poweroff|revert) VMName\n"; + print "Usage: $Name0 [--debug] [--log-only] [--help] (checkidle|monitor|poweroff|revert) VMName\n"; exit $Usage; } @@ -251,6 +251,56 @@ sub ChangeStatus($$;$) return 0; } +sub Monitor() +{ + $CurrentStatus = "offline"; + while (1) + { + # Get a fresh status + $VM = CreateVMs()->GetItem($VMKey); + if (!defined $VM or $VM->Role eq "retired" or $VM->Role eq "deleted" or + $VM->Status eq "maintenance") + { + my $Reason = $VM ? "Role=". $VM->Role ."\nStatus=". $VM->Status : + "$VMKey does not exist anymore"; + NotifyAdministrator("The $VMKey VM is not relevant anymore", + "The $VMKey VM was offline but ceased to be relevant after ". + Elapsed($Start). " seconds:\n\n$Reason\n"); + return 1; + } + if ($VM->Status ne "offline") + { + NotifyAdministrator("The $VMKey VM is working again (". $VM->Status .")", + "The status of the $VMKey VM unexpectedly switched from offline\n". + "to ". $VM->Status ." after ". Elapsed($Start) + ." seconds."); + return 0; + } + + my $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); + if ($IsPoweredOn) + { + my $ErrMessage = $VM->GetDomain()->PowerOff(1); + if (defined $ErrMessage) + { + Error "$ErrMessage\n"; + $IsPoweredOn = undef; + } + } + if (defined $IsPoweredOn) + { + return 1 if (ChangeStatus("offline", "off", "done")); + NotifyAdministrator("The $VMKey VM is working again", + "The $VMKey VM started working again after ". + Elapsed($Start) ." seconds."); + return 0; + } + + Debug(Elapsed($Start), " $VMKey is still unreachable\n"); + sleep(60); + } +} + sub PowerOff() { # Power off VMs no matter what their initial status is @@ -336,6 +386,10 @@ if ($Action eq "checkidle") { $Rc = CheckIdle(); } +elsif ($Action eq "monitor") +{ + $Rc = Monitor(); +} elsif ($Action eq "poweroff") { $Rc = PowerOff(); diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 6e7937f..de639c7 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -215,24 +215,23 @@ sub Cancel($) $Tasks->AddFilter("Status", ["queued", "running"]); foreach my $Task (@{$Tasks->GetItems()}) { + my $VM = $Task->VM; if ($Task->Status eq "queued") { $Task->Status("skipped"); my ($EProperty, $EMessage) = $Task->Save(); $ErrMessage ||= "$EMessage ($EProperty)" if ($EMessage); } - elsif (defined $Task->ChildPid) + elsif (defined $VM->ChildPid) { require WineTestBot::Log; WineTestBot::Log::LogMsg("Canceling the " . join("/", $self->Id, $Step->No, $Task->No) . " task\n"); - kill("TERM", $Task->ChildPid); $Task->Status("canceled"); - $Task->ChildPid(undef); my ($EProperty, $EMessage) = $Task->Save(); $ErrMessage ||= "$EMessage ($EProperty)" if ($EMessage); - my $VM = $Task->VM; $VM->Status('dirty'); + $VM->KillChild(); ($EProperty, $EMessage) = $VM->Save(); $ErrMessage ||= "$EMessage ($EProperty)" if ($EMessage); } @@ -285,7 +284,6 @@ sub Restart($) system("rm", "-rf", "$JobDir/" . $Step->No . "/" . $Task->No); } $Task->Status("queued"); - $Task->ChildPid(undef); $Task->Started(undef); $Task->Ended(undef); $Task->TestFailures(undef); @@ -493,6 +491,14 @@ sub ScheduleOnHost($$$) { $RunningCount++; } + elsif ($VMStatus eq "offline") + { + if (!$VM->HasRunningChild()) + { + my $ErrMessage = $VM->RunMonitor(); + return $ErrMessage if (defined $ErrMessage); + } + } else { my $Priority = $VM->Type eq "build" ? 10 : @@ -617,7 +623,7 @@ sub ScheduleOnHost($$$) next if (exists $VMsToRevert{$VMKey}); my $VM = $HostVMs->GetItem($VMKey); - next if ($VM->Status ne "dirty" or defined $VM->ChildPid); + next if ($VM->Status ne "dirty" or $VM->HasRunningChild()); my $ErrMessage = $VM->RunPowerOff(); return $ErrMessage if (defined $ErrMessage); diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 377eb0a..e71ad21 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -241,7 +241,7 @@ Returns true if the VM status is compatible with ChildPid being set. sub CanHaveChild($) { my ($self) = @_; - return ($self->Status =~ /^(?:dirty|reverting|sleeping)$/); + return ($self->Status =~ /^(?:dirty|reverting|sleeping|offline)$/); } =pod @@ -416,6 +416,31 @@ sub RunCheckIdle($) return $self->_RunVMTool("dirty", ["--log-only", "checkidle", $self->GetKey()]); } +=pod +=over 12 + +=item C<RunMonitor()> + +Monitors an offline VM to detect when it becomes accessible again. +When the VM can again be accessed through the hypervisor it is powered off and +its status is set to 'off'. + +This operation can obviously take a long time so it is performed in a separate +process. + +=back +=cut + +sub RunMonitor($) +{ + my ($self) = @_; + # In fact the status is already set + return $self->_RunVMTool("offline", ["--log-only", "monitor", $self->GetKey()]); +} + +=pod +=over 12 + =item C<RunPowerOff()> Powers off the VM so that it stops using resources. @@ -547,8 +572,8 @@ sub FilterEnabledRole($) sub FilterEnabledStatus($) { my ($self) = @_; - # Filter out the disabled VMs, that is the offline and maintenance ones - $self->AddFilter("Status", ["dirty", "reverting", "sleeping", "idle", "running", "off"]); + # Filter out the maintenance VMs + $self->AddFilter("Status", ["dirty", "reverting", "sleeping", "idle", "running", "off", "offline"]); } sub FilterHypervisors($$)

1 0

Francois Gouget : testbot: Base LibvirtDomain::IsPoweredOn() on get_state( ).
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: tools Branch: master Commit: bfb23ab81b1bd15ba180fcc05a9d4ef0624134f8 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bfb23ab81b1bd15ba180fcc0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 19 14:54:16 2017 +0200 testbot: Base LibvirtDomain::IsPoweredOn() on get_state(). is_active() returns true even if the VM is in the process of being reverted (i.e. it uses resources) which is not what we are after. So use get_state() which provides more detailed information. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LibvirtDomain.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 20d619a..1b74315 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -273,9 +273,10 @@ sub IsPoweredOn($) return undef; } - my $IsActive; - eval { $IsActive = $Domain->is_active() }; - return $@ ? $self->_Reset(undef) : $IsActive; + my ($State, $_Reason); + eval { ($State, $_Reason) = $Domain->get_state() }; + return $self->_Reset(undef) if ($@); + return ($State == Sys::Virt::Domain::STATE_RUNNING); } sub PowerOff($$)

1 0

Francois Gouget : testbot: Remove LibvirtDomain::_UpdateStatus().
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: tools Branch: master Commit: 604683507c18dbd865730b32d4d5deae9bf21cc2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=604683507c18dbd865730b32… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 19 14:54:35 2017 +0200 testbot: Remove LibvirtDomain::_UpdateStatus(). It was needed to resynchronize the VM status field during the Engine initialization. However nowadays the Engine delegates this to LibvirtTool which does not want the VM status to be changed behind this back and thus bypasses _UpdateStatus(). The bypass is explicit in the case of PowerOff(), $NoStatus=1, and implicit in the RevertToSnapshot() case: _UpdateStatus() does nothing if get_state() == STATE_RUNNING (which is the case for our VMs) and $VM->Status ne "off". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/LibvirtTool.pl | 4 ++-- testbot/lib/WineTestBot/LibvirtDomain.pm | 35 ++++---------------------------- 2 files changed, 6 insertions(+), 33 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index ab97261..51f03b4 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -305,7 +305,7 @@ sub PowerOff() { # Power off VMs no matter what their initial status is $CurrentStatus = $VM->Status; - my $ErrMessage = $VM->GetDomain()->PowerOff(1); + my $ErrMessage = $VM->GetDomain()->PowerOff(); FatalError("$ErrMessage\n") if (defined $ErrMessage); return ChangeStatus(undef, "off", "done"); @@ -338,7 +338,7 @@ sub Revert() # Some QEmu/KVM versions are buggy and cannot revert a running VM Debug(Elapsed($Start), " Powering off the VM\n"); my $Domain = $VM->GetDomain(); - my $ErrMessage = $Domain->PowerOff(1); + my $ErrMessage = $Domain->PowerOff(); if (defined $ErrMessage) { LogMsg "Could not power off $VMKey: $ErrMessage\n"; diff --git a/testbot/lib/WineTestBot/LibvirtDomain.pm b/testbot/lib/WineTestBot/LibvirtDomain.pm index 1b74315..f8caffa 100644 --- a/testbot/lib/WineTestBot/LibvirtDomain.pm +++ b/testbot/lib/WineTestBot/LibvirtDomain.pm @@ -151,32 +151,6 @@ sub _GetDomain($) return (undef, $Domain); } -sub _UpdateStatus($$) -{ - my ($self, $Domain) = @_; - - return undef if ($self->{VM}->Status eq "offline"); - - my ($State, $Reason); - eval { ($State, $Reason) = $Domain->get_state() }; - return $self->_Reset(_eval_err()) if ($@); - - if ($State == Sys::Virt::Domain::STATE_SHUTDOWN or - $State == Sys::Virt::Domain::STATE_SHUTOFF or - $State == Sys::Virt::Domain::STATE_CRASHED) - { - $self->{VM}->Status("off"); - $self->{VM}->Save(); - } - elsif ($self->{VM}->Status eq "off") - { - $self->{VM}->Status("dirty"); - $self->{VM}->Save(); - } - - return undef; -} - sub _GetSnapshot($$) { my ($self, $SnapshotName) = @_; @@ -233,7 +207,7 @@ sub RevertToSnapshot($) # Note that if the snapshot was of a powered off domain, this boots it up eval { $Snapshot->revert_to(Sys::Virt::DomainSnapshot::REVERT_RUNNING) }; - return $@ ? $self->_Reset(_eval_err()) : $self->_UpdateStatus($Domain); + return $@ ? $self->_Reset(_eval_err()) : undef; } sub CreateSnapshot($) @@ -279,9 +253,9 @@ sub IsPoweredOn($) return ($State == Sys::Virt::Domain::STATE_RUNNING); } -sub PowerOff($$) +sub PowerOff($) { - my ($self, $NoStatus) = @_; + my ($self) = @_; my ($ErrMessage, $Domain) = $self->_GetDomain(); return $ErrMessage if (defined $ErrMessage); @@ -298,9 +272,8 @@ sub PowerOff($$) $ErrMessage = "The VM is still active"; } } - $ErrMessage ||= $self->_UpdateStatus($Domain) if (!$NoStatus); - return undef if (!defined $ErrMessage); + return undef if (!defined $ErrMessage); return $self->_Reset("Could not power off ". $self->{VM}->Name .": $ErrMessage"); }

1 0