From 9b9df25a474bfee59dd46d033eb4ccc16582aac2 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 23 Feb 2012 13:45:21 +0100 Subject: suspend: add system_wakeup monitor command This patch adds the system_wakeup monitor command which will simply wake up suspended guests. Signed-off-by: Gerd Hoffmann Signed-off-by: Anthony Liguori --- 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(+) diff --git a/hmp-commands.hx b/hmp-commands.hx index 573b823347..64b3656d8e 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -349,6 +349,20 @@ STEXI @item c or cont @findex cont 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 { diff --git a/hmp.c b/hmp.c index 8ff8c9434e..3a54455574 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 18eecbdcb9..5409464954 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 d02ee867a5..d0b6792e3c 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -998,6 +998,17 @@ ## { 'command': 'cont' } +## +# @system_wakeup: +# +# Wakeup guest from suspend. Does nothing in case the guest isn't suspended. +# +# Since: 1.1 +# +# Returns: nothing. +## +{ 'command': 'system_wakeup' } + ## # @inject-nmi: # diff --git a/qmp-commands.hx b/qmp-commands.hx index dee95f1d67..705f704021 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -209,6 +209,27 @@ Example: -> { "execute": "cont" } <- { "return": {} } +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 { diff --git a/qmp.c b/qmp.c index 1f64844095..a182b5197e 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); +} + ObjectPropertyInfoList *qmp_qom_list(const char *path, Error **errp) { Object *obj; -- cgit v1.2.1