diff options
| author | Peter Maydell | 2017-12-14 16:32:32 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-12-14 16:32:32 +0100 |
| commit | 0ef0583d5adceb9138bdb47494dabd1549ac5b6d (patch) | |
| tree | 2f9963716fadafe8f79c115f0203baf9f32a000a /include | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20171213'... (diff) | |
| parent | tests: test-hmp: print command execution result (diff) | |
| download | qemu-0ef0583d5adceb9138bdb47494dabd1549ac5b6d.tar.gz qemu-0ef0583d5adceb9138bdb47494dabd1549ac5b6d.tar.xz qemu-0ef0583d5adceb9138bdb47494dabd1549ac5b6d.zip | |
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 'include')
| -rw-r--r-- | include/hw/usb.h | 1 | ||||
| -rw-r--r-- | include/sysemu/sysemu.h | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/include/hw/usb.h b/include/hw/usb.h index eb28655270..9dd9c6f0d9 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -549,7 +549,6 @@ void usb_claim_port(USBDevice *dev, Error **errp); void usb_release_port(USBDevice *dev); void usb_device_attach(USBDevice *dev, Error **errp); int usb_device_detach(USBDevice *dev); -int usb_device_delete_addr(int busnr, int addr); void usb_check_attach(USBDevice *dev, Error **errp); static inline USBBus *usb_bus_from_device(USBDevice *d) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index c083869fcf..31612caf10 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -166,8 +166,6 @@ extern Chardev *serial_hds[MAX_SERIAL_PORTS]; extern Chardev *parallel_hds[MAX_PARALLEL_PORTS]; -void hmp_usb_add(Monitor *mon, const QDict *qdict); -void hmp_usb_del(Monitor *mon, const QDict *qdict); void hmp_info_usb(Monitor *mon, const QDict *qdict); void add_boot_device_path(int32_t bootindex, DeviceState *dev, |