From patchwork Thu Mar 4 15:56:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 46960 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 77D7DB7C59 for ; Fri, 5 Mar 2010 04:33:22 +1100 (EST) Received: from localhost ([127.0.0.1]:46020 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NnEvG-0006Va-5b for incoming@patchwork.ozlabs.org; Thu, 04 Mar 2010 12:33:18 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NnDXf-0005lJ-W3 for qemu-devel@nongnu.org; Thu, 04 Mar 2010 11:04:52 -0500 Received: from [199.232.76.173] (port=58594 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NnDXf-0005ks-88 for qemu-devel@nongnu.org; Thu, 04 Mar 2010 11:04:51 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NnDXR-0001Qw-1A for qemu-devel@nongnu.org; Thu, 04 Mar 2010 11:04:50 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:47486) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NnDXO-0001PK-IX for qemu-devel@nongnu.org; Thu, 04 Mar 2010 11:04:35 -0500 Received: from blackfin.pond.sub.org (pD9E38041.dip.t-dialin.net [217.227.128.65]) by oxygen.pond.sub.org (Postfix) with ESMTPA id D52702DD310 for ; Thu, 4 Mar 2010 17:04:30 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 7B7E823A; Thu, 4 Mar 2010 16:57:13 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 4 Mar 2010 16:56:58 +0100 Message-Id: <1267718231-13303-38-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.6.6.1 In-Reply-To: <1267718231-13303-1-git-send-email-armbru@redhat.com> References: <1267718231-13303-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: Luiz Capitulino Subject: [Qemu-devel] [PATCH 37/50] qdev: Convert qbus_find() to QError 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 Signed-off-by: Markus Armbruster --- hw/qdev.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 40b07fb..bbb1e44 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -216,18 +216,21 @@ DeviceState *qdev_device_add(QemuOpts *opts) path = qemu_opt_get(opts, "bus"); if (path != NULL) { bus = qbus_find(path); - if (bus && bus->info != info->bus_info) { + if (!bus) { + return NULL; + } + if (bus->info != info->bus_info) { error_report("Device '%s' can't go on a %s bus", driver, bus->info->name); return NULL; } } else { bus = qbus_find_recursive(main_system_bus, NULL, info->bus_info); - } - if (!bus) { - error_report("Did not find %s bus for %s", - path ? path : info->bus_info->name, info->name); - return NULL; + if (!bus) { + error_report("Did not find %s bus for %s", + info->bus_info->name, info->name); + return NULL; + } } if (qdev_hotplug && !bus->allow_hotplug) { error_report("Bus %s does not support hotplugging", @@ -560,7 +563,7 @@ static BusState *qbus_find(const char *path) } bus = qbus_find_recursive(main_system_bus, elem, NULL); if (!bus) { - error_report("bus \"%s\" not found", elem); + qerror_report(QERR_BUS_NOT_FOUND, elem); return NULL; } pos = len; @@ -583,7 +586,7 @@ static BusState *qbus_find(const char *path) pos += len; dev = qbus_find_dev(bus, elem); if (!dev) { - error_report("device \"%s\" not found", elem); + qerror_report(QERR_DEVICE_NOT_FOUND, elem); qbus_list_dev(bus); return NULL; } @@ -597,12 +600,12 @@ static BusState *qbus_find(const char *path) * one child bus accept it nevertheless */ switch (dev->num_child_bus) { case 0: - error_report("device has no child bus (%s)", path); + qerror_report(QERR_DEVICE_NO_BUS, elem); return NULL; case 1: return QLIST_FIRST(&dev->child_bus); default: - error_report("device has multiple child busses (%s)", path); + qerror_report(QERR_DEVICE_MULTIPLE_BUSSES, elem); qbus_list_bus(dev); return NULL; } @@ -616,7 +619,7 @@ static BusState *qbus_find(const char *path) pos += len; bus = qbus_find_bus(dev, elem); if (!bus) { - error_report("child bus \"%s\" not found", elem); + qerror_report(QERR_BUS_NOT_FOUND, elem); qbus_list_bus(dev); return NULL; }