From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:46922) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rvpp1-0008DO-3b for qemu-devel@nongnu.org; Fri, 10 Feb 2012 07:43:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rvpoz-0005HM-Ue for qemu-devel@nongnu.org; Fri, 10 Feb 2012 07:43:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:4627) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rvpoz-0005GO-Mi for qemu-devel@nongnu.org; Fri, 10 Feb 2012 07:43:25 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1AChOQp014416 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 10 Feb 2012 07:43:24 -0500 From: Gerd Hoffmann Date: Fri, 10 Feb 2012 13:43:21 +0100 Message-Id: <1328877801-32506-1-git-send-email-kraxel@redhat.com> In-Reply-To: <1328807143-29499-1-git-send-email-kraxel@redhat.com> References: <1328807143-29499-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 12/11] suspend: add qmp events List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Send qmp events on suspend and wakeup so libvirt has a chance to track the vm state. Signed-off-by: Gerd Hoffmann --- monitor.c | 6 ++++++ monitor.h | 2 ++ vl.c | 15 +++++++++++++++ 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/monitor.c b/monitor.c index aadbdcb..e6f5fad 100644 --- a/monitor.c +++ b/monitor.c @@ -485,6 +485,12 @@ void monitor_protocol_event(MonitorEvent event, QObject *data) case QEVENT_BLOCK_JOB_CANCELLED: event_name = "BLOCK_JOB_CANCELLED"; break; + case QEVENT_SUSPEND: + event_name = "SUSPEND"; + break; + case QEVENT_WAKEUP: + event_name = "WAKEUP"; + break; default: abort(); break; diff --git a/monitor.h b/monitor.h index b72ea07..9df3bab 100644 --- a/monitor.h +++ b/monitor.h @@ -38,6 +38,8 @@ typedef enum MonitorEvent { QEVENT_SPICE_DISCONNECTED, QEVENT_BLOCK_JOB_COMPLETED, QEVENT_BLOCK_JOB_CANCELLED, + QEVENT_SUSPEND, + QEVENT_WAKEUP, QEVENT_MAX, } MonitorEvent; diff --git a/vl.c b/vl.c index 5095e06..28ca323 100644 --- a/vl.c +++ b/vl.c @@ -1411,6 +1411,7 @@ void qemu_system_suspend_request(void) } cpu_stop_current(); notifier_list_notify(&suspend_notifiers, NULL); + monitor_protocol_event(QEVENT_SUSPEND, NULL); is_suspended = true; } @@ -1421,12 +1422,26 @@ void qemu_register_suspend_notifier(Notifier *notifier) void qemu_system_wakeup_request(WakeupReason reason) { + static const char *names[] = { + [QEMU_WAKEUP_REASON_OTHER] = "other", + [QEMU_WAKEUP_REASON_RTC] = "rtc", + [QEMU_WAKEUP_REASON_PMTIMER] = "pmtimer", + }; + const char *name; + QObject *data; + if (!is_suspended) { return; } if (!(wakeup_reason_mask & (1 << reason))) { return; } + + name = (reason < ARRAY_SIZE(names)) ? names[reason] : "unknown"; + data = qobject_from_jsonf("{ 'reason': %s }", name); + monitor_protocol_event(QEVENT_WAKEUP, data); + qobject_decref(data); + notifier_list_notify(&wakeup_notifiers, &reason); reset_requested = 1; qemu_notify_event(); -- 1.7.1