motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-09 08:17:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb-host: limit open retries

Browse source 
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 <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2011-08-24 13:45:06 +02:00
parent 9b87e19bc7
commit 3ee886c5ba
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
usb-linux.c
View file

@ -132,6 +132,7 @@ typedef struct USBHostDevice {
int addr; int addr;
char port[MAX_PORTLEN]; char port[MAX_PORTLEN];
struct USBAutoFilter match; struct USBAutoFilter match;
int seen, errcount;
QTAILQ_ENTRY(USBHostDevice) next; QTAILQ_ENTRY(USBHostDevice) next;
} USBHostDevice; } USBHostDevice;
@ -1769,6 +1770,10 @@ static int usb_host_auto_scan(void *opaque, int bus_num, int addr, char *port,
continue; continue;
} }
/* We got a match */ /* We got a match */
s->seen++;
if (s->errcount >= 3) {
return 0;
}
/* Already attached ? */ /* Already attached ? */
if (s->fd != -1) { 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); 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; break;
} }
@ -1794,6 +1801,10 @@ static void usb_host_auto_check(void *unused)
if (s->fd == -1) { if (s->fd == -1) {
unconnected++; unconnected++;
} }
if (s->seen == 0) {
s->errcount = 0;
}
s->seen = 0;
} }
if (unconnected == 0) { if (unconnected == 0) {