From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60855) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaGyt-00060I-3L for qemu-devel@nongnu.org; Fri, 11 Sep 2015 01:34:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZaGyp-00023n-67 for qemu-devel@nongnu.org; Fri, 11 Sep 2015 01:34:38 -0400 Received: from mail-pa0-x22c.google.com ([2607:f8b0:400e:c03::22c]:35446) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaGyo-000236-Ur for qemu-devel@nongnu.org; Fri, 11 Sep 2015 01:34:35 -0400 Received: by pacfv12 with SMTP id fv12so65818047pac.2 for ; Thu, 10 Sep 2015 22:34:34 -0700 (PDT) From: Peter Crosthwaite Date: Thu, 10 Sep 2015 22:33:32 -0700 Message-Id: In-Reply-To: References: Subject: [Qemu-devel] [RFC PATCH v1 22/25] usb: bus: 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. Use the prefix + propagate combo rather than manual prefix + freeing. Cc: Gerd Hoffmann Signed-off-by: Peter Crosthwaite --- hw/usb/bus.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/hw/usb/bus.c b/hw/usb/bus.c index 5f39e1e..44264ee 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -329,9 +329,8 @@ static USBDevice *usb_try_create_simple(USBBus *bus, const char *name, } object_property_set_bool(OBJECT(dev), true, "realized", &err); if (err) { - error_setg(errp, "Failed to initialize USB device '%s': %s", - name, error_get_pretty(err)); - error_free(err); + error_prefix(err, "Failed to initialize USB device '%s': ", name); + error_propagate(errp, err); object_unparent(OBJECT(dev)); return NULL; } @@ -722,9 +721,8 @@ USBDevice *usbdevice_create(const char *cmdline) } object_property_set_bool(OBJECT(dev), true, "realized", &err); if (err) { - error_report("Failed to initialize USB device '%s': %s", - f->name, error_get_pretty(err)); - error_free(err); + error_prefix(err, "Failed to initialize USB device '%s': ", f->name); + error_report_err(err); object_unparent(OBJECT(dev)); return NULL; } -- 1.9.1