mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: Proper error propagation for usb_device_attach errors

Browse Source 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Hans de Goede 2011-05-27 19:05:15 +02:00 committed by Gerd Hoffmann
parent ee210d6390
commit fa19bf831b
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/usb-bus.c
View File

@ -75,7 +75,7 @@ static int usb_qdev_init(DeviceState *qdev, DeviceInfo *base)
QLIST_INIT(&dev->strings);
rc = dev->info->init(dev);
if (rc == 0 && dev->auto_attach)
usb_device_attach(dev);
rc = usb_device_attach(dev);
return rc;
}
@ -121,7 +121,7 @@ USBDevice *usb_create(USBBus *bus, const char *name)
bus = usb_bus_find(-1);
if (!bus)
return NULL;
fprintf(stderr, "%s: no bus specified, using \"%s\" for \"%s\"\n",
error_report("%s: no bus specified, using \"%s\" for \"%s\"\n",
__FUNCTION__, bus->qbus.name, name);
}
#endif
@ -171,20 +171,20 @@ void usb_unregister_port(USBBus *bus, USBPort *port)
bus->nfree--;
}
static void do_attach(USBDevice *dev)
static int do_attach(USBDevice *dev)
{
USBBus *bus = usb_bus_from_device(dev);
USBPort *port;
if (dev->attached) {
fprintf(stderr, "Warning: tried to attach usb device %s twice\n",
error_report("Error: tried to attach usb device %s twice\n",
dev->product_desc);
return;
return -1;
}
if (bus->nfree == 0) {
fprintf(stderr, "Warning: tried to attach usb device %s to a bus with no free ports\n",
error_report("Error: tried to attach usb device %s to a bus with no free ports\n",
dev->product_desc);
return;
return -1;
}
if (dev->port_path) {
QTAILQ_FOREACH(port, &bus->free, next) {
@ -193,9 +193,9 @@ static void do_attach(USBDevice *dev)
}
}
if (port == NULL) {
fprintf(stderr, "Warning: usb port %s (bus %s) not found\n",
error_report("Error: usb port %s (bus %s) not found\n",
dev->port_path, bus->qbus.name);
return;
return -1;
}
} else {
port = QTAILQ_FIRST(&bus->free);
@ -209,6 +209,8 @@ static void do_attach(USBDevice *dev)
QTAILQ_INSERT_TAIL(&bus->used, port, next);
bus->nused++;
return 0;
}
int usb_device_attach(USBDevice *dev)
@ -220,8 +222,7 @@ int usb_device_attach(USBDevice *dev)
(unless a physical port location is specified). */
usb_create_simple(bus, "usb-hub");
}
do_attach(dev);
return 0;
return do_attach(dev);
}
int usb_device_detach(USBDevice *dev)
@ -230,7 +231,7 @@ int usb_device_detach(USBDevice *dev)
USBPort *port;
if (!dev->attached) {
fprintf(stderr, "Warning: tried to detach unattached usb device %s\n",
error_report("Error: tried to detach unattached usb device %s\n",
dev->product_desc);
return -1;
}

5
hw/usb-msd.c
View File

@ -497,8 +497,9 @@ static void usb_msd_password_cb(void *opaque, int err)
MSDState *s = opaque;
if (!err)
usb_device_attach(&s->dev);
else
err = usb_device_attach(&s->dev);
if (err)
qdev_unplug(&s->dev.qdev);
}

6
usb-linux.c
View File

@ -1178,10 +1178,14 @@ static int usb_host_open(USBHostDevice *dev, int bus_num,
prod_name);
}
ret = usb_device_attach(&dev->dev);
if (ret) {
goto fail;
}
/* USB devio uses 'write' flag to check for async completions */
qemu_set_fd_handler(dev->fd, NULL, async_complete, dev);
usb_device_attach(&dev->dev);
return 0;
fail: