From nobody Wed May 8 03:31:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1494966609557911.4279059075368; Tue, 16 May 2017 13:30:09 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 89FBA61D36; Tue, 16 May 2017 20:29:56 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2E2A48AB47; Tue, 16 May 2017 20:29:55 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E8B79180BAF1; Tue, 16 May 2017 20:29:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v4GKToqE009954 for ; Tue, 16 May 2017 16:29:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2DF7F84D9F; Tue, 16 May 2017 20:29:50 +0000 (UTC) Received: from wheatley.cock.kentus.net (ovpn-204-21.brq.redhat.com [10.40.204.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80AB284423 for ; Tue, 16 May 2017 20:29:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 89FBA61D36 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 89FBA61D36 From: Martin Kletzander To: libvir-list@redhat.com Date: Tue, 16 May 2017 22:29:42 +0200 Message-Id: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3] qemu: Report shutdown event details X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 16 May 2017 20:30:03 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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=3D1384007 Signed-off-by: Martin Kletzander --- v3: - don't send two events, just change the detail for the existing one v2: - adapt to newer patches This is not in qemu master yet; if ACKed it will not be pushed before the appropriate patches hit qemu master. 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 | 21 +++++++++++++++++++-- tools/virsh-domain.c | 4 +++- 7 files changed, 51 insertions(+), 10 deletions(-) diff --git a/examples/object-events/event-test.c b/examples/object-events/e= vent-test.c index 12690cac09ce..78d200806601 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 "Guest request"; + + case VIR_DOMAIN_EVENT_SHUTDOWN_HOST: + return "Host request"; + case VIR_DOMAIN_EVENT_SHUTDOWN_LAST: break; } diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-dom= ain.h index c9e96a6c90bc..720db32f7663 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 =3D 0, /* Guest finished shutdown s= equence */ + /* Guest finished shutdown sequence */ + VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED =3D 0, + + /* Domain finished shutting down after request from the guest itself + * (e.g. hardware-specific action) */ + VIR_DOMAIN_EVENT_SHUTDOWN_GUEST =3D 1, + + /* Domain finished shutting down after request from the host (e.g. kil= led by + * a signal) */ + VIR_DOMAIN_EVENT_SHUTDOWN_HOST =3D 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 =3D -1; - VIR_DEBUG("mon=3D%p", mon); + VIR_DEBUG("mon=3D%p guest=3D%u", mon, guest); mon->willhangup =3D 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)(qemuMonit= orPtr 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, co= nst char *firstkeyword) } -static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValue= Ptr data ATTRIBUTE_UNUSED) +static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValue= Ptr data) { - qemuMonitorEmitShutdown(mon); + bool guest =3D false; + virTristateBool guest_initiated =3D VIR_TRISTATE_BOOL_ABSENT; + + if (virJSONValueObjectGetBoolean(data, "guest", &guest) =3D=3D 0) + guest_initiated =3D guest ? VIR_TRISTATE_BOOL_YES : VIR_TRISTATE_B= OOL_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..e9c4e38abfb2 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -634,12 +634,14 @@ qemuProcessHandleEvent(qemuMonitorPtr mon ATTRIBUTE_U= NUSED, static int qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm, + virTristateBool guest_initiated, void *opaque) { virQEMUDriverPtr driver =3D opaque; qemuDomainObjPrivatePtr priv; virObjectEventPtr event =3D NULL; virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); + int detail =3D 0; VIR_DEBUG("vm=3D%p", vm); @@ -662,9 +664,24 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE= _UNUSED, virDomainObjSetState(vm, VIR_DOMAIN_SHUTDOWN, VIR_DOMAIN_SHUTDOWN_UNKNOWN); + + switch (guest_initiated) { + case VIR_TRISTATE_BOOL_YES: + detail =3D VIR_DOMAIN_EVENT_SHUTDOWN_GUEST; + break; + + case VIR_TRISTATE_BOOL_NO: + detail =3D VIR_DOMAIN_EVENT_SHUTDOWN_HOST; + break; + + default: + detail =3D VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED; + break; + } + event =3D virDomainEventLifecycleNewFromObj(vm, - VIR_DOMAIN_EVENT_SHUTDOWN, - VIR_DOMAIN_EVENT_SHUTDOWN_FINISHED); + VIR_DOMAIN_EVENT_SHUTDOWN, + detail); if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm, driver->cap= s) < 0) { VIR_WARN("Unable to save status on vm %s after state change", diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 0d19d0e0126e..0e5d8e3c242c 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -12249,7 +12249,9 @@ VIR_ENUM_IMPL(virshDomainEventStopped, VIR_ENUM_DECL(virshDomainEventShutdown) VIR_ENUM_IMPL(virshDomainEventShutdown, VIR_DOMAIN_EVENT_SHUTDOWN_LAST, - N_("Finished")) + N_("Finished"), + N_("Finished after guest request"), + N_("Finished after host request")) VIR_ENUM_DECL(virshDomainEventPMSuspended) VIR_ENUM_IMPL(virshDomainEventPMSuspended, -- 2.13.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list