From patchwork Sat May 22 08:18:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 53250 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2B85CB7D20 for ; Sat, 22 May 2010 18:28:16 +1000 (EST) Received: from localhost ([127.0.0.1]:59890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OFk2t-0001Al-Qd for incoming@patchwork.ozlabs.org; Sat, 22 May 2010 04:26:59 -0400 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 ) 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 ) id 1OFjuU-0000Gt-Mf for qemu-devel@nongnu.org; Sat, 22 May 2010 04:18:19 -0400 Received: from smtp04.web.de ( [172.20.0.225]) by fmmailgate02.web.de (Postfix) with ESMTP id 2F867161E57B4; Sat, 22 May 2010 10:18:18 +0200 (CEST) Received: from [88.65.39.229] (helo=localhost.localdomain) by smtp04.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #4) id 1OFjuP-00046n-00; Sat, 22 May 2010 10:18:13 +0200 From: Jan Kiszka To: qemu-devel@nongnu.org, Anthony Liguori Date: Sat, 22 May 2010 10:18:03 +0200 Message-Id: <94cfebce71a4a511672068166e60df770a16b02f.1274516288.git.jan.kiszka@web.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: References: In-Reply-To: References: X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX1/g9V5yaB4DE0hf70+u9zPP3SNS950di0VFLfTE D5ZYyunqlP2xP9jC00NtuWWLfFCqS8J5WYD/fGsFhlgCLWE5uq 3gxzM4vkw= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Jan Kiszka , Avi Kivity , Juan Quintela , Markus Armbruster , Luiz Capitulino Subject: [Qemu-devel] [PATCH v2 06/15] qdev: Push QMP mode checks into qbus_list_bus/dev X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jan Kiszka Simplifies the usage. Signed-off-by: Jan Kiszka --- 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; }