From: Luiz Capitulino <lcapitulino@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 05/17] monitor: Convert do_info_status() to QObject
Date: Tue, 17 Nov 2009 18:32:12 -0200 [thread overview]
Message-ID: <1258489944-12159-6-git-send-email-lcapitulino@redhat.com> (raw)
In-Reply-To: <1258489944-12159-1-git-send-email-lcapitulino@redhat.com>
Return a QString with status information.
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
---
monitor.c | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/monitor.c b/monitor.c
index 3286ba2..72de320 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1678,16 +1678,36 @@ static void do_inject_nmi(Monitor *mon, const QDict *qdict)
}
#endif
-static void do_info_status(Monitor *mon)
+static void do_info_status_print(Monitor *mon, const QObject *data)
{
+ monitor_printf(mon, "VM status: %s\n",
+ qstring_get_str(qobject_to_qstring(data)));
+}
+
+/**
+ * do_info_status(): VM status
+ *
+ * Return a QString with status information, which can be:
+ *
+ * - "running"
+ * - "running (single step mode)"
+ * - "paused"
+ */
+static void do_info_status(Monitor *mon, QObject **ret_data)
+{
+ QString *qs;
+
if (vm_running) {
if (singlestep) {
- monitor_printf(mon, "VM status: running (single step mode)\n");
+ qs = qstring_from_str("running (single step mode)");
} else {
- monitor_printf(mon, "VM status: running\n");
+ qs = qstring_from_str("running");
}
- } else
- monitor_printf(mon, "VM status: paused\n");
+ } else {
+ qs = qstring_from_str("paused");
+ }
+
+ *ret_data = QOBJECT(qs);
}
/**
@@ -2117,7 +2137,8 @@ static const mon_cmd_t info_cmds[] = {
.args_type = "",
.params = "",
.help = "show the current VM status (running|paused)",
- .mhandler.info = do_info_status,
+ .user_print = do_info_status_print,
+ .mhandler.info_new = do_info_status,
},
{
.name = "pcmcia",
--
1.6.5.2.180.gc5b3e
next prev parent reply other threads:[~2009-11-17 20:32 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-17 20:32 [Qemu-devel] [PATCH v0 00/17]: info handlers conversions to QObject Luiz Capitulino
2009-11-17 20:32 ` [Qemu-devel] [PATCH 01/17] Introduce qemu-objects.h header file Luiz Capitulino
2009-11-17 20:32 ` [Qemu-devel] [PATCH 02/17] Makefile: move QObject objs to their own entry Luiz Capitulino
2009-11-17 20:32 ` [Qemu-devel] [PATCH 03/17] QDict: Introduce qdict_get_qbool() Luiz Capitulino
2009-11-17 20:32 ` [Qemu-devel] [PATCH 04/17] QDict: Introduce qdict_get_qlist() Luiz Capitulino
2009-11-17 20:32 ` Luiz Capitulino [this message]
2009-11-17 20:32 ` [Qemu-devel] [PATCH 06/17] monitor: Convert do_info_kvm() to QObject Luiz Capitulino
2009-11-17 20:32 ` [Qemu-devel] [PATCH 07/17] monitor: Convert do_info_name() " Luiz Capitulino
2009-11-17 20:32 ` [Qemu-devel] [PATCH 08/17] monitor: Convert do_info_hpet() " Luiz Capitulino
2009-11-17 20:32 ` [Qemu-devel] [PATCH 09/17] monitor: Convert do_info_uuid() " Luiz Capitulino
2009-11-20 13:38 ` Markus Armbruster
2009-11-17 20:32 ` [Qemu-devel] [PATCH 10/17] migration: Convert do_info_migrate() " Luiz Capitulino
2009-11-17 20:32 ` [Qemu-devel] [PATCH 11/17] block: Convert bdrv_info() " Luiz Capitulino
2009-11-20 14:06 ` Markus Armbruster
2009-11-23 13:21 ` Luiz Capitulino
2009-11-23 15:34 ` Markus Armbruster
2009-11-17 20:32 ` [Qemu-devel] [PATCH 12/17] char: Convert qemu_chr_info() " Luiz Capitulino
2009-11-20 14:10 ` Markus Armbruster
2009-11-23 13:23 ` Luiz Capitulino
2009-11-23 15:39 ` Markus Armbruster
2009-11-17 20:32 ` [Qemu-devel] [PATCH 13/17] PCI: Convert pci_device_hot_add() " Luiz Capitulino
2009-11-20 14:21 ` Markus Armbruster
2009-11-23 9:44 ` [Qemu-devel] " Michael S. Tsirkin
2009-11-23 13:30 ` Luiz Capitulino
2009-11-30 10:31 ` Michael S. Tsirkin
2009-11-17 20:32 ` [Qemu-devel] [PATCH 14/17] block: Convert bdrv_info_stats() " Luiz Capitulino
2009-11-17 20:32 ` [Qemu-devel] [PATCH 15/17] VNC: Convert do_info_vnc() " Luiz Capitulino
2009-11-17 20:32 ` [Qemu-devel] [PATCH 16/17] net: Convert do_info_network() " Luiz Capitulino
2009-11-17 20:32 ` [Qemu-devel] [PATCH 17/17] monitor: Convert do_info_mice() " Luiz Capitulino
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=1258489944-12159-6-git-send-email-lcapitulino@redhat.com \
--to=lcapitulino@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).