OSDN Git Service

watchdog: fix deadlock with -watchdog-action pause
authorPaolo Bonzini <pbonzini@redhat.com>
Fri, 27 Jun 2014 14:31:07 +0000 (16:31 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 9 Jul 2014 16:17:08 +0000 (18:17 +0200)
commit30e5210a706ca6b52cbefa8b71e40ae614ffd6e5
treeb5714afa10c11c42b4d190711f39468ff66e5ee1
parentf7f152458e953690f1c8025f507a26d554f6ee4d
watchdog: fix deadlock with -watchdog-action pause

qemu_clock_enable says:

/* Disabling the clock will wait for related timerlists to stop
 * executing qemu_run_timers.  Thus, this functions should not
 * be used from the callback of a timer that is based on @clock.
 * Doing so would cause a deadlock.
 */

and it indeed does: vm_stop uses qemu_clock_enable on QEMU_CLOCK_VIRTUAL
and watchdogs are based on QEMU_CLOCK_VIRTUAL, and we get a deadlock.

Use qemu_system_vmstop_request_prepare()/qemu_system_vmstop_request()
instead; yet another alternative could be a BH.

I checked other occurrences of vm_stop and they should not have this
problem.  RUN_STATE_IO_ERROR could in principle (it depends on the
code in the drivers) but it has been fixed by commit 2bd3bce, "block:
asynchronously stop the VM on I/O errors", 2014-06-05.

Tested-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
hw/watchdog/watchdog.c