QEMU will likely report the details of it shutting down, particularly whether the shutdown was initiated by the guest or host. We should forward that information along, at least for shutdown events. Reset has that as well, however that is not a lifecycle event and would add extra constants that might not be used. It can be added later on. Since the only way we can extend information provided to the user is adding event details, we might as well emit multiple events (one with the reason for the shutdown and keep the one for the shutdown being finished for clarity and compatibility). Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1384007 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com&gt; --- v2: - Adapt to new message format Patch in QEMU: https://lists.gnu.org/archive/html/qemu-devel/2017-05/msg03624.html Applied to qapi-next: https://lists.gnu.org/archive/html/qemu-devel/2017-05/msg03742.html examples/object-events/event-test.c | 6 ++++++ include/libvirt/libvirt-domain.h | 11 ++++++++++- src/qemu/qemu_monitor.c | 6 +++--- src/qemu/qemu_monitor.h | 3 ++- src/qemu/qemu_monitor_json.c | 10 ++++++++-- src/qemu/qemu_process.c | 22 ++++++++++++++++++++++ tools/virsh-domain.c | 5 ++++- 7 files changed, 55 insertions(+), 8 deletions(-) diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c index 12690cac09ce..d3a81eb4a559 100644 --- a/examples/object-events/event-test.c +++ b/examples/object-events/event-test.c @@ -240,6 +240,12 @@ eventDetailToString(int event, case VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED: return "Finished"; + case VIR_DOMAIN_EVENT_SHUTDOWN_GUEST: + return "Killed on a guest request"; + + case VIR_DOMAIN_EVENT_SHUTDOWN_HOST: + return "Killed on a host request"; + case VIR_DOMAIN_EVENT_SHUTDOWN_LAST: break; } diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index c9e96a6c90bc..de391a9214d1 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -2983,7 +2983,16 @@ typedef enum { * Details on the cause of a 'shutdown' lifecycle event */ typedef enum { - VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED = 0, /* Guest finished shutdown sequence */ + /* Guest finished shutdown sequence */ + VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED = 0, + + /* Guest is shutting down due to request from guest (e.g. hardware-specific + * action) */ + VIR_DOMAIN_EVENT_SHUTDOWN_GUEST = 1, + + /* Guest is shutting down due to request from host (e.g. killed by a + * signal) */ + VIR_DOMAIN_EVENT_SHUTDOWN_HOST = 2, # ifdef VIR_ENUM_SENTINELS VIR_DOMAIN_EVENT_SHUTDOWN_LAST diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 2148d483ed6a..a2de1a6c5bad 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1326,13 +1326,13 @@ qemuMonitorEmitEvent(qemuMonitorPtr mon, const char *event, int -qemuMonitorEmitShutdown(qemuMonitorPtr mon) +qemuMonitorEmitShutdown(qemuMonitorPtr mon, virTristateBool guest) { int ret = -1; - VIR_DEBUG("mon=%p", mon); + VIR_DEBUG("mon=%p guest=%u", mon, guest); mon->willhangup = 1; - QEMU_MONITOR_CALLBACK(mon, ret, domainShutdown, mon->vm); + QEMU_MONITOR_CALLBACK(mon, ret, domainShutdown, mon->vm, guest); return ret; } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 12f98beba763..8956bf929aaa 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -130,6 +130,7 @@ typedef int (*qemuMonitorDomainEventCallback)(qemuMonitorPtr mon, void *opaque); typedef int (*qemuMonitorDomainShutdownCallback)(qemuMonitorPtr mon, virDomainObjPtr vm, + virTristateBool guest, void *opaque); typedef int (*qemuMonitorDomainResetCallback)(qemuMonitorPtr mon, virDomainObjPtr vm, @@ -344,7 +345,7 @@ int qemuMonitorGetDiskSecret(qemuMonitorPtr mon, int qemuMonitorEmitEvent(qemuMonitorPtr mon, const char *event, long long seconds, unsigned int micros, const char *details); -int qemuMonitorEmitShutdown(qemuMonitorPtr mon); +int qemuMonitorEmitShutdown(qemuMonitorPtr mon, virTristateBool guest); int qemuMonitorEmitReset(qemuMonitorPtr mon); int qemuMonitorEmitPowerdown(qemuMonitorPtr mon); int qemuMonitorEmitStop(qemuMonitorPtr mon); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 083729003ba3..757595dd7472 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -523,9 +523,15 @@ qemuMonitorJSONKeywordStringToJSON(const char *str, const char *firstkeyword) } -static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValuePtr data ATTRIBUTE_UNUSED) +static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValuePtr data) { - qemuMonitorEmitShutdown(mon); + bool guest = false; + virTristateBool guest_initiated = VIR_TRISTATE_BOOL_ABSENT; + + if (virJSONValueObjectGetBoolean(data, "guest", &guest) == 0) + guest_initiated = guest ? VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_BOOL_NO; + + qemuMonitorEmitShutdown(mon, guest_initiated); } static void qemuMonitorJSONHandleReset(qemuMonitorPtr mon, virJSONValuePtr data ATTRIBUTE_UNUSED) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c19bd292596a..f7248dac9b89 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -634,10 +634,12 @@ qemuProcessHandleEvent(qemuMonitorPtr mon ATTRIBUTE_UNUSED, static int qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm, + virTristateBool guest_initiated, void *opaque) { virQEMUDriverPtr driver = opaque; qemuDomainObjPrivatePtr priv; + virObjectEventPtr pre_event = NULL; virObjectEventPtr event = NULL; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); @@ -662,6 +664,25 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjSetState(vm, VIR_DOMAIN_SHUTDOWN, VIR_DOMAIN_SHUTDOWN_UNKNOWN); + + switch (guest_initiated) { + case VIR_TRISTATE_BOOL_YES: + pre_event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_SHUTDOWN, + VIR_DOMAIN_EVENT_SHUTDOWN_GUEST); + break; + + case VIR_TRISTATE_BOOL_NO: + pre_event = virDomainEventLifecycleNewFromObj(vm, + VIR_DOMAIN_EVENT_SHUTDOWN, + VIR_DOMAIN_EVENT_SHUTDOWN_HOST); + break; + + case VIR_TRISTATE_BOOL_ABSENT: + case VIR_TRISTATE_BOOL_LAST: + break; + } + event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_SHUTDOWN, VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED); @@ -678,6 +699,7 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, unlock: virObjectUnlock(vm); + qemuDomainEventQueue(driver, pre_event); qemuDomainEventQueue(driver, event); virObjectUnref(cfg); diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0d19d0e0126e..f05dcbdac5bc 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -12249,7 +12249,10 @@ VIR_ENUM_IMPL(virshDomainEventStopped, VIR_ENUM_DECL(virshDomainEventShutdown) VIR_ENUM_IMPL(virshDomainEventShutdown, VIR_DOMAIN_EVENT_SHUTDOWN_LAST, - N_("Finished")) + N_("Finished"), + N_("Shutting down on a guest request"), + N_("Shutting down on a host request"), + ) VIR_ENUM_DECL(virshDomainEventPMSuspended) VIR_ENUM_IMPL(virshDomainEventPMSuspended, -- 2.13.0