[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 23/25] Monitor: Convert do_info_migrate_print() into
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 23/25] Monitor: Convert do_info_migrate_print() into do_info_migrate() |
Date: |
Mon, 6 Dec 2010 16:24:10 -0200 |
The new handler directly calls qmp_query_migrate() to gather
data and then prints it. This change allows us to drop the
user_print callback.
Signed-off-by: Luiz Capitulino <address@hidden>
---
migration.c | 8 ++++++--
migration.h | 2 +-
monitor.c | 3 +--
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/migration.c b/migration.c
index ed253af..df10354 100644
--- a/migration.c
+++ b/migration.c
@@ -187,13 +187,15 @@ static void migrate_print_status(Monitor *mon, const char
*name,
qdict_get_int(qdict, "total") >> 10);
}
-void do_info_migrate_print(Monitor *mon, const QObject *data)
+void do_info_migrate(Monitor *mon)
{
QDict *qdict;
+ QObject *data;
+ qmp_query_migrate(NULL, &data);
qdict = qobject_to_qdict(data);
if (qdict_size(qdict) == 0) {
- return;
+ goto out;
}
monitor_printf(mon, "Migration status: %s\n",
@@ -206,6 +208,8 @@ void do_info_migrate_print(Monitor *mon, const QObject
*data)
if (qdict_haskey(qdict, "disk")) {
migrate_print_status(mon, "disk", qdict);
}
+out:
+ qobject_decref(data);
}
static void migrate_put_status(QDict *qdict, const char *name,
diff --git a/migration.h b/migration.h
index 30ee679..96d4eb3 100644
--- a/migration.h
+++ b/migration.h
@@ -65,7 +65,7 @@ uint64_t migrate_max_downtime(void);
int do_migrate_set_downtime(Monitor *mon, const QDict *qdict,
QObject **ret_data);
-void do_info_migrate_print(Monitor *mon, const QObject *data);
+void do_info_migrate(Monitor *mon);
void qmp_query_migrate(Monitor *mon, QObject **ret_data);
diff --git a/monitor.c b/monitor.c
index 3b6137e..97bab21 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2615,8 +2615,7 @@ static const mon_cmd_t info_cmds[] = {
.args_type = "",
.params = "",
.help = "show migration status",
- .user_print = do_info_migrate_print,
- .mhandler.info_new = qmp_query_migrate,
+ .mhandler.info = do_info_migrate,
},
{
.name = "balloon",
--
1.7.3.3.398.g0b0cd
- [Qemu-devel] [PATCH 13/25] Monitor: Convert do_info_kvm_print() into do_info_kvm(), (continued)
- [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, 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 <=
- [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