From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33171) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RyRfZ-0002pQ-Jd for qemu-devel@nongnu.org; Fri, 17 Feb 2012 12:32:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RyRfT-0002RD-57 for qemu-devel@nongnu.org; Fri, 17 Feb 2012 12:32:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:25911) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RyRfS-0002R3-T4 for qemu-devel@nongnu.org; Fri, 17 Feb 2012 12:32:23 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q1HHWLTf022979 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 17 Feb 2012 12:32:21 -0500 Date: Fri, 17 Feb 2012 15:32:21 -0200 From: Luiz Capitulino Message-ID: <20120217153221.7fd4c70f@doriath.home> In-Reply-To: <1329301701-30395-8-git-send-email-kraxel@redhat.com> References: <1329301701-30395-1-git-send-email-kraxel@redhat.com> <1329301701-30395-8-git-send-email-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v5 07/12] suspend: add system_wakeup monitor command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: qemu-devel@nongnu.org On Wed, 15 Feb 2012 11:28:16 +0100 Gerd Hoffmann wrote: > This patch adds the system_wakeup monitor command which will simply > wake up suspended guests. > > Signed-off-by: Gerd Hoffmann > --- > hmp-commands.hx | 14 ++++++++++++++ > hmp.c | 5 +++++ > hmp.h | 1 + > qapi-schema.json | 11 +++++++++++ > qmp-commands.hx | 21 +++++++++++++++++++++ > qmp.c | 5 +++++ > 6 files changed, 57 insertions(+), 0 deletions(-) > > diff --git a/hmp-commands.hx b/hmp-commands.hx > index 573b823..64b3656 100644 > --- a/hmp-commands.hx > +++ b/hmp-commands.hx > @@ -352,6 +352,20 @@ Resume emulation. > ETEXI > > { > + .name = "system_wakeup", > + .args_type = "", > + .params = "", > + .help = "wakeup guest from suspend", > + .mhandler.cmd = hmp_system_wakeup, > + }, > + > +STEXI > +@item system_wakeup > +@findex system_wakeup > +Wakeup guest from suspend. > +ETEXI > + > + { > .name = "gdbserver", > .args_type = "device:s?", > .params = "[device]", > diff --git a/hmp.c b/hmp.c > index 8ff8c94..3a54455 100644 > --- a/hmp.c > +++ b/hmp.c > @@ -632,6 +632,11 @@ void hmp_cont(Monitor *mon, const QDict *qdict) > } > } > > +void hmp_system_wakeup(Monitor *mon, const QDict *qdict) > +{ > + qmp_system_wakeup(NULL); > +} > + > void hmp_inject_nmi(Monitor *mon, const QDict *qdict) > { > Error *errp = NULL; > diff --git a/hmp.h b/hmp.h > index 18eecbd..5409464 100644 > --- a/hmp.h > +++ b/hmp.h > @@ -41,6 +41,7 @@ void hmp_cpu(Monitor *mon, const QDict *qdict); > void hmp_memsave(Monitor *mon, const QDict *qdict); > void hmp_pmemsave(Monitor *mon, const QDict *qdict); > void hmp_cont(Monitor *mon, const QDict *qdict); > +void hmp_system_wakeup(Monitor *mon, const QDict *qdict); > void hmp_inject_nmi(Monitor *mon, const QDict *qdict); > void hmp_set_link(Monitor *mon, const QDict *qdict); > void hmp_block_passwd(Monitor *mon, const QDict *qdict); > diff --git a/qapi-schema.json b/qapi-schema.json > index d02ee86..226c1da 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -999,6 +999,17 @@ > { 'command': 'cont' } > > ## > +# @system_wakeup: > +# > +# Wakeup guest from suspend > +# > +# Since: 1.1 > +# > +# Returns: nothing. Would be nice to note that this command does nothing if the guest is already suspended (btw, does is_suspend account for guest initiated suspends too?). > +## > +{ 'command': 'system_wakeup' } > + > +## > # @inject-nmi: > # > # Injects an Non-Maskable Interrupt into all guest's VCPUs. > diff --git a/qmp-commands.hx b/qmp-commands.hx > index b5e2ab8..f5081e2 100644 > --- a/qmp-commands.hx > +++ b/qmp-commands.hx > @@ -212,6 +212,27 @@ Example: > EQMP > > { > + .name = "system_wakeup", > + .args_type = "", > + .mhandler.cmd_new = qmp_marshal_input_system_wakeup, > + }, > + > +SQMP > +system_wakeup > +------------- > + > +Wakeup guest from suspend. > + > +Arguments: None. > + > +Example: > + > +-> { "execute": "system_wakeup" } > +<- { "return": {} } > + > +EQMP > + > + { > .name = "system_reset", > .args_type = "", > .mhandler.cmd_new = qmp_marshal_input_system_reset, > diff --git a/qmp.c b/qmp.c > index 1f64844..a182b51 100644 > --- a/qmp.c > +++ b/qmp.c > @@ -163,6 +163,11 @@ void qmp_cont(Error **errp) > vm_start(); > } > > +void qmp_system_wakeup(Error **errp) > +{ > + qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER); qemu_system_wakeup_request() does: if (!(wakeup_reason_mask & (1 << reason))) { return; } But I think you never disable REASON_OTHER, meaning that this will never be true when the wakeup request comes from the command, right? If that's right, this patch is fine with me. Otherwise we need to return an error. > +} > + > ObjectPropertyInfoList *qmp_qom_list(const char *path, Error **errp) > { > Object *obj;