[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/17] monitor: Convert do_info_status() to QObject
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 05/17] monitor: Convert do_info_status() to QObject |
Date: |
Tue, 17 Nov 2009 18:32:12 -0200 |
Return a QString with status information.
Signed-off-by: Luiz Capitulino <address@hidden>
---
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
- [Qemu-devel] [PATCH v0 00/17]: info handlers conversions to QObject, Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 01/17] Introduce qemu-objects.h header file, Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 02/17] Makefile: move QObject objs to their own entry, Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 03/17] QDict: Introduce qdict_get_qbool(), Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 04/17] QDict: Introduce qdict_get_qlist(), Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 05/17] monitor: Convert do_info_status() to QObject,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 06/17] monitor: Convert do_info_kvm() to QObject, Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 07/17] monitor: Convert do_info_name() to QObject, Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 08/17] monitor: Convert do_info_hpet() to QObject, Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 09/17] monitor: Convert do_info_uuid() to QObject, Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 11/17] block: Convert bdrv_info() to QObject, Luiz Capitulino, 2009/11/17
- [Qemu-devel] [PATCH 10/17] migration: Convert do_info_migrate() to QObject, Luiz Capitulino, 2009/11/17