From: Dominik Csapak <d.csapak@proxmox.com>
To: qemu-devel@nongnu.org
Cc: eblake@redhat.com, armbru@redhat.com, pbonzini@redhat.com,
kwolf@redhat.com, mreitz@redhat.com
Subject: [Qemu-devel] [PATCH 1/3] qapi: move ShutdownCause to qapi/run-state.json
Date: Wed, 31 Oct 2018 12:52:40 +0100 [thread overview]
Message-ID: <20181031115242.6558-2-d.csapak@proxmox.com> (raw)
In-Reply-To: <20181031115242.6558-1-d.csapak@proxmox.com>
this makes it possible to use the reason as return value
in a QMP event, such as SHUTDOWN
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
include/sysemu/sysemu.h | 20 --------------------
qapi/run-state.json | 33 +++++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 8d6095d98b..f83522c7e7 100644
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -31,26 +31,6 @@ VMChangeStateEntry *qemu_add_vm_change_state_handler(VMChangeStateHandler *cb,
void qemu_del_vm_change_state_handler(VMChangeStateEntry *e);
void vm_state_notify(int running, RunState state);
-/* Enumeration of various causes for shutdown. */
-typedef enum ShutdownCause {
- SHUTDOWN_CAUSE_NONE, /* No shutdown request pending */
- SHUTDOWN_CAUSE_HOST_ERROR, /* An error prevents further use of guest */
- SHUTDOWN_CAUSE_HOST_QMP, /* Reaction to a QMP command, like 'quit' */
- SHUTDOWN_CAUSE_HOST_SIGNAL, /* Reaction to a signal, such as SIGINT */
- SHUTDOWN_CAUSE_HOST_UI, /* Reaction to UI event, like window close */
- SHUTDOWN_CAUSE_GUEST_SHUTDOWN,/* Guest shutdown/suspend request, via
- ACPI or other hardware-specific means */
- SHUTDOWN_CAUSE_GUEST_RESET, /* Guest reset request, and command line
- turns that into a shutdown */
- SHUTDOWN_CAUSE_GUEST_PANIC, /* Guest panicked, and command line turns
- that into a shutdown */
- SHUTDOWN_CAUSE_SUBSYSTEM_RESET,/* Partial guest reset that does not trigger
- QMP events and ignores --no-reboot. This
- is useful for sanitize hypercalls on s390
- that are used during kexec/kdump/boot */
- SHUTDOWN_CAUSE__MAX,
-} ShutdownCause;
-
static inline bool shutdown_caused_by_guest(ShutdownCause cause)
{
return cause >= SHUTDOWN_CAUSE_GUEST_SHUTDOWN;
diff --git a/qapi/run-state.json b/qapi/run-state.json
index 332e44897b..883bed167c 100644
--- a/qapi/run-state.json
+++ b/qapi/run-state.json
@@ -60,6 +60,39 @@
'guest-panicked', 'colo', 'preconfig' ] }
##
+# @ShutdownCause:
+#
+# An enumeration of reasons for a Shutdown.
+#
+# @none: No shutdown request pending
+#
+# @host-error: An error prevented further use of guest
+#
+# @host-qmp: Reaction to a QMP command, like 'quit'
+#
+# @host-signal: Reaction to a signal, such as SIGINT
+#
+# @host-ui: Reaction to a UI event, like window close
+#
+# @guest-shutdown: Guest shutdown/suspend request, via ACPI or other
+# hardware-specific means
+#
+# @guest-reset: Guest reset request, and command line turns that into
+# a shutdown
+#
+# @guest-panic: Guest panicked, and command line turns that into a shutdown
+#
+# @subsystem-reset: Partial guest reset that does not trigger QMP events and
+# ignores --no-reboot. This is useful for sanitizing
+# hypercalls on s390 that are used during kexec/kdump/boot
+#
+##
+{ 'enum': 'ShutdownCause',
+ 'data': [ 'none', 'host-error', 'host-qmp', 'host-signal', 'host-ui',
+ 'guest-shutdown', 'guest-reset', 'guest-panic',
+ 'subsystem-reset'] }
+
+##
# @StatusInfo:
#
# Information about VCPU run state
--
2.11.0
next prev parent reply other threads:[~2018-10-31 11:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-31 11:52 [Qemu-devel] [PATCH 0/3] qapi: return ShutdownCause for events Dominik Csapak
2018-10-31 11:52 ` Dominik Csapak [this message]
2018-11-30 9:00 ` [Qemu-devel] [PATCH 1/3] qapi: move ShutdownCause to qapi/run-state.json Markus Armbruster
2018-11-30 9:15 ` Markus Armbruster
2018-10-31 11:52 ` [Qemu-devel] [PATCH 2/3] qapi: split host-qmp into quit and system-reset Dominik Csapak
2018-11-30 9:41 ` Markus Armbruster
2018-11-30 13:20 ` Dominik Csapak
2018-11-30 13:55 ` Eric Blake
2018-10-31 11:52 ` [Qemu-devel] [PATCH 3/3] qapi: add reason to SHUTDOWN and RESET events Dominik Csapak
2018-11-30 9:43 ` Markus Armbruster
2018-11-19 13:45 ` [Qemu-devel] [PATCH 0/3] qapi: return ShutdownCause for events Dominik Csapak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181031115242.6558-2-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).