usb: usb_create() can't fail, drop useless error handling

Signed-off-by: Markus Armbruster <[email protected]>
Signed-off-by: Gerd Hoffmann <[email protected]>

diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 986b2d8da824b994c77b617d200a898d5acac412..eeb687232405c636faba81eae4d9eeaf3fb68e8d 100644 (file)
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -320,10 +320,6 @@ USBDevice *usb_create_simple(USBBus *bus, const char *name)
     USBDevice *dev = usb_create(bus, name);
     int rc;
 
-    if (!dev) {
-        error_report("Failed to create USB device '%s'", name);
-        return NULL;
-    }
     rc = qdev_init(&dev->qdev);
     if (rc < 0) {
         error_report("Failed to initialize USB device '%s'", name);

diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c
index 390d475c16a9938148ab7f0d70bbb297c71aba5b..8b3b31694b3b2f4d7f1e63e61e3270293cb7a56a 100644 (file)
--- a/hw/usb/dev-bluetooth.c
+++ b/hw/usb/dev-bluetooth.c
@@ -530,14 +530,10 @@ static USBDevice *usb_bt_init(USBBus *bus, const char *cmdline)
     } else {
         hci = bt_new_hci(qemu_find_bt_vlan(0));
     }
-
     if (!hci)
         return NULL;
+
     dev = usb_create(bus, name);
-    if (!dev) {
-        error_report("Failed to create USB device '%s'", name);
-        return NULL;
-    }
     s = DO_UPCAST(struct USBBtState, dev, dev);
     s->hci = hci;
     if (qdev_init(&dev->qdev) < 0) {

diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
index 5b95d5c382a1be0c0bb22d7ae65175aa6c9a3a2d..620fc116cfcdbaaf69d5a0827f7879b70c405b86 100644 (file)
--- a/hw/usb/dev-network.c
+++ b/hw/usb/dev-network.c
@@ -1405,9 +1405,6 @@ static USBDevice *usb_net_init(USBBus *bus, const char *cmdline)
     }
 
     dev = usb_create(bus, "usb-net");
-    if (!dev) {
-        return NULL;
-    }
     qdev_set_nic_properties(&dev->qdev, &nd_table[idx]);
     qdev_init_nofail(&dev->qdev);
     return dev;

diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index 1cee450259ac0e74c27ad269c3d277b636867c21..f347c05b54012052f795587c7806a651a6d84038 100644 (file)
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -544,9 +544,6 @@ static USBDevice *usb_serial_init(USBBus *bus, const char *filename)
         return NULL;
 
     dev = usb_create(bus, "usb-serial");
-    if (!dev) {
-        return NULL;
-    }
     qdev_prop_set_chr(&dev->qdev, "chardev", cdrv);
     if (vendorid)
         qdev_prop_set_uint16(&dev->qdev, "vendorid", vendorid);

diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index 4539733e429f70fa4bf1f2998fbbe224d93ee33d..5f222754ba29841114ae201ef7d2a9e1fcb71b9f 100644 (file)
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -706,9 +706,6 @@ static USBDevice *usb_msd_init(USBBus *bus, const char *filename)
 
     /* create guest device */
     dev = usb_create(bus, "usb-storage");
-    if (!dev) {
-        return NULL;
-    }
     if (qdev_prop_set_drive(&dev->qdev, "drive",
                             blk_by_legacy_dinfo(dinfo)) < 0) {
         object_unparent(OBJECT(dev));