Use error_prefix() and error_report_err() as appropriate. Use the
prefix + propagate combo rather than manual prefix + freeing.
Cc: Gerd Hoffmann <kra...@redhat.com>
Signed-off-by: Peter Crosthwaite <crosthwaite.pe...@gmail.com>
---
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
