[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/25] Monitor: Convert do_info_vnc_print() into do_
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 17/25] Monitor: Convert do_info_vnc_print() into do_info_vnc() |
Date: |
Mon, 6 Dec 2010 16:24:04 -0200 |
The new handler directly calls qmp_query_vnc() 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 +-
monitor.c | 3 +--
ui/vnc.c | 9 +++++++--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/console.h b/console.h
index 232714b..c72f612 100644
--- a/console.h
+++ b/console.h
@@ -369,7 +369,7 @@ void vnc_display_init(DisplayState *ds);
void vnc_display_close(DisplayState *ds);
int vnc_display_open(DisplayState *ds, const char *display);
int vnc_display_password(DisplayState *ds, const char *password);
-void do_info_vnc_print(Monitor *mon, const QObject *data);
+void do_info_vnc(Monitor *mon);
void qmp_query_vnc(Monitor *mon, QObject **ret_data);
char *vnc_display_local_addr(DisplayState *ds);
diff --git a/monitor.c b/monitor.c
index 3b86076..59b3866 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2567,8 +2567,7 @@ static const mon_cmd_t info_cmds[] = {
.args_type = "",
.params = "",
.help = "show the vnc server status",
- .user_print = do_info_vnc_print,
- .mhandler.info_new = qmp_query_vnc,
+ .mhandler.info = do_info_vnc,
},
{
.name = "name",
diff --git a/ui/vnc.c b/ui/vnc.c
index 4674f5e..51f6db4 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -302,15 +302,17 @@ static void info_vnc_iter(QObject *obj, void *opaque)
#endif
}
-void do_info_vnc_print(Monitor *mon, const QObject *data)
+void do_info_vnc(Monitor *mon)
{
QDict *server;
QList *clients;
+ QObject *data;
+ qmp_query_vnc(NULL, &data);
server = qobject_to_qdict(data);
if (qdict_get_bool(server, "enabled") == 0) {
monitor_printf(mon, "Server: disabled\n");
- return;
+ goto out;
}
monitor_printf(mon, "Server:\n");
@@ -325,6 +327,9 @@ void do_info_vnc_print(Monitor *mon, const QObject *data)
} else {
qlist_iter(clients, info_vnc_iter, mon);
}
+
+out:
+ qobject_decref(data);
}
void qmp_query_vnc(Monitor *mon, QObject **ret_data)
--
1.7.3.3.398.g0b0cd
- [Qemu-devel] [PATCH 05/25] Monitor: Convert do_info_version_print() into do_info_version(), (continued)
- [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, 2010/12/06
- [Qemu-devel] [PATCH 17/25] Monitor: Convert do_info_vnc_print() into do_info_vnc(),
Luiz Capitulino <=
- [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