From patchwork Thu Mar 4 15:57:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 46959 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 337F8B7067 for ; Fri, 5 Mar 2010 04:31:41 +1100 (EST) Received: from localhost ([127.0.0.1]:45342 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NnEtb-000600-Nt for incoming@patchwork.ozlabs.org; Thu, 04 Mar 2010 12:31:35 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NnDXe-0005km-Rm for qemu-devel@nongnu.org; Thu, 04 Mar 2010 11:04:50 -0500 Received: from [199.232.76.173] (port=58593 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NnDXd-0005kG-SI for qemu-devel@nongnu.org; Thu, 04 Mar 2010 11:04:49 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NnDXU-0001Rj-LZ for qemu-devel@nongnu.org; Thu, 04 Mar 2010 11:04:49 -0500 Received: from oxygen.pond.sub.org ([213.239.205.148]:47495) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NnDXR-0001QF-1o for qemu-devel@nongnu.org; Thu, 04 Mar 2010 11:04:38 -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 80EE12DD32C for ; Thu, 4 Mar 2010 17:04:31 +0100 (CET) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id CDF09286; Thu, 4 Mar 2010 16:57:14 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 4 Mar 2010 16:57:05 +0100 Message-Id: <1267718231-13303-45-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 44/50] error: Convert do_device_add() 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 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 d3204d4..e3fcc75 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) { - error_report("-device: no driver specified"); + qerror_report(QERR_MISSING_PARAMETER, "driver"); return NULL; } /* find driver */ info = qdev_find_info(NULL, driver); if (!info || info->no_user) { - error_report("Device \"%s\" not found. Try -device '?' for a list.", - driver); + qerror_report(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) { - error_report("Device '%s' can't go on a %s bus", - driver, bus->info->name); + qerror_report(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) { - error_report("Did not find %s bus for %s", - info->bus_info->name, info->name); + qerror_report(QERR_NO_BUS_FOR_DEVICE, + info->name, info->bus_info->name); return NULL; } } if (qdev_hotplug && !bus->allow_hotplug) { - error_report("Bus %s does not support hotplugging", - bus->name); + qerror_report(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) { - error_report("Error initializing device %s", driver); + qerror_report(QERR_DEVICE_INIT_FAILED, driver); return NULL; } qdev->opts = opts;