[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/19] monitor: Convert do_info_status() to QObject
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 08/19] monitor: Convert do_info_status() to QObject |
Date: |
Wed, 9 Dec 2009 14:27:47 -0200 |
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/monitor.c b/monitor.c
index 775e687..e7a6294 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1910,16 +1910,41 @@ 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)
{
- if (vm_running) {
- if (singlestep) {
- monitor_printf(mon, "VM status: running (single step mode)\n");
- } else {
- monitor_printf(mon, "VM status: running\n");
+ QDict *qdict;
+
+ qdict = qobject_to_qdict(data);
+
+ monitor_printf(mon, "VM status: ");
+ if (qdict_get_bool(qdict, "running")) {
+ monitor_printf(mon, "running");
+ if (qdict_get_bool(qdict, "single-step")) {
+ monitor_printf(mon, " (single step mode)");
}
- } else
- monitor_printf(mon, "VM status: paused\n");
+ } else {
+ monitor_printf(mon, "paused");
+ }
+
+ monitor_printf(mon, "\n");
+}
+
+/**
+ * do_info_status(): VM status
+ *
+ * Return a QDict with the following information:
+ *
+ * - "running": true if the VM is running, or false if it is paused
+ * - "single-step": true if the VM is in single step mode, false otherwise
+ *
+ * Example:
+ *
+ * { "running": true, "single-step": false }
+ */
+static void do_info_status(Monitor *mon, QObject **ret_data)
+{
+ *ret_data = qobject_from_jsonf("{ 'running': %i, 'single-step': %i }",
+ vm_running, singlestep);
}
/**
@@ -2370,7 +2395,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.6.rc1.39.g9a42
- [Qemu-devel] [PATCH 05/19] monitor: Fix do_info_balloon() output, (continued)
- [Qemu-devel] [PATCH 05/19] monitor: Fix do_info_balloon() output, Luiz Capitulino, 2009/12/09
- [Qemu-devel] [PATCH 06/19] monitor: do_info_cpus(): Use QBool, Luiz Capitulino, 2009/12/09
- Re: [Qemu-devel] [PATCH 06/19] monitor: do_info_cpus(): Use QBool, Markus Armbruster, 2009/12/10
- Re: [Qemu-devel] [PATCH 06/19] monitor: do_info_cpus(): Use QBool, Luiz Capitulino, 2009/12/10
- Re: [Qemu-devel] [PATCH 06/19] monitor: do_info_cpus(): Use QBool, Anthony Liguori, 2009/12/10
- Re: [Qemu-devel] [PATCH 06/19] monitor: do_info_cpus(): Use QBool, Luiz Capitulino, 2009/12/10
- Re: [Qemu-devel] [PATCH 06/19] monitor: do_info_cpus(): Use QBool, Anthony Liguori, 2009/12/10
- Re: [Qemu-devel] [PATCH 06/19] monitor: do_info_cpus(): Use QBool, Anthony Liguori, 2009/12/10
- Re: [Qemu-devel] [PATCH 06/19] monitor: do_info_cpus(): Use QBool, Markus Armbruster, 2009/12/10
[Qemu-devel] [PATCH 07/19] monitor: do_info_version(): Use QDict, Luiz Capitulino, 2009/12/09
[Qemu-devel] [PATCH 08/19] monitor: Convert do_info_status() to QObject,
Luiz Capitulino <=
[Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, Luiz Capitulino, 2009/12/09
- Re: [Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, Markus Armbruster, 2009/12/10
- Re: [Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, Luiz Capitulino, 2009/12/10
- Re: [Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, Anthony Liguori, 2009/12/10
- Re: [Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, Avi Kivity, 2009/12/10
- Re: [Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, Avi Kivity, 2009/12/10
- Re: [Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, Anthony Liguori, 2009/12/10
- Re: [Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, Avi Kivity, 2009/12/10
- Re: [Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, Anthony Liguori, 2009/12/10
- Re: [Qemu-devel] [PATCH 10/19] monitor: Convert do_info_name() to QObject, Avi Kivity, 2009/12/10