[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/7] usb-host: limit open retries
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 4/7] usb-host: limit open retries |
Date: |
Thu, 25 Aug 2011 17:06:54 +0200 |
Limit the number of times qemu tries to open host devices to three.
Reset error counter when the device goes away, after un-plugging and
re-plugging the device qemu will try again three times.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
usb-linux.c | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/usb-linux.c b/usb-linux.c
index fe7b9d9..b939cfc 100644
--- a/usb-linux.c
+++ b/usb-linux.c
@@ -132,6 +132,7 @@ typedef struct USBHostDevice {
int addr;
char port[MAX_PORTLEN];
struct USBAutoFilter match;
+ int seen, errcount;
QTAILQ_ENTRY(USBHostDevice) next;
} USBHostDevice;
@@ -1769,6 +1770,10 @@ static int usb_host_auto_scan(void *opaque, int bus_num,
int addr, char *port,
continue;
}
/* We got a match */
+ s->seen++;
+ if (s->errcount >= 3) {
+ return 0;
+ }
/* Already attached ? */
if (s->fd != -1) {
@@ -1776,7 +1781,9 @@ 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);
+ if (usb_host_open(s, bus_num, addr, port, product_name, speed) < 0) {
+ s->errcount++;
+ }
break;
}
@@ -1794,6 +1801,10 @@ static void usb_host_auto_check(void *unused)
if (s->fd == -1) {
unconnected++;
}
+ if (s->seen == 0) {
+ s->errcount = 0;
+ }
+ s->seen = 0;
}
if (unconnected == 0) {
--
1.7.1
- [Qemu-devel] [PATCH 0/7] usb-host: bugfixes, Gerd Hoffmann, 2011/08/25
- [Qemu-devel] [PATCH 2/7] usb-host: reapurb error report fix, Gerd Hoffmann, 2011/08/25
- [Qemu-devel] [PATCH 4/7] usb-host: limit open retries,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 3/7] usb-host: fix halted endpoints, Gerd Hoffmann, 2011/08/25
- [Qemu-devel] [PATCH 6/7] usb-host: claim port, Gerd Hoffmann, 2011/08/25
- [Qemu-devel] [PATCH 7/7] usb: fix use after free, Gerd Hoffmann, 2011/08/25
- [Qemu-devel] [PATCH 5/7] usb-host: fix configuration tracking., Gerd Hoffmann, 2011/08/25
- [Qemu-devel] [PATCH 1/7] usb-host: start tracing support, Gerd Hoffmann, 2011/08/25