Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NkLcQ-0002DM-S6 for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:55 -0500 Received: from [199.232.76.173] (port=52970 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NkLcP-0002Cs-Qf for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:53 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NkLcG-0000RQ-9b for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:53 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:55075) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NkLcA-0000Pu-Ew for qemu-devel@nongnu.org; Wed, 24 Feb 2010 13:05:39 -0500 Received: from blackfin.pond.sub.org (pD9E38C12.dip.t-dialin.net [217.227.140.18]) by oxygen.pond.sub.org (Postfix) with ESMTPA id 973DB3127AF for ; Wed, 24 Feb 2010 18:56:05 +0100 (CET) From: Markus Armbruster Date: Wed, 24 Feb 2010 18:55:46 +0100 Message-Id: <1267034160-3517-35-git-send-email-armbru@redhat.com> In-Reply-To: <1267034160-3517-1-git-send-email-armbru@redhat.com> References: <1267034160-3517-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH RFC 34/48] qdev: Convert qbus_find() to QError List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@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 6495894..1887dde 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) { qemu_error("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) { - qemu_error("Did not find %s bus for %s", - path ? path : info->bus_info->name, info->name); - return NULL; + if (!bus) { + qemu_error("Did not find %s bus for %s", + info->bus_info->name, info->name); + return NULL; + } } if (qdev_hotplug && !bus->allow_hotplug) { qemu_error("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) { - qemu_error("bus \"%s\" not found", elem); + qemu_error_new(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) { - qemu_error("device \"%s\" not found", elem); + qemu_error_new(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: - qemu_error("device has no child bus (%s)", path); + qemu_error_new(QERR_DEVICE_NO_BUS, elem); return NULL; case 1: return QLIST_FIRST(&dev->child_bus); default: - qemu_error("device has multiple child busses (%s)", path); + qemu_error_new(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) { - qemu_error("child bus \"%s\" not found", elem); + qemu_error_new(QERR_BUS_NOT_FOUND, elem); qbus_list_bus(dev); return NULL; } -- 1.6.6