[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/20] monitor: Convert do_info_name() to QObject
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 11/20] monitor: Convert do_info_name() to QObject |
Date: |
Thu, 10 Dec 2009 12:43:26 -0200 |
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/monitor.c b/monitor.c
index 3f26c5a..a2433e9 100644
--- a/monitor.c
+++ b/monitor.c
@@ -514,10 +514,33 @@ static void do_info_version(Monitor *mon, QObject
**ret_data)
QEMU_VERSION, QEMU_PKGVERSION);
}
-static void do_info_name(Monitor *mon)
+static void do_info_name_print(Monitor *mon, const QObject *data)
{
- if (qemu_name)
- monitor_printf(mon, "%s\n", qemu_name);
+ QDict *qdict;
+
+ qdict = qobject_to_qdict(data);
+ if (qdict_size(qdict) == 0) {
+ return;
+ }
+
+ monitor_printf(mon, "%s\n", qdict_get_str(qdict, "name"));
+}
+
+/**
+ * do_info_name(): Show VM name
+ *
+ * Return a QDict with the following information:
+ *
+ * - "name": VM's name (optional)
+ *
+ * Example:
+ *
+ * { "name": "qemu-name" }
+ */
+static void do_info_name(Monitor *mon, QObject **ret_data)
+{
+ *ret_data = qemu_name ? qobject_from_jsonf("{'name': %s }", qemu_name) :
+ qobject_from_jsonf("{}");
}
static QObject *get_cmd_dict(const char *name)
@@ -2472,7 +2495,8 @@ static const mon_cmd_t info_cmds[] = {
.args_type = "",
.params = "",
.help = "show the current VM name",
- .mhandler.info = do_info_name,
+ .user_print = do_info_name_print,
+ .mhandler.info_new = do_info_name,
},
{
.name = "uuid",
--
1.6.6.rc1.39.g9a42
- [Qemu-devel] [PATCH 01/20] Introduce qemu-objects.h header file, (continued)
- [Qemu-devel] [PATCH 01/20] Introduce qemu-objects.h header file, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 03/20] QDict: Introduce qdict_get_qbool(), 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 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 08/20] monitor: do_info_version(): Use QDict, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 07/20] monitor: do_info_cpus(): Use QBool, Luiz Capitulino, 2009/12/10
- [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 <=
- [Qemu-devel] [PATCH 12/20] monitor: Convert do_info_hpet() 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 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
- [Qemu-devel] [PATCH 19/20] PCI: Convert pci_device_hot_add() to QObject, Luiz Capitulino, 2009/12/10
- [Qemu-devel] [PATCH 20/20] VNC: Convert do_info_vnc() to QObject, Luiz Capitulino, 2009/12/10