[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 16/25] Monitor: Convert do_info_mice_print() into do
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 16/25] Monitor: Convert do_info_mice_print() into do_info_mice() |
Date: |
Mon, 6 Dec 2010 16:24:03 -0200 |
The new handler directly calls qmp_query_mice() to gather
data and then prints it. This change allows us to drop the
user_print callback.
Signed-off-by: Luiz Capitulino <address@hidden>
---
console.h | 2 +-
input.c | 9 +++++++--
monitor.c | 3 +--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/console.h b/console.h
index f613e4e..232714b 100644
--- a/console.h
+++ b/console.h
@@ -72,7 +72,7 @@ struct MouseTransformInfo {
int a[7];
};
-void do_info_mice_print(Monitor *mon, const QObject *data);
+void do_info_mice(Monitor *mon);
void qmp_query_mice(Monitor *mon, QObject **ret_data);
void do_mouse_set(Monitor *mon, const QDict *qdict);
diff --git a/input.c b/input.c
index a3ea9c2..cbe0074 100644
--- a/input.c
+++ b/input.c
@@ -207,17 +207,22 @@ static void info_mice_iter(QObject *data, void *opaque)
qdict_get_bool(mouse, "absolute") ? " (absolute)" : "");
}
-void do_info_mice_print(Monitor *mon, const QObject *data)
+void do_info_mice(Monitor *mon)
{
QList *mice_list;
+ QObject *data;
+ qmp_query_mice(NULL, &data);
mice_list = qobject_to_qlist(data);
if (qlist_empty(mice_list)) {
monitor_printf(mon, "No mouse devices connected\n");
- return;
+ goto out;
}
qlist_iter(mice_list, info_mice_iter, mon);
+
+out:
+ qobject_decref(data);
}
void qmp_query_mice(Monitor *mon, QObject **ret_data)
diff --git a/monitor.c b/monitor.c
index 445c73a..3b86076 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2560,8 +2560,7 @@ static const mon_cmd_t info_cmds[] = {
.args_type = "",
.params = "",
.help = "show which guest mouse is receiving events",
- .user_print = do_info_mice_print,
- .mhandler.info_new = qmp_query_mice,
+ .mhandler.info = do_info_mice,
},
{
.name = "vnc",
--
1.7.3.3.398.g0b0cd
- [Qemu-devel] [PATCH 06/25] Monitor: Convert qemu_chr_info_print() into qemu_chr_info(), (continued)
- [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, 2010/12/06
- [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 <=
- [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, 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