From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33040) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RyOik-0006SH-0s for qemu-devel@nongnu.org; Fri, 17 Feb 2012 09:23:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RyOie-0008BV-Ay for qemu-devel@nongnu.org; Fri, 17 Feb 2012 09:23:33 -0500 Received: from mail-pw0-f45.google.com ([209.85.160.45]:34897) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RyOie-0008BN-6I for qemu-devel@nongnu.org; Fri, 17 Feb 2012 09:23:28 -0500 Received: by pbbro12 with SMTP id ro12so4573458pbb.4 for ; Fri, 17 Feb 2012 06:23:27 -0800 (PST) Message-ID: <4F3E62DA.3060409@codemonkey.ws> Date: Fri, 17 Feb 2012 08:23:22 -0600 From: Anthony Liguori MIME-Version: 1.0 References: <1329301701-30395-1-git-send-email-kraxel@redhat.com> <1329301701-30395-13-git-send-email-kraxel@redhat.com> In-Reply-To: <1329301701-30395-13-git-send-email-kraxel@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v5 12/12] suspend: add qmp events List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: qemu-devel@nongnu.org, Luiz Capitulino On 02/15/2012 04:28 AM, Gerd Hoffmann wrote: > Send qmp events on suspend and wakeup so libvirt > has a chance to track the vm state. > > Signed-off-by: Gerd Hoffmann Luiz, please Ack. Regards, Anthony Liguori > --- > 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 bfdcb7c..570ea05 100644 > --- a/vl.c > +++ b/vl.c > @@ -1416,6 +1416,7 @@ static void qemu_system_suspend(void) > { > pause_all_vcpus(); > notifier_list_notify(&suspend_notifiers, NULL); > + monitor_protocol_event(QEVENT_SUSPEND, NULL); > is_suspended = true; > } > > @@ -1436,12 +1437,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();