diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-02-24 12:49:04 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-02-24 12:49:04 +0000 |
| commit | 5842b55fd403ac0a16443aad58a8cf6d4c10cf77 (patch) | |
| tree | 8f9f75b586cc5dbe819c890b2e943ecdf8a43bae /hw/usb/dev-bluetooth.c | |
| parent | 55229247181c40baa3e92b08ee043d4e8453087e (diff) | |
| parent | 4f72b8d2a6f5777fa1af2cf5184843e4cb06f182 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20170223-1' into staging
usb: ohci bugfix, switch core to unrealize, xhci property cleanup
# gpg: Signature made Thu 23 Feb 2017 15:37:57 GMT
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/pull-usb-20170223-1:
xhci: properties cleanup
usb: ohci: fix error return code in servicing td
usb: replace handle_destroy with unrealize
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb/dev-bluetooth.c')
| -rw-r--r-- | hw/usb/dev-bluetooth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c index 91a4a0b8b9..443e3c301d 100644 --- a/hw/usb/dev-bluetooth.c +++ b/hw/usb/dev-bluetooth.c @@ -496,7 +496,7 @@ static void usb_bt_out_hci_packet_acl(void *opaque, usb_bt_fifo_enqueue(&s->acl, data, len); } -static void usb_bt_handle_destroy(USBDevice *dev) +static void usb_bt_unrealize(USBDevice *dev, Error **errp) { struct USBBtState *s = (struct USBBtState *) dev->opaque; @@ -559,7 +559,7 @@ static void usb_bt_class_initfn(ObjectClass *klass, void *data) uc->handle_reset = usb_bt_handle_reset; uc->handle_control = usb_bt_handle_control; uc->handle_data = usb_bt_handle_data; - uc->handle_destroy = usb_bt_handle_destroy; + uc->unrealize = usb_bt_unrealize; dc->vmsd = &vmstate_usb_bt; set_bit(DEVICE_CATEGORY_NETWORK, dc->categories); } |