diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2012-11-30 13:02:47 +0100 |
---|---|---|
committer | Gerd Hoffmann <kraxel@redhat.com> | 2013-02-19 12:30:05 +0100 |
commit | 1a3973b33d36583d7194798f789a37759a13e269 (patch) | |
tree | e34c62d13d0ac6f7aa80e3180b87de65430ee2ce | |
parent | 4075975d832c55abdfc951726e54f9a28a2421c8 (diff) | |
download | qemu-1a3973b33d36583d7194798f789a37759a13e269.zip qemu-1a3973b33d36583d7194798f789a37759a13e269.tar.gz qemu-1a3973b33d36583d7194798f789a37759a13e269.tar.bz2 |
usb-host: remove usb_host_device_close
Nobody implements that anyway.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r-- | hw/usb.h | 1 | ||||
-rw-r--r-- | hw/usb/host-bsd.c | 6 | ||||
-rw-r--r-- | hw/usb/host-linux.c | 24 | ||||
-rw-r--r-- | hw/usb/host-stub.c | 5 | ||||
-rw-r--r-- | vl.c | 5 |
5 files changed, 3 insertions, 38 deletions
@@ -434,7 +434,6 @@ int set_usb_string(uint8_t *buf, const char *str); /* usb-linux.c */ USBDevice *usb_host_device_open(USBBus *bus, const char *devname); -int usb_host_device_close(const char *devname); void usb_host_info(Monitor *mon, const QDict *qdict); /* usb-bt.c */ diff --git a/hw/usb/host-bsd.c b/hw/usb/host-bsd.c index 07f0e01..39f2281 100644 --- a/hw/usb/host-bsd.c +++ b/hw/usb/host-bsd.c @@ -637,9 +637,3 @@ void usb_host_info(Monitor *mon, const QDict *qdict) { usb_host_scan(mon, usb_host_info_device); } - -/* XXX add this */ -int usb_host_device_close(const char *devname) -{ - return 0; -} diff --git a/hw/usb/host-linux.c b/hw/usb/host-linux.c index c18a6c8..b67aeba 100644 --- a/hw/usb/host-linux.c +++ b/hw/usb/host-linux.c @@ -1540,30 +1540,6 @@ static void usb_host_register_types(void) type_init(usb_host_register_types) -int usb_host_device_close(const char *devname) -{ -#if 0 - 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_delete_addr(s->bus_num, s->dev.addr); - return 0; - } -#endif - - return -1; -} - /* * Read sys file-system device file * diff --git a/hw/usb/host-stub.c b/hw/usb/host-stub.c index 8affba7..28d8032 100644 --- a/hw/usb/host-stub.c +++ b/hw/usb/host-stub.c @@ -45,8 +45,3 @@ USBDevice *usb_host_device_open(USBBus *bus, const char *devname) { return NULL; } - -int usb_host_device_close(const char *devname) -{ - return 0; -} @@ -1427,8 +1427,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 (strstart(devname, "host:", &p)) { + return -1; + } if (!usb_enabled(false)) { return -1; |