[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/25] Monitor: Convert do_info_version_print() into
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 05/25] Monitor: Convert do_info_version_print() into do_info_version() |
Date: |
Mon, 6 Dec 2010 16:23:52 -0200 |
The new handler directly calls qmp_query_version() 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, 7 insertions(+), 5 deletions(-)
diff --git a/monitor.c b/monitor.c
index 6252b3f..56575a6 100644
--- a/monitor.c
+++ b/monitor.c
@@ -730,11 +730,12 @@ static void qmp_query_version(Monitor *mon, QObject
**ret_data)
'micro': %d }, 'package': %s }", major, minor, micro, QEMU_PKGVERSION);
}
-static void do_info_version_print(Monitor *mon, const QObject *data)
+static void do_info_version(Monitor *mon)
{
- QDict *qdict;
- QDict *qemu;
+ QDict *qdict, *qemu;
+ QObject *data;
+ qmp_query_version(NULL, &data);
qdict = qobject_to_qdict(data);
qemu = qdict_get_qdict(qdict, "qemu");
@@ -743,6 +744,8 @@ static void do_info_version_print(Monitor *mon, const
QObject *data)
qdict_get_int(qemu, "minor"),
qdict_get_int(qemu, "micro"),
qdict_get_str(qdict, "package"));
+
+ qobject_decref(data);
}
static void do_info_name_print(Monitor *mon, const QObject *data)
@@ -2385,8 +2388,7 @@ static const mon_cmd_t info_cmds[] = {
.args_type = "",
.params = "",
.help = "show the version of QEMU",
- .user_print = do_info_version_print,
- .mhandler.info_new = qmp_query_version,
+ .mhandler.info = do_info_version,
},
{
.name = "network",
--
1.7.3.3.398.g0b0cd
- [Qemu-devel] [PATCH v1 00/25]: Monitor: First step on an internal QMP API, Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 01/25] QMP: Rename query handlers, Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 03/25] Monitor: Drop balloon handlers comments, Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 02/25] QMP: Drop user_print usage from the qmp_query_cmds[] table, Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 04/25] Monitor: Move qmp_query_version() up in monitor.c, Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 06/25] Monitor: Convert qemu_chr_info_print() into qemu_chr_info(), Luiz Capitulino, 2010/12/06
- [Qemu-devel] [PATCH 05/25] Monitor: Convert do_info_version_print() into do_info_version(),
Luiz Capitulino <=
- [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