[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/20] monitor: do_info_version(): Use QDict
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 08/20] monitor: do_info_version(): Use QDict |
Date: |
Thu, 10 Dec 2009 17:15:58 -0200 |
All 'info' commands should use QDict, this commit also kills
monitor_print_qobject() as do_info_version() doesn't use it
anymore (and no handler will).
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/monitor.c b/monitor.c
index 49db7cf..481a0fa 100644
--- a/monitor.c
+++ b/monitor.c
@@ -257,24 +257,6 @@ static inline int monitor_has_error(const Monitor *mon)
return mon->error != NULL;
}
-static void monitor_print_qobject(Monitor *mon, const QObject *data)
-{
- switch (qobject_type(data)) {
- case QTYPE_QSTRING:
- monitor_printf(mon,
"%s",qstring_get_str(qobject_to_qstring(data)));
- break;
- case QTYPE_QINT:
- monitor_printf(mon, "%"
PRId64,qint_get_int(qobject_to_qint(data)));
- break;
- default:
- monitor_printf(mon, "ERROR: unsupported type: %d",
- qobject_type(data));
- break;
- }
-
- monitor_puts(mon, "\n");
-}
-
static void monitor_json_emitter(Monitor *mon, const QObject *data)
{
QString *json;
@@ -504,12 +486,32 @@ help:
help_cmd(mon, "info");
}
+static void do_info_version_print(Monitor *mon, const QObject *data)
+{
+ QDict *qdict;
+
+ qdict = qobject_to_qdict(data);
+
+ monitor_printf(mon, "%s%s\n", qdict_get_str(qdict, "qemu"),
+ qdict_get_str(qdict, "package"));
+}
+
/**
* do_info_version(): Show QEMU version
+ *
+ * Return a QDict with the following information:
+ *
+ * - "qemu": QEMU's version
+ * - "package": package's version
+ *
+ * Example:
+ *
+ * { "qemu": "0.11.50", "package": "" }
*/
static void do_info_version(Monitor *mon, QObject **ret_data)
{
- *ret_data = QOBJECT(qstring_from_str(QEMU_VERSION QEMU_PKGVERSION));
+ *ret_data = qobject_from_jsonf("{ 'qemu': %s, 'package': %s }",
+ QEMU_VERSION, QEMU_PKGVERSION);
}
static void do_info_name(Monitor *mon)
@@ -2223,7 +2225,7 @@ static const mon_cmd_t info_cmds[] = {
.args_type = "",
.params = "",
.help = "show the version of QEMU",
- .user_print = monitor_print_qobject,
+ .user_print = do_info_version_print,
.mhandler.info_new = do_info_version,
},
{
--
1.6.6.rc1.39.g9a42
- [Qemu-devel] [FOR 0.12 v5 00/20]: info handlers conversions to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 01/20] Introduce qemu-objects.h header file, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 02/20] Makefile: move QObject objs to their own entry, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 03/20] QDict: Introduce qdict_get_qbool(), Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 04/20] QDict: Introduce qdict_get_qlist(), Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 05/20] monitor: Fix do_info_balloon() output, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 06/20] monitor: Fix do_info_commands() output, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 07/20] monitor: do_info_cpus(): Use QBool, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 08/20] monitor: do_info_version(): Use QDict,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 09/20] monitor: Convert do_info_status() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 10/20] monitor: Convert do_info_kvm() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 11/20] monitor: Convert do_info_name() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 13/20] monitor: Convert do_info_uuid() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 12/20] monitor: Convert do_info_hpet() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 14/20] monitor: Convert do_info_mice() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 15/20] migration: Convert do_info_migrate() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 16/20] block: Convert bdrv_info() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 17/20] block: Convert bdrv_info_stats() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 18/20] char: Convert qemu_chr_info() to QObject, Luiz Capitulino, 2009/12/10