| Message ID | 1411032780-10692-12-git-send-email-arei.gonglei@huawei.com |
|---|---|
| State | New |
| Headers | show |
Il 18/09/2014 11:32, arei.gonglei@huawei.com ha scritto: > From: Gonglei <arei.gonglei@huawei.com> > > Signed-off-by: Gonglei <arei.gonglei@huawei.com> > --- > hw/usb/dev-bluetooth.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c > index a76e581..7db9921 100644 > --- a/hw/usb/dev-bluetooth.c > +++ b/hw/usb/dev-bluetooth.c > @@ -501,7 +501,7 @@ static void usb_bt_handle_destroy(USBDevice *dev) > s->hci->acl_recv = NULL; > } > > -static int usb_bt_initfn(USBDevice *dev) > +static void usb_bt_realize(USBDevice *dev, Error **errp) > { > struct USBBtState *s = DO_UPCAST(struct USBBtState, dev, dev); > > @@ -516,8 +516,6 @@ static int usb_bt_initfn(USBDevice *dev) > s->hci->acl_recv = usb_bt_out_hci_packet_acl; > usb_bt_handle_reset(&s->dev); > s->intr = usb_ep_get(dev, USB_TOKEN_IN, USB_EVT_EP); > - > - return 0; > } > > static USBDevice *usb_bt_init(USBBus *bus, const char *cmdline) > @@ -560,7 +558,7 @@ static void usb_bt_class_initfn(ObjectClass *klass, void *data) > DeviceClass *dc = DEVICE_CLASS(klass); > USBDeviceClass *uc = USB_DEVICE_CLASS(klass); > > - uc->init = usb_bt_initfn; > + uc->realize = usb_bt_realize; > uc->product_desc = "QEMU BT dongle"; > uc->usb_desc = &desc_bluetooth; > uc->handle_reset = usb_bt_handle_reset; > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c index a76e581..7db9921 100644 --- a/hw/usb/dev-bluetooth.c +++ b/hw/usb/dev-bluetooth.c @@ -501,7 +501,7 @@ static void usb_bt_handle_destroy(USBDevice *dev) s->hci->acl_recv = NULL; } -static int usb_bt_initfn(USBDevice *dev) +static void usb_bt_realize(USBDevice *dev, Error **errp) { struct USBBtState *s = DO_UPCAST(struct USBBtState, dev, dev); @@ -516,8 +516,6 @@ static int usb_bt_initfn(USBDevice *dev) s->hci->acl_recv = usb_bt_out_hci_packet_acl; usb_bt_handle_reset(&s->dev); s->intr = usb_ep_get(dev, USB_TOKEN_IN, USB_EVT_EP); - - return 0; } static USBDevice *usb_bt_init(USBBus *bus, const char *cmdline) @@ -560,7 +558,7 @@ static void usb_bt_class_initfn(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); USBDeviceClass *uc = USB_DEVICE_CLASS(klass); - uc->init = usb_bt_initfn; + uc->realize = usb_bt_realize; uc->product_desc = "QEMU BT dongle"; uc->usb_desc = &desc_bluetooth; uc->handle_reset = usb_bt_handle_reset;