From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=58402 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OFjuZ-0005Nl-5k
	for qemu-devel@nongnu.org; Sat, 22 May 2010 04:18:41 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <jan.kiszka@web.de>) id 1OFjuV-0000HX-5Z
	for qemu-devel@nongnu.org; Sat, 22 May 2010 04:18:23 -0400
Received: from fmmailgate02.web.de ([217.72.192.227]:55671)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <jan.kiszka@web.de>) id 1OFjuU-0000Gt-Mf
	for qemu-devel@nongnu.org; Sat, 22 May 2010 04:18:19 -0400
From: Jan Kiszka <jan.kiszka@web.de>
Date: Sat, 22 May 2010 10:18:03 +0200
Message-Id: <94cfebce71a4a511672068166e60df770a16b02f.1274516288.git.jan.kiszka@web.de>
In-Reply-To: <cover.1274516288.git.jan.kiszka@web.de>
References: <cover.1274516288.git.jan.kiszka@web.de>
In-Reply-To: <cover.1274516288.git.jan.kiszka@web.de>
References: <cover.1274516288.git.jan.kiszka@web.de>
Sender: jan.kiszka@web.de
Subject: [Qemu-devel] [PATCH v2 06/15] qdev: Push QMP mode checks into
	qbus_list_bus/dev
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org, Anthony Liguori <aliguori@us.ibm.com>
Cc: Jan Kiszka <jan.kiszka@siemens.com>, Avi Kivity <avi@redhat.com>, Juan Quintela <quintela@redhat.com>, Markus Armbruster <armbru@redhat.com>, Luiz Capitulino <lcapitulino@redhat.com>

From: Jan Kiszka <jan.kiszka@siemens.com>

Simplifies the usage.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 hw/qdev.c |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/hw/qdev.c b/hw/qdev.c
index fa611a1..db005ce 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -492,6 +492,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\":",
                  dev->id ? dev->id : dev->info->name);
     QTAILQ_FOREACH(child, &dev->child_bus, sibling) {
@@ -506,6 +509,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\"", sep, dev->info->name);
@@ -611,9 +617,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;
         }
 
@@ -633,9 +637,7 @@ search_dev_bus:
                 return QTAILQ_FIRST(&dev->child_bus);
             default:
                 qerror_report(QERR_DEVICE_MULTIPLE_BUSSES, elem);
-                if (!monitor_cur_is_qmp()) {
-                    qbus_list_bus(dev);
-                }
+                qbus_list_bus(dev);
                 return NULL;
             }
         }
@@ -658,9 +660,7 @@ search_dev_bus:
                 }
             }
             qerror_report(QERR_BUS_NOT_FOUND, elem);
-            if (!monitor_cur_is_qmp()) {
-                qbus_list_bus(dev);
-            }
+            qbus_list_bus(dev);
             return NULL;
         }
     }
@@ -697,9 +697,7 @@ static DeviceState *qdev_find(const char *path)
     dev = qbus_find_dev(bus, dev_name);
     if (!dev) {
         qerror_report(QERR_DEVICE_NOT_FOUND, dev_name);
-        if (!monitor_cur_is_qmp()) {
-            qbus_list_dev(bus);
-        }
+        qbus_list_dev(bus);
     }
     return dev;
 }
-- 
1.6.0.2