[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 06/23] qdev: Push QMP mode checks into qbus_list_
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v4 06/23] qdev: Push QMP mode checks into qbus_list_bus/dev |
Date: |
Wed, 16 Jun 2010 00:38:30 +0200 |
From: Jan Kiszka <address@hidden>
Simplifies the usage.
Signed-off-by: Jan Kiszka <address@hidden>
---
hw/qdev.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/hw/qdev.c b/hw/qdev.c
index 25f6e62..ac450cf 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -514,6 +514,9 @@ static void qbus_list_bus(DeviceState *dev)
BusState *child;
const char *sep = " ";
+ if (monitor_cur_is_qmp()) {
+ return;
+ }
error_printf("child busses at \"%s.%d\":",
dev->info->name, qdev_instance_no(dev));
QTAILQ_FOREACH(child, &dev->child_bus, sibling) {
@@ -528,6 +531,9 @@ static void qbus_list_dev(BusState *bus)
DeviceState *dev;
const char *sep = " ";
+ if (monitor_cur_is_qmp()) {
+ return;
+ }
error_printf("devices at \"%s\":", bus->name);
QTAILQ_FOREACH(dev, &bus->children, sibling) {
error_printf("%s\"%s.%d\"", sep, dev->info->name,
@@ -618,9 +624,7 @@ static BusState *qbus_find(const char *path)
dev = qbus_find_dev(bus, elem);
if (!dev) {
qerror_report(QERR_DEVICE_NOT_FOUND, elem);
- if (!monitor_cur_is_qmp()) {
- qbus_list_dev(bus);
- }
+ qbus_list_dev(bus);
return NULL;
}
if (dev->num_child_bus == 0) {
@@ -641,9 +645,7 @@ static BusState *qbus_find(const char *path)
bus = qbus_find_bus(dev, elem);
if (!bus) {
qerror_report(QERR_BUS_NOT_FOUND, elem);
- if (!monitor_cur_is_qmp()) {
- qbus_list_bus(dev);
- }
+ qbus_list_bus(dev);
return NULL;
}
}
--
1.6.0.2
- [Qemu-devel] [PATCH v4 01/23] qdev: Rework qtree path abbreviations, (continued)
[Qemu-devel] [PATCH v4 06/23] qdev: Push QMP mode checks into qbus_list_bus/dev,
Jan Kiszka <=
[Qemu-devel] [PATCH v4 05/23] qdev: Convert device and bus lists to QTAILQ, Jan Kiszka, 2010/06/15
[Qemu-devel] [PATCH v4 02/23] qdev: Restrict direct bus addressing via its name, Jan Kiszka, 2010/06/15
[Qemu-devel] [PATCH v4 08/23] qdev: Introduce qdev_iterate_recursive, Jan Kiszka, 2010/06/15
[Qemu-devel] [PATCH v4 07/23] qdev: Allow device specification by qtree path for device_del, Jan Kiszka, 2010/06/15
[Qemu-devel] [PATCH v4 09/23] monitor: Fix leakage during completion processing, Jan Kiszka, 2010/06/15