From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaGyk-0005jT-1K for qemu-devel@nongnu.org; Fri, 11 Sep 2015 01:34:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZaGyj-0001yr-4O for qemu-devel@nongnu.org; Fri, 11 Sep 2015 01:34:29 -0400 Received: from mail-pa0-x22b.google.com ([2607:f8b0:400e:c03::22b]:33839) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaGyi-0001yf-PZ for qemu-devel@nongnu.org; Fri, 11 Sep 2015 01:34:29 -0400 Received: by padhy16 with SMTP id hy16so64599302pad.1 for ; Thu, 10 Sep 2015 22:34:28 -0700 (PDT) From: Peter Crosthwaite Date: Thu, 10 Sep 2015 22:33:29 -0700 Message-Id: <3818ffba8f89d85f21ca8ce8b83a3281d578db06.1441667360.git.crosthwaite.peter@gmail.com> In-Reply-To: References: Subject: [Qemu-devel] [RFC PATCH v1 19/25] qdev: Update error API usages List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, armbru@redhat.com Use error_prefix() and error_report_err() as appropriate. Signed-off-by: Peter Crosthwaite --- hw/core/qdev-properties.c | 7 +++---- hw/core/qdev.c | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c index 04fd80a..6494185 100644 --- a/hw/core/qdev-properties.c +++ b/hw/core/qdev-properties.c @@ -1065,10 +1065,9 @@ static void qdev_prop_set_globals_for_type(DeviceState *dev, object_property_parse(OBJECT(dev), prop->value, prop->property, &err); if (err != NULL) { assert(prop->user_provided); - error_report("Warning: global %s.%s=%s ignored (%s)", - prop->driver, prop->property, prop->value, - error_get_pretty(err)); - error_free(err); + error_prefix(err, "Warning: global %s.%s=%s ignored (%s)", + prop->driver, prop->property, prop->value); + error_report_err(err); return; } } diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 52140ba..708f5fd 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -365,9 +365,9 @@ void qdev_init_nofail(DeviceState *dev) object_property_set_bool(OBJECT(dev), true, "realized", &err); if (err) { - error_report("Initialization of device %s failed: %s", - object_get_typename(OBJECT(dev)), - error_get_pretty(err)); + error_prefix(err, "Initialization of device %s failed: ", + object_get_typename(OBJECT(dev))); + error_report_err(err); exit(1); } } -- 1.9.1