From patchwork Fri Feb 1 17:38:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laszlo Ersek X-Patchwork-Id: 217555 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 044AE2C0086 for ; Sat, 2 Feb 2013 04:51:22 +1100 (EST) Received: from localhost ([::1]:51795 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1KY7-0007D1-Qq for incoming@patchwork.ozlabs.org; Fri, 01 Feb 2013 12:37:15 -0500 Received: from eggs.gnu.org ([208.118.235.92]:51562) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1KXQ-0005k5-Kg for qemu-devel@nongnu.org; Fri, 01 Feb 2013 12:36:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U1KXN-0006HN-PE for qemu-devel@nongnu.org; Fri, 01 Feb 2013 12:36:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52020) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1KXN-0006HD-Gy for qemu-devel@nongnu.org; Fri, 01 Feb 2013 12:36:29 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r11HaStC000998 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 1 Feb 2013 12:36:29 -0500 Received: from lacos-laptop.usersys.redhat.com (vpn1-4-37.ams2.redhat.com [10.36.4.37]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r11HaIwU005493; Fri, 1 Feb 2013 12:36:28 -0500 From: Laszlo Ersek To: lcapitulino@redhat.com, qemu-devel@nongnu.org Date: Fri, 1 Feb 2013 18:38:19 +0100 Message-Id: <1359740299-27968-8-git-send-email-lersek@redhat.com> In-Reply-To: <1359740299-27968-1-git-send-email-lersek@redhat.com> References: <1359740299-27968-1-git-send-email-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 7/7] qdev_device_add(): report errors with Error X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Laszlo Ersek --- hw/qdev-monitor.h | 3 ++- hw/qdev-monitor.c | 29 +++++++++++++++-------------- vl.c | 9 +++++++-- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/hw/qdev-monitor.h b/hw/qdev-monitor.h index 9ec4850..3760bf5 100644 --- a/hw/qdev-monitor.h +++ b/hw/qdev-monitor.h @@ -3,6 +3,7 @@ #include "qdev-core.h" #include "monitor/monitor.h" +#include "qapi/error.h" /*** monitor commands ***/ @@ -11,6 +12,6 @@ void do_info_qdm(Monitor *mon, const QDict *qdict); int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data); int do_device_del(Monitor *mon, const QDict *qdict, QObject **ret_data); int qdev_device_help(QemuOpts *opts); -DeviceState *qdev_device_add(QemuOpts *opts); +DeviceState *qdev_device_add(QemuOpts *opts, Error **errp); #endif diff --git a/hw/qdev-monitor.c b/hw/qdev-monitor.c index 0c01b04..7e103af 100644 --- a/hw/qdev-monitor.c +++ b/hw/qdev-monitor.c @@ -417,7 +417,7 @@ static BusState *qbus_find(const char *path, Error **errp) } } -DeviceState *qdev_device_add(QemuOpts *opts) +DeviceState *qdev_device_add(QemuOpts *opts, Error **errp) { ObjectClass *obj; DeviceClass *k; @@ -428,7 +428,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) driver = qemu_opt_get(opts, "driver"); if (!driver) { - qerror_report(QERR_MISSING_PARAMETER, "driver"); + error_set(errp, QERR_MISSING_PARAMETER, "driver"); return NULL; } @@ -444,7 +444,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) } if (!obj) { - qerror_report(QERR_INVALID_PARAMETER_VALUE, "driver", "device type"); + error_set(errp, QERR_INVALID_PARAMETER_VALUE, "driver", "device type"); return NULL; } @@ -455,13 +455,12 @@ DeviceState *qdev_device_add(QemuOpts *opts) if (path != NULL) { bus = qbus_find(path, &local_err); if (!bus) { - qerror_report_err(local_err); - error_free(local_err); + error_propagate(errp, local_err); return NULL; } if (!object_dynamic_cast(OBJECT(bus), k->bus_type)) { - qerror_report(QERR_BAD_BUS_FOR_DEVICE, - driver, object_get_typename(OBJECT(bus))); + error_set(errp, QERR_BAD_BUS_FOR_DEVICE, + driver, object_get_typename(OBJECT(bus))); return NULL; } } else { @@ -469,13 +468,12 @@ DeviceState *qdev_device_add(QemuOpts *opts) &local_err); if (!bus) { assert(!error_is_set(&local_err)); - qerror_report(QERR_NO_BUS_FOR_DEVICE, - k->bus_type, driver); + error_set(errp, QERR_NO_BUS_FOR_DEVICE, k->bus_type, driver); return NULL; } } if (qdev_hotplug && !bus->allow_hotplug) { - qerror_report(QERR_BUS_NO_HOTPLUG, bus->name); + error_set(errp, QERR_BUS_NO_HOTPLUG, bus->name); return NULL; } @@ -496,8 +494,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) PropertyContext ctx = { .dev = qdev, .errp = &local_err }; if (qemu_opt_foreach(opts, set_property, &ctx, 1) != 0) { - qerror_report_err(local_err); - error_free(local_err); + error_propagate(errp, local_err); qdev_free(qdev); return NULL; } @@ -514,7 +511,7 @@ DeviceState *qdev_device_add(QemuOpts *opts) g_free(name); } if (qdev_init(qdev) < 0) { - qerror_report(QERR_DEVICE_INIT_FAILED, driver); + error_set(errp, QERR_DEVICE_INIT_FAILED, driver); return NULL; } qdev->opts = opts; @@ -627,7 +624,11 @@ int do_device_add(Monitor *mon, const QDict *qdict, QObject **ret_data) qemu_opts_del(opts); return 0; } - if (!qdev_device_add(opts)) { + + if (!qdev_device_add(opts, &local_err)) { + assert(error_is_set(&local_err)); + qerror_report_err(local_err); + error_free(local_err); qemu_opts_del(opts); return -1; } diff --git a/vl.c b/vl.c index 44656d8..f2f8093 100644 --- a/vl.c +++ b/vl.c @@ -2232,10 +2232,15 @@ static int device_help_func(QemuOpts *opts, void *opaque) static int device_init_func(QemuOpts *opts, void *opaque) { DeviceState *dev; + Error *local_err = NULL; - dev = qdev_device_add(opts); - if (!dev) + dev = qdev_device_add(opts, &local_err); + assert((dev == NULL) == error_is_set(&local_err)); + if (!dev) { + qerror_report_err(local_err); + error_free(local_err); return -1; + } return 0; }