[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 19/25] Monitor: Convert do_info_name_print() into do
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 19/25] Monitor: Convert do_info_name_print() into do_info_name() |
Date: |
Mon, 6 Dec 2010 16:24:06 -0200 |
The new handler directly calls qmp_query_name() to gather
data and then prints it. This change allows us to drop the
user_print callback.
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/monitor.c b/monitor.c
index 89325d8..2d1f183 100644
--- a/monitor.c
+++ b/monitor.c
@@ -754,16 +754,21 @@ static void qmp_query_name(Monitor *mon, QObject
**ret_data)
qobject_from_jsonf("{}");
}
-static void do_info_name_print(Monitor *mon, const QObject *data)
+static void do_info_name(Monitor *mon)
{
QDict *qdict;
+ QObject *data;
+ qmp_query_name(NULL, &data);
qdict = qobject_to_qdict(data);
if (qdict_size(qdict) == 0) {
- return;
+ goto out;
}
monitor_printf(mon, "%s\n", qdict_get_str(qdict, "name"));
+
+out:
+ qobject_decref(data);
}
static QObject *get_cmd_dict(const char *name)
@@ -2574,8 +2579,7 @@ static const mon_cmd_t info_cmds[] = {
.args_type = "",
.params = "",
.help = "show the current VM name",
- .user_print = do_info_name_print,
- .mhandler.info_new = qmp_query_name,
+ .mhandler.info = do_info_name,
},
{
.name = "uuid",
--
1.7.3.3.398.g0b0cd
- [Qemu-devel] [PATCH 07/25] Monitor: Convert bdrv_info_print() into bdrv_info(), (continued)
- [Qemu-devel] [PATCH 07/25] Monitor: Convert bdrv_info_print() into bdrv_info(), Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 08/25] Monitor: Convert bdrv_stats_print() into bdrv_stats(), Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 09/25] Monitor: Move qmp_query_cpus() up in monitor.c, Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 10/25] Monitor: Convert monitor_print_cpus() into do_info_cpus(), Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 11/25] Monitor: Convert do_pci_info_print() into do_pci_info(), Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 13/25] Monitor: Convert do_info_kvm_print() into do_info_kvm(), Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 14/25] Monitor: Move qmp_query_status() up in monitor.c, Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 15/25] Monitor: Convert do_info_status_print() into do_info_status(), Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 16/25] Monitor: Convert do_info_mice_print() into do_info_mice(), Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 17/25] Monitor: Convert do_info_vnc_print() into do_info_vnc(), Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 19/25] Monitor: Convert do_info_name_print() into do_info_name(),
Luiz Capitulino <=
- [Qemu-devel] [PATCH 18/25] Monitor: Move qmp_query_name() up in monitor.c, Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 21/25] Monitor: Convert do_info_uuid_print() into do_info_uuid(), Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 20/25] Monitor: Move qmp_query_uuid() up in monitor.c, Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 22/25] Monitor: qmp_query_migrate(): Return {} for empty MigrationState, Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 23/25] Monitor: Convert do_info_migrate_print() into do_info_migrate(), Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 24/25] Monitor: Introduce do_info_balloon(), Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 25/25] Monitor: do_info(): Drop unused code, Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 12/25] Monitor: Move qmp_query_kvm() up in monitor.c, Luiz Capitulino, 2010/12/06