From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:40218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rv5GT-0004aH-LC for qemu-devel@nongnu.org; Wed, 08 Feb 2012 06:00:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rv5GL-0007py-TC for qemu-devel@nongnu.org; Wed, 08 Feb 2012 06:00:41 -0500 Received: from mx1.redhat.com ([209.132.183.28]:62579) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rv5GL-0007pm-Ij for qemu-devel@nongnu.org; Wed, 08 Feb 2012 06:00:33 -0500 From: Gerd Hoffmann Date: Wed, 8 Feb 2012 12:00:16 +0100 Message-Id: <1328698819-31269-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1328698819-31269-1-git-send-email-kraxel@redhat.com> References: <1328698819-31269-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v3 3/6] suspend: add system_wakeup monitor command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: xen-devel@lists.xensource.com, Gerd Hoffmann 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. +## +{ '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 45052cc..9ff5ec3 100644 --- a/qmp.c +++ b/qmp.c @@ -164,6 +164,11 @@ void qmp_cont(Error **errp) vm_start(); } +void qmp_system_wakeup(Error **errp) +{ + qemu_system_wakeup_request(); +} + ObjectPropertyInfoList *qmp_qom_list(const char *path, Error **errp) { Object *obj; -- 1.7.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gerd Hoffmann Subject: [PATCH v3 3/6] suspend: add system_wakeup monitor command Date: Wed, 8 Feb 2012 12:00:16 +0100 Message-ID: <1328698819-31269-4-git-send-email-kraxel@redhat.com> References: <1328698819-31269-1-git-send-email-kraxel@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1328698819-31269-1-git-send-email-kraxel@redhat.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: qemu-devel@nongnu.org Cc: xen-devel@lists.xensource.com, Gerd Hoffmann List-Id: xen-devel@lists.xenproject.org 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. +## +{ '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 45052cc..9ff5ec3 100644 --- a/qmp.c +++ b/qmp.c @@ -164,6 +164,11 @@ void qmp_cont(Error **errp) vm_start(); } +void qmp_system_wakeup(Error **errp) +{ + qemu_system_wakeup_request(); +} + ObjectPropertyInfoList *qmp_qom_list(const char *path, Error **errp) { Object *obj; -- 1.7.1