[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/14] usb-linux: If opening a device fails remove i
From: |
Hans de Goede |
Subject: |
[Qemu-devel] [PATCH 07/14] usb-linux: If opening a device fails remove it from our filter list |
Date: |
Tue, 31 May 2011 11:35:23 +0200 |
So that we don't retry to open it every 2 seconds flooding stderr with
error messages.
---
usb-linux.c | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/usb-linux.c b/usb-linux.c
index e2f45d3..334012e 100644
--- a/usb-linux.c
+++ b/usb-linux.c
@@ -122,6 +122,7 @@ typedef struct USBHostDevice {
int configuration;
int ninterfaces;
int closing;
+ int open_failed;
Notifier exit;
struct endp_data endp_table[MAX_ENDPOINTS];
@@ -1208,6 +1209,10 @@ static int usb_host_initfn(USBDevice *dev)
s->exit.notify = usb_host_exit_notifier;
qemu_add_exit_notifier(&s->exit);
usb_host_auto_check(NULL);
+ if (s->open_failed) {
+ usb_host_handle_destroy(dev);
+ return s->open_failed;
+ }
return 0;
}
@@ -1272,7 +1277,11 @@ USBDevice *usb_host_device_open(const char *devname)
qdev_prop_set_uint32(&dev->qdev, "hostaddr", filter.addr);
qdev_prop_set_uint32(&dev->qdev, "vendorid", filter.vendor_id);
qdev_prop_set_uint32(&dev->qdev, "productid", filter.product_id);
- qdev_init_nofail(&dev->qdev);
+
+ if (qdev_init(&dev->qdev) != 0) {
+ return NULL;
+ }
+
return dev;
fail:
@@ -1637,6 +1646,7 @@ static int usb_host_auto_scan(void *opaque, int bus_num,
int addr, char *port,
{
struct USBAutoFilter *f;
struct USBHostDevice *s;
+ int ret;
/* Ignore hubs */
if (class_id == 9)
@@ -1670,7 +1680,15 @@ static int usb_host_auto_scan(void *opaque, int bus_num,
int addr, char *port,
}
DPRINTF("husb: auto open: bus_num %d addr %d\n", bus_num, addr);
- usb_host_open(s, bus_num, addr, port, product_name, speed);
+ ret = usb_host_open(s, bus_num, addr, port, product_name, speed);
+ if (ret) {
+ /* If we've found a match but failed to open the device we should
+ remove it from our auto-filter list, so we don't keep trying to
+ open it every 2 seconds. However we cannot destroy / free it
+ here, since we get called from usb_host_initfn, and destroying
+ a qdev from its initfn is not allowed. */
+ s->open_failed = ret;
+ }
}
return 0;
@@ -1678,9 +1696,16 @@ static int usb_host_auto_scan(void *opaque, int bus_num,
int addr, char *port,
static void usb_host_auto_check(void *unused)
{
- struct USBHostDevice *s;
+ struct USBHostDevice *s, *n;
int unconnected = 0;
+ /* Cleanup devices wich failed to open last time, see usb_host_auto_scan
+ for why we don't do this after usb_host_auto_scan */
+ QTAILQ_FOREACH_SAFE(s, &hostdevs, next, n) {
+ if (s->open_failed)
+ qdev_free(&s->dev.qdev);
+ }
+
usb_host_scan(NULL, usb_host_auto_scan);
QTAILQ_FOREACH(s, &hostdevs, next) {
--
1.7.5.1
- [Qemu-devel] [PATCH 00/14] usb: various usb fixes, Hans de Goede, 2011/05/31
- [Qemu-devel] [PATCH 01/14] usb-linux: Set usb_auto_timer to NULL after deleting it, Hans de Goede, 2011/05/31
- [Qemu-devel] [PATCH 02/14] usb-linux: Get speed from sysfs rather then from the connectinfo ioctl, Hans de Goede, 2011/05/31
- [Qemu-devel] [PATCH 04/14] usb-linux: Don't do perror when errno is not set, Hans de Goede, 2011/05/31
- [Qemu-devel] [PATCH 05/14] usb-linux: Don't call usb_host_close when usb_host_open fails, Hans de Goede, 2011/05/31
- [Qemu-devel] [PATCH 06/14] usb-linux: Ensure devep != 0, Hans de Goede, 2011/05/31
- [Qemu-devel] [PATCH 03/14] usb-linux: Teach about super speed, Hans de Goede, 2011/05/31
- [Qemu-devel] [PATCH 07/14] usb-linux: If opening a device fails remove it from our filter list,
Hans de Goede <=
- [Qemu-devel] [PATCH 08/14] usb-linux: Don't try to open the same device twice, Hans de Goede, 2011/05/31
- [Qemu-devel] [PATCH 10/14] usb-linux: Enlarge buffer for descriptors to 8192 bytes, Hans de Goede, 2011/05/31
- [Qemu-devel] [PATCH 09/14] usb-linux: Don't declare a usbdevice_name, Hans de Goede, 2011/05/31
- [Qemu-devel] [PATCH 11/14] usb-bus: Add knowledge of USB_SPEED_SUPER to usb_speed helper, Hans de Goede, 2011/05/31
- [Qemu-devel] [PATCH 12/14] usb-bus: Don't allow attaching a device to a bus with no free ports, Hans de Goede, 2011/05/31
- [Qemu-devel] [PATCH 14/14] usb: Proper error propagation for usb_device_attach errors, Hans de Goede, 2011/05/31