diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-12-14 15:32:32 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-12-14 15:32:32 +0000 |
| commit | 0ef0583d5adceb9138bdb47494dabd1549ac5b6d (patch) | |
| tree | 2f9963716fadafe8f79c115f0203baf9f32a000a /hw | |
| parent | 5705b536b597de00d82807bf14bb38f542aa4491 (diff) | |
| parent | 0eaf3b824745cacebfc321aef6787528d33d58fe (diff) | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20171214' into staging
HMP pull 2017-12-14
# gpg: Signature made Thu 14 Dec 2017 12:46:41 GMT
# gpg: using RSA key 0x0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-hmp-20171214:
tests: test-hmp: print command execution result
hmp-commands: Remove the deprecated usb_add and usb_del
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/usb/bus.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/hw/usb/bus.c b/hw/usb/bus.c index e56dc3348a..11f7720d71 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -559,28 +559,6 @@ int usb_device_detach(USBDevice *dev) return 0; } -int usb_device_delete_addr(int busnr, int addr) -{ - USBBus *bus; - USBPort *port; - USBDevice *dev; - - bus = usb_bus_find(busnr); - if (!bus) - return -1; - - QTAILQ_FOREACH(port, &bus->used, next) { - if (port->dev->addr == addr) - break; - } - if (!port) - return -1; - dev = port->dev; - - object_unparent(OBJECT(dev)); - return 0; -} - static const char *usb_speed(unsigned int speed) { static const char *txt[] = { |