Skip to content

Commit

Permalink
usb: Support for removing device by host addr, improved auto filter s…
Browse files Browse the repository at this point in the history 
…yntax (Max Krasnyansky)

This patch adds support for removing USB devices by host address.
Which is usefull for things like libvirtd because there is no easy way to
find guest USB address of the host device.
In other words you can now do:
   usb_add host:3.5
   ...
   usb_del host:3.5
Before the patch 'usb_del' did not support 'host:' notation.

----
Syntax for specifying auto connect filters has been improved.
Old syntax was
    host:bus.dev
    host:pid:vid
New syntax is
    host:auto:bus.dev[:pid:vid]
In both the cases any attribute can be set to "*".

New syntax is more flexible and lets you do things like
    host:3.*:5533:* /* grab any device on bus 3 with vendor id 5533 */

It's now possible to remove auto filters. For example:
    usb_del host:auto:3.*:5533:*

Active filters are printed after all host devices in 'info usb' output.
Which now looks like this:

  Device 1.1, speed 480 Mb/s
    Hub: USB device 1d6b:0002, EHCI Host Controller
  Device 1.4, speed 480 Mb/s
    Class 00: USB device 1058:0704, External HDD
  Auto filters:
    Device 3.* ID *:*

Signed-off-by: Max Krasnyansky <maxk@kernel.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5205 c046a42c-6fe2-441c-8c8c-71466251a162
  • Loading branch information
aliguori committed Sep 14, 2008
1 parent 446ab12 commit 5d0c575
Show file tree
Hide file tree
Showing 3 changed files with 176 additions and 31 deletions.
1 change: 1 addition & 0 deletions hw/usb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ USBDevice *usb_hub_init(int nb_ports);

/* usb-linux.c */
USBDevice *usb_host_device_open(const char *devname);
int usb_host_device_close(const char *devname);
void usb_host_info(void);

/* usb-hid.c */
Expand Down
203 changes: 172 additions & 31 deletions usb-linux.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* Copyright (c) 2008 Max Krasnyansky
* Support for host device auto connect & disconnect
* Magor rewrite to support fully async operation
* Major rewrite to support fully async operation
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -951,23 +951,52 @@ static USBDevice *usb_host_device_open_addr(int bus_num, int addr, const char *p
return NULL;
}

static int usb_host_auto_add(const char *spec);
static int usb_host_auto_del(const char *spec);

USBDevice *usb_host_device_open(const char *devname)
{
int bus_num, addr;
char product_name[PRODUCT_NAME_SZ];

if (usb_host_find_device(&bus_num, &addr,
product_name, sizeof(product_name),
devname) < 0)
if (strstr(devname, "auto:")) {
usb_host_auto_add(devname);
return NULL;
}

if (hostdev_find(bus_num, addr)) {
term_printf("husb: host usb device %d.%d is already open\n", bus_num, addr);
if (usb_host_find_device(&bus_num, &addr, product_name, sizeof(product_name),
devname) < 0)
return NULL;
}

if (hostdev_find(bus_num, addr)) {
term_printf("husb: host usb device %d.%d is already open\n", bus_num, addr);
return NULL;
}

return usb_host_device_open_addr(bus_num, addr, product_name);
}

int usb_host_device_close(const char *devname)
{
char product_name[PRODUCT_NAME_SZ];
int bus_num, addr;
USBHostDevice *s;

if (strstr(devname, "auto:"))
return usb_host_auto_del(devname);

if (usb_host_find_device(&bus_num, &addr, product_name, sizeof(product_name),
devname) < 0)
return -1;

s = hostdev_find(bus_num, addr);
if (s) {
usb_device_del_addr(0, s->dev.addr);
return 0;
}

return -1;
}

static int get_tag_value(char *buf, int buf_size,
const char *str, const char *tag,
Expand Down Expand Up @@ -1126,21 +1155,76 @@ static void usb_host_auto_timer(void *unused)
}

/*
* Add autoconnect filter
* -1 means 'any' (device, vendor, etc)
* Autoconnect filter
* Format:
* auto:bus:dev[:vid:pid]
* auto:bus.dev[:vid:pid]
*
* bus - bus number (dec, * means any)
* dev - device number (dec, * means any)
* vid - vendor id (hex, * means any)
* pid - product id (hex, * means any)
*
* See 'lsusb' output.
*/
static void usb_host_auto_add(int bus_num, int addr, int vendor_id, int product_id)
static int parse_filter(const char *spec, struct USBAutoFilter *f)
{
struct USBAutoFilter *f = qemu_mallocz(sizeof(*f));
enum { BUS, DEV, VID, PID, DONE };
const char *p = spec;
int i;

f->bus_num = -1;
f->addr = -1;
f->vendor_id = -1;
f->product_id = -1;

for (i = BUS; i < DONE; i++) {
p = strpbrk(p, ":.");
if (!p) break;
p++;

if (*p == '*')
continue;

switch(i) {
case BUS: f->bus_num = strtol(p, NULL, 10); break;
case DEV: f->addr = strtol(p, NULL, 10); break;
case VID: f->vendor_id = strtol(p, NULL, 16); break;
case PID: f->product_id = strtol(p, NULL, 16); break;
}
}

if (i < DEV) {
fprintf(stderr, "husb: invalid auto filter spec %s\n", spec);
return -1;
}

return 0;
}

static int match_filter(const struct USBAutoFilter *f1,
const struct USBAutoFilter *f2)
{
return f1->bus_num == f2->bus_num &&
f1->addr == f2->addr &&
f1->vendor_id == f2->vendor_id &&
f1->product_id == f2->product_id;
}

static int usb_host_auto_add(const char *spec)
{
struct USBAutoFilter filter, *f;

if (parse_filter(spec, &filter) < 0)
return -1;

f = qemu_mallocz(sizeof(*f));
if (!f) {
fprintf(stderr, "husb: failed to allocate auto filter\n");
return;
return -1;
}

f->bus_num = bus_num;
f->addr = addr;
f->vendor_id = vendor_id;
f->product_id = product_id;
*f = filter;

if (!usb_auto_filter) {
/*
Expand All @@ -1153,18 +1237,52 @@ static void usb_host_auto_add(int bus_num, int addr, int vendor_id, int product_
if (!usb_auto_timer) {
fprintf(stderr, "husb: failed to allocate auto scan timer\n");
qemu_free(f);
return;
return -1;
}

/* Check for new devices every two seconds */
qemu_mod_timer(usb_auto_timer, qemu_get_clock(rt_clock) + 2000);
}

dprintf("husb: auto filter: bus_num %d addr %d vid %d pid %d\n",
bus_num, addr, vendor_id, product_id);
dprintf("husb: added auto filter: bus_num %d addr %d vid %d pid %d\n",
f->bus_num, f->addr, f->vendor_id, f->product_id);

f->next = usb_auto_filter;
usb_auto_filter = f;

return 0;
}

static int usb_host_auto_del(const char *spec)
{
struct USBAutoFilter *pf = usb_auto_filter;
struct USBAutoFilter **prev = &usb_auto_filter;
struct USBAutoFilter filter;

if (parse_filter(spec, &filter) < 0)
return -1;

while (pf) {
if (match_filter(pf, &filter)) {
dprintf("husb: removed auto filter: bus_num %d addr %d vid %d pid %d\n",
pf->bus_num, pf->addr, pf->vendor_id, pf->product_id);

*prev = pf->next;

if (!usb_auto_filter) {
/* No more filters. Stop scanning. */
qemu_del_timer(usb_auto_timer);
qemu_free_timer(usb_auto_timer);
}

return 0;
}

prev = &pf->next;
pf = pf->next;
}

return -1;
}

typedef struct FindDeviceState {
Expand Down Expand Up @@ -1208,12 +1326,6 @@ static int usb_host_find_device(int *pbus_num, int *paddr,
p = strchr(devname, '.');
if (p) {
*pbus_num = strtoul(devname, NULL, 0);

if (*(p + 1) == '*') {
usb_host_auto_add(*pbus_num, -1, -1, -1);
return -1;
}

*paddr = strtoul(p + 1, NULL, 0);
fs.bus_num = *pbus_num;
fs.addr = *paddr;
Expand All @@ -1222,15 +1334,10 @@ static int usb_host_find_device(int *pbus_num, int *paddr,
pstrcpy(product_name, product_name_size, fs.product_name);
return 0;
}

p = strchr(devname, ':');
if (p) {
fs.vendor_id = strtoul(devname, NULL, 16);

if (*(p + 1) == '*') {
usb_host_auto_add(-1, -1, fs.vendor_id, -1);
return -1;
}

fs.product_id = strtoul(p + 1, NULL, 16);
ret = usb_host_scan(&fs, usb_host_find_device_scan);
if (ret) {
Expand Down Expand Up @@ -1324,9 +1431,38 @@ static int usb_host_info_device(void *opaque, int bus_num, int addr,
return 0;
}

static void dec2str(int val, char *str)
{
if (val == -1)
strcpy(str, "*");
else
sprintf(str, "%d", val);
}

static void hex2str(int val, char *str)
{
if (val == -1)
strcpy(str, "*");
else
sprintf(str, "%x", val);
}

void usb_host_info(void)
{
struct USBAutoFilter *f;

usb_host_scan(NULL, usb_host_info_device);

if (usb_auto_filter)
term_printf(" Auto filters:\n");
for (f = usb_auto_filter; f; f = f->next) {
char bus[10], addr[10], vid[10], pid[10];
dec2str(f->bus_num, bus);
dec2str(f->addr, addr);
hex2str(f->vendor_id, vid);
hex2str(f->product_id, pid);
term_printf(" Device %s.%s ID %s:%s\n", bus, addr, vid, pid);
}
}

#else
Expand All @@ -1344,4 +1480,9 @@ USBDevice *usb_host_device_open(const char *devname)
return NULL;
}

int usb_host_device_close(const char *devname)
{
return 0;
}

#endif
3 changes: 3 additions & 0 deletions vl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5866,6 +5866,9 @@ static int usb_device_del(const char *devname)
int bus_num, addr;
const char *p;

if (strstart(devname, "host:", &p))
return usb_host_device_close(p);

if (!used_usb_ports)
return -1;

Expand Down

0 comments on commit 5d0c575

Please sign in to comment.