[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/25] Monitor: Convert do_pci_info_print() into do_
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 11/25] Monitor: Convert do_pci_info_print() into do_pci_info() |
Date: |
Mon, 6 Dec 2010 16:23:58 -0200 |
The new handler directly calls qmp_query_pci() to gather
data and then prints it. This change allows us to drop the
user_print callback.
Signed-off-by: Luiz Capitulino <address@hidden>
---
hw/pci.c | 7 ++++++-
hw/pci.h | 2 +-
monitor.c | 3 +--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index 08c36ec..ba204bf 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -1276,9 +1276,12 @@ static void pci_device_print(Monitor *mon, QDict *device)
}
}
-void do_pci_info_print(Monitor *mon, const QObject *data)
+void do_pci_info(Monitor *mon)
{
QListEntry *bus, *dev;
+ QObject *data;
+
+ qmp_query_pci(NULL, &data);
QLIST_FOREACH_ENTRY(qobject_to_qlist(data), bus) {
QDict *qdict = qobject_to_qdict(qlist_entry_obj(bus));
@@ -1286,6 +1289,8 @@ void do_pci_info_print(Monitor *mon, const QObject *data)
pci_device_print(mon, qobject_to_qdict(qlist_entry_obj(dev)));
}
}
+
+ qobject_decref(data);
}
static QObject *pci_get_dev_class(const PCIDevice *dev)
diff --git a/hw/pci.h b/hw/pci.h
index b87c6c0..22509dc 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -253,7 +253,7 @@ int pci_parse_devaddr(const char *addr, int *domp, int
*busp,
int pci_read_devaddr(Monitor *mon, const char *addr, int *domp, int *busp,
unsigned *slotp);
-void do_pci_info_print(Monitor *mon, const QObject *data);
+void do_pci_info(Monitor *mon);
void qmp_query_pci(Monitor *mon, QObject **ret_data);
void pci_bridge_update_mappings(PCIBus *b);
diff --git a/monitor.c b/monitor.c
index 2164853..1fbe78b 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2458,8 +2458,7 @@ static const mon_cmd_t info_cmds[] = {
.args_type = "",
.params = "",
.help = "show PCI info",
- .user_print = do_pci_info_print,
- .mhandler.info_new = qmp_query_pci,
+ .mhandler.info = do_pci_info,
},
#if defined(TARGET_I386) || defined(TARGET_SH4)
{
--
1.7.3.3.398.g0b0cd
- Re: [Qemu-devel] [PATCH 01/25] QMP: Rename query handlers, (continued)
- [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, 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 <=
- [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