From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NkLTN-00085q-2a for qemu-devel@nongnu.org; Wed, 24 Feb 2010 12:56:33 -0500 Received: from [199.232.76.173] (port=59156 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NkLTL-00084S-DO for qemu-devel@nongnu.org; Wed, 24 Feb 2010 12:56:31 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NkLT7-0006TL-27 for qemu-devel@nongnu.org; Wed, 24 Feb 2010 12:56:30 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:37632) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NkLT4-0006S0-FZ for qemu-devel@nongnu.org; Wed, 24 Feb 2010 12:56:14 -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 6992E3127B6 for ; Wed, 24 Feb 2010 18:56:06 +0100 (CET) From: Markus Armbruster Date: Wed, 24 Feb 2010 18:55:54 +0100 Message-Id: <1267034160-3517-43-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 42/48] error: Convert do_device_add() to QError List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Conversion to QObject is still missing. Signed-off-by: Markus Armbruster --- hw/qdev.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 4e348fd..a028e9c 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -200,15 +200,15 @@ DeviceState *qdev_device_add(QemuOpts *opts) driver = qemu_opt_get(opts, "driver"); if (!driver) { - qemu_error("-device: no driver specified"); + qemu_error_new(QERR_MISSING_PARAMETER, "driver"); return NULL; } /* find driver */ info = qdev_find_info(NULL, driver); if (!info || info->no_user) { - qemu_error("Device \"%s\" not found. Try -device '?' for a list.", - driver); + qemu_error_new(QERR_INVALID_PARAMETER, "driver"); + error_printf_unless_qmp("Try with argument '?' for a list.\n"); return NULL; } @@ -220,21 +220,20 @@ DeviceState *qdev_device_add(QemuOpts *opts) return NULL; } if (bus->info != info->bus_info) { - qemu_error("Device '%s' can't go on a %s bus", - driver, bus->info->name); + qemu_error_new(QERR_BAD_BUS_FOR_DEVICE, + 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", - info->bus_info->name, info->name); + qemu_error_new(QERR_NO_BUS_FOR_DEVICE, + info->name, info->bus_info->name); return NULL; } } if (qdev_hotplug && !bus->allow_hotplug) { - qemu_error("Bus %s does not support hotplugging", - bus->name); + qemu_error_new(QERR_BUS_NO_HOTPLUG, bus->name); return NULL; } @@ -249,7 +248,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) return NULL; } if (qdev_init(qdev) < 0) { - qemu_error("Error initializing device %s", driver); + qemu_error_new(QERR_DEVICE_INIT_FAILED, driver); return NULL; } qdev->opts = opts; -- 1.6.6