[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/25] Monitor: Convert qemu_chr_info_print() into q
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 06/25] Monitor: Convert qemu_chr_info_print() into qemu_chr_info() |
Date: |
Mon, 6 Dec 2010 16:23:53 -0200 |
The new handler directly calls qmp_query_chardev() 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 | 3 +--
qemu-char.c | 8 ++++++--
qemu-char.h | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/monitor.c b/monitor.c
index 56575a6..d48c137 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2402,8 +2402,7 @@ static const mon_cmd_t info_cmds[] = {
.args_type = "",
.params = "",
.help = "show the character devices",
- .user_print = qemu_chr_info_print,
- .mhandler.info_new = qmp_query_chardev,
+ .mhandler.info = qemu_chr_info,
},
{
.name = "block",
diff --git a/qemu-char.c b/qemu-char.c
index e8788e6..063943f 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2584,9 +2584,13 @@ static void qemu_chr_qlist_iter(QObject *obj, void
*opaque)
qdict_get_str(chr_dict, "filename"));
}
-void qemu_chr_info_print(Monitor *mon, const QObject *ret_data)
+void qemu_chr_info(Monitor *mon)
{
- qlist_iter(qobject_to_qlist(ret_data), qemu_chr_qlist_iter, mon);
+ QObject *data;
+
+ qmp_query_chardev(NULL, &data);
+ qlist_iter(qobject_to_qlist(data), qemu_chr_qlist_iter, mon);
+ qobject_decref(data);
}
void qmp_query_chardev(Monitor *mon, QObject **ret_data)
diff --git a/qemu-char.h b/qemu-char.h
index a456bb9..09d3de3 100644
--- a/qemu-char.h
+++ b/qemu-char.h
@@ -92,7 +92,7 @@ int qemu_chr_can_read(CharDriverState *s);
void qemu_chr_read(CharDriverState *s, uint8_t *buf, int len);
int qemu_chr_get_msgfd(CharDriverState *s);
void qemu_chr_accept_input(CharDriverState *s);
-void qemu_chr_info_print(Monitor *mon, const QObject *ret_data);
+void qemu_chr_info(Monitor *mon);
void qmp_query_chardev(Monitor *mon, QObject **ret_data);
CharDriverState *qemu_chr_find(const char *name);
--
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 <=
- [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