diff options
| author | Anthony Liguori | 2011-02-16 15:47:07 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2011-02-16 15:47:07 +0100 |
| commit | c5d69e6bbf37bf5e3882060764b15e018e6a5321 (patch) | |
| tree | e246e96bdfffbc5e07682c5a39ea7a65482a5935 /hw/watchdog.c | |
| parent | Handle icount for powerpc tbl/tbu/decr load and store. (diff) | |
| parent | kvm: x86: Introduce kvmclock device to save/restore its state (diff) | |
| download | qemu-c5d69e6bbf37bf5e3882060764b15e018e6a5321.tar.gz qemu-c5d69e6bbf37bf5e3882060764b15e018e6a5321.tar.xz qemu-c5d69e6bbf37bf5e3882060764b15e018e6a5321.zip | |
Merge remote branch 'qemu-kvm/uq/master' into staging
Diffstat (limited to 'hw/watchdog.c')
| -rw-r--r-- | hw/watchdog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/watchdog.c b/hw/watchdog.c index e9dd56e229..1c900a1189 100644 --- a/hw/watchdog.c +++ b/hw/watchdog.c @@ -132,7 +132,7 @@ void watchdog_perform_action(void) case WDT_PAUSE: /* same as 'stop' command in monitor */ watchdog_mon_event("pause"); - vm_stop(0); + vm_stop(VMSTOP_WATCHDOG); break; case WDT_DEBUG: |