diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-01-20 14:30:27 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-01-21 13:00:41 +0100 |
| commit | c27025e0448f65b67c36f962dd9e5f23f9ade735 (patch) | |
| tree | c22f8cdd35a40d9b1857e321fa4e858ba1b6faec /softmmu/runstate-action.c | |
| parent | fef80ea073c4862bc9eaddb6ddb0ed970b8ad7c4 (diff) | |
| download | qemu-c27025e0448f65b67c36f962dd9e5f23f9ade735.zip qemu-c27025e0448f65b67c36f962dd9e5f23f9ade735.tar.gz qemu-c27025e0448f65b67c36f962dd9e5f23f9ade735.tar.bz2 | |
runstate: cleanup reboot and panic actions
The possible choices for panic, reset and watchdog actions are inconsistent.
"-action panic=poweroff" should be renamed to "-action panic=shutdown"
on the command line. This is because "-action panic=poweroff" and
"-action watchdog=poweroff" have slightly different semantics, the first
does an unorderly exit while the second goes through qemu_cleanup(). With
this change, -no-shutdown would not have to change "-action panic=pause"
"pause", just like it does not have to change the reset action.
"-action reboot=none" should be renamed to "-action reboot=reset".
This should be self explanatory, since for example "-action panic=none"
lets the guest proceed without taking any action.
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'softmmu/runstate-action.c')
| -rw-r--r-- | softmmu/runstate-action.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/softmmu/runstate-action.c b/softmmu/runstate-action.c index 99ce880..ae0761a 100644 --- a/softmmu/runstate-action.c +++ b/softmmu/runstate-action.c @@ -13,9 +13,9 @@ #include "qapi/error.h" #include "qemu/option_int.h" -RebootAction reboot_action = REBOOT_ACTION_NONE; +RebootAction reboot_action = REBOOT_ACTION_RESET; ShutdownAction shutdown_action = SHUTDOWN_ACTION_POWEROFF; -PanicAction panic_action = PANIC_ACTION_POWEROFF; +PanicAction panic_action = PANIC_ACTION_SHUTDOWN; /* * Receives actions to be applied for specific guest events |