summaryrefslogtreecommitdiffstats
path: root/hw/usb/dev-bluetooth.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-02-04 13:28:09 +0100
committerGerd Hoffmann <kraxel@redhat.com>2015-02-18 10:53:10 +0100
commit3bc36a401e0f33e63a4d2c58b646ddf78efb567c (patch)
tree439eaf7ecad20dfb4607565c041d19140d43c45f /hw/usb/dev-bluetooth.c
parent4806ec9b2c57ff42a91d5419ac1137fffd1c9fb5 (diff)
downloadhqemu-3bc36a401e0f33e63a4d2c58b646ddf78efb567c.zip
hqemu-3bc36a401e0f33e63a4d2c58b646ddf78efb567c.tar.gz
usb: Improve -usbdevice error reporting a bit
Most LegacyUSBFactory usbdevice_init() methods realize with qdev_init_nofail(), even though their caller usbdevice_create() can handle failure. Okay if it really can't fail (I didn't check), but somewhat brittle. usb_msd_init() and usb_bt_init() call qdev_init(). The latter additionally reports an error when qdev_init() fails. Realization failure produces multiple error reports: a specific one from qdev_init(), and generic ones from usb_bt_init(), usb_create_simple(), usbdevice_create() and usb_parse(). Remove realization from the usbdevice_init() methods. Realize in usbdevice_create(), and produce exactly one error message there. You still get another one from usb_parse(). Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/usb/dev-bluetooth.c')
-rw-r--r--hw/usb/dev-bluetooth.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c
index 8b3b316..9bf6730 100644
--- a/hw/usb/dev-bluetooth.c
+++ b/hw/usb/dev-bluetooth.c
@@ -536,11 +536,6 @@ static USBDevice *usb_bt_init(USBBus *bus, const char *cmdline)
dev = usb_create(bus, name);
s = DO_UPCAST(struct USBBtState, dev, dev);
s->hci = hci;
- if (qdev_init(&dev->qdev) < 0) {
- error_report("Failed to initialize USB device '%s'", name);
- return NULL;
- }
-
return dev;
}
OpenPOWER on IntegriCloud