aboutsummaryrefslogtreecommitdiff
path: root/qemu-options.hx
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2021-01-20 14:30:27 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2021-01-21 13:00:41 +0100
commitc27025e0448f65b67c36f962dd9e5f23f9ade735 (patch)
treec22f8cdd35a40d9b1857e321fa4e858ba1b6faec /qemu-options.hx
parentfef80ea073c4862bc9eaddb6ddb0ed970b8ad7c4 (diff)
downloadqemu-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 'qemu-options.hx')
-rw-r--r--qemu-options.hx8
1 files changed, 4 insertions, 4 deletions
diff --git a/qemu-options.hx b/qemu-options.hx
index 62791f5..9172d51 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -3900,12 +3900,12 @@ SRST
ERST
DEF("action", HAS_ARG, QEMU_OPTION_action,
- "-action reboot=none|shutdown\n"
- " action when guest reboots [default=none]\n"
+ "-action reboot=reset|shutdown\n"
+ " action when guest reboots [default=reset]\n"
"-action shutdown=poweroff|pause\n"
" action when guest shuts down [default=poweroff]\n"
- "-action panic=poweroff|pause|none\n"
- " action when guest panics [default=poweroff]\n"
+ "-action panic=pause|shutdown|none\n"
+ " action when guest panics [default=shutdown]\n"
"-action watchdog=reset|shutdown|poweroff|inject-nmi|pause|debug|none\n"
" action when watchdog fires [default=reset]\n",
QEMU_ARCH_ALL)