[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 21/25] Monitor: Convert do_info_uuid_print() into do
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 21/25] Monitor: Convert do_info_uuid_print() into do_info_uuid() |
Date: |
Mon, 6 Dec 2010 16:24:08 -0200 |
The new handler directly calls qmp_query_uuid() 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 | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/monitor.c b/monitor.c
index e9b07f3..3b6137e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -818,9 +818,13 @@ static void qmp_query_uuid(Monitor *mon, QObject
**ret_data)
*ret_data = qobject_from_jsonf("{ 'UUID': %s }", uuid);
}
-static void do_info_uuid_print(Monitor *mon, const QObject *data)
+static void do_info_uuid(Monitor *mon)
{
+ QObject *data;
+
+ qmp_query_uuid(NULL, &data);
monitor_printf(mon, "%s\n", qdict_get_str(qobject_to_qdict(data), "UUID"));
+ qobject_decref(data);
}
/* get the current CPU defined by the user */
@@ -2586,8 +2590,7 @@ static const mon_cmd_t info_cmds[] = {
.args_type = "",
.params = "",
.help = "show the current VM UUID",
- .user_print = do_info_uuid_print,
- .mhandler.info_new = qmp_query_uuid,
+ .mhandler.info = do_info_uuid,
},
#if defined(TARGET_PPC)
{
--
1.7.3.3.398.g0b0cd
- [Qemu-devel] [PATCH 09/25] Monitor: Move qmp_query_cpus() up in monitor.c, (continued)
- [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, 2010/12/06
- [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 <=
- [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