From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>, gleb@redhat.com
Subject: [Qemu-devel] [PATCH v4 07/11] suspend: add system_wakeup monitor command
Date: Thu, 9 Feb 2012 18:05:39 +0100 [thread overview]
Message-ID: <1328807143-29499-8-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1328807143-29499-1-git-send-email-kraxel@redhat.com>
This patch adds the system_wakeup monitor command which will simply
wake up suspended guests.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
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..15d656f 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(QEMU_WAKEUP_REASON_OTHER);
+}
+
ObjectPropertyInfoList *qmp_qom_list(const char *path, Error **errp)
{
Object *obj;
--
1.7.1
next prev parent reply other threads:[~2012-02-09 17:06 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-09 17:05 [Qemu-devel] [PATCH v4 00/11] initial suspend support Gerd Hoffmann
2012-02-09 17:05 ` [Qemu-devel] [PATCH v4 01/11] acpi: move around structs Gerd Hoffmann
2012-02-09 17:05 ` [Qemu-devel] [PATCH v4 02/11] acpi: add ACPIREGS Gerd Hoffmann
2012-02-09 17:05 ` [Qemu-devel] [PATCH v4 03/11] acpi: don't pass overflow_time to acpi_pm1_evt_get_sts Gerd Hoffmann
2012-02-09 17:05 ` [Qemu-devel] [PATCH v4 04/11] acpi: add acpi_pm1_evt_write_en Gerd Hoffmann
2012-02-09 17:05 ` [Qemu-devel] [PATCH v4 05/11] suspend: add infrastructure Gerd Hoffmann
2012-02-13 9:21 ` Gleb Natapov
2012-02-14 8:18 ` Gerd Hoffmann
2012-02-14 8:37 ` Gleb Natapov
2012-02-14 8:57 ` Gerd Hoffmann
2012-02-14 9:08 ` Gleb Natapov
2012-02-14 14:49 ` Gerd Hoffmann
2012-02-09 17:05 ` [Qemu-devel] [PATCH v4 06/11] suspend: switch acpi s3 to new infrastructure Gerd Hoffmann
2012-02-09 17:05 ` Gerd Hoffmann [this message]
2012-02-09 17:05 ` [Qemu-devel] [PATCH v4 08/11] suspend: make ps/2 devices wakeup the guest Gerd Hoffmann
2012-02-09 17:05 ` [Qemu-devel] [PATCH v4 09/11] suspend: make serial ports " Gerd Hoffmann
2012-02-09 17:05 ` [Qemu-devel] [PATCH v4 10/11] suspend: make rtc alarm " Gerd Hoffmann
2012-02-09 17:05 ` [Qemu-devel] [PATCH v4 11/11] suspend: pmtimer s3 wakeup Gerd Hoffmann
2012-02-10 12:43 ` [Qemu-devel] [PATCH 12/11] suspend: add qmp events Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1328807143-29499-8-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=gleb@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).