[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/25] Monitor: Convert bdrv_info_print() into bdrv_
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 07/25] Monitor: Convert bdrv_info_print() into bdrv_info() |
Date: |
Mon, 6 Dec 2010 16:23:54 -0200 |
The new handler directly calls qmp_query_block() to gather
data and then prints it. This change allows us to drop the
user_print callback.
Signed-off-by: Luiz Capitulino <address@hidden>
---
block.c | 6 +++++-
block.h | 2 +-
monitor.c | 3 +--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index a5d865b..2eadd70 100644
--- a/block.c
+++ b/block.c
@@ -1591,9 +1591,13 @@ static void bdrv_print_dict(QObject *obj, void *opaque)
monitor_printf(mon, "\n");
}
-void bdrv_info_print(Monitor *mon, const QObject *data)
+void bdrv_info(Monitor *mon)
{
+ QObject *data;
+
+ qmp_query_block(NULL, &data);
qlist_iter(qobject_to_qlist(data), bdrv_print_dict, mon);
+ qobject_decref(data);
}
void qmp_query_block(Monitor *mon, QObject **ret_data)
diff --git a/block.h b/block.h
index a979d5b..e71b6ad 100644
--- a/block.h
+++ b/block.h
@@ -52,8 +52,8 @@ typedef enum {
void bdrv_mon_event(const BlockDriverState *bdrv,
BlockMonEventAction action, int is_read);
-void bdrv_info_print(Monitor *mon, const QObject *data);
void qmp_query_block(Monitor *mon, QObject **ret_data);
+void bdrv_info(Monitor *mon);
void bdrv_stats_print(Monitor *mon, const QObject *data);
void qmp_query_blockstats(Monitor *mon, QObject **ret_data);
diff --git a/monitor.c b/monitor.c
index d48c137..2bdaf03 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2409,8 +2409,7 @@ static const mon_cmd_t info_cmds[] = {
.args_type = "",
.params = "",
.help = "show the block devices",
- .user_print = bdrv_info_print,
- .mhandler.info_new = qmp_query_block,
+ .mhandler.info = bdrv_info,
},
{
.name = "blockstats",
--
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, 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 <=
- [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, 2010/12/06
- [Qemu-devel] [PATCH 19/25] Monitor: Convert do_info_name_print() into do_info_name(), Luiz Capitulino, 2010/12/06