| Message ID | 1411032780-10692-10-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-uas.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c > index 9832385..884c003 100644 > --- a/hw/usb/dev-uas.c > +++ b/hw/usb/dev-uas.c > @@ -892,7 +892,7 @@ static void usb_uas_handle_destroy(USBDevice *dev) > qemu_bh_delete(uas->status_bh); > } > > -static int usb_uas_init(USBDevice *dev) > +static void usb_uas_realize(USBDevice *dev, Error **errp) > { > UASDevice *uas = DO_UPCAST(UASDevice, dev, dev); > > @@ -905,8 +905,6 @@ static int usb_uas_init(USBDevice *dev) > > scsi_bus_new(&uas->bus, sizeof(uas->bus), DEVICE(dev), > &usb_uas_scsi_info, NULL); > - > - return 0; > } > > static const VMStateDescription vmstate_usb_uas = { > @@ -928,7 +926,7 @@ static void usb_uas_class_initfn(ObjectClass *klass, void *data) > DeviceClass *dc = DEVICE_CLASS(klass); > USBDeviceClass *uc = USB_DEVICE_CLASS(klass); > > - uc->init = usb_uas_init; > + uc->realize = usb_uas_realize; > uc->product_desc = desc_strings[STR_PRODUCT]; > uc->usb_desc = &desc; > uc->cancel_packet = usb_uas_cancel_io; > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/hw/usb/dev-uas.c b/hw/usb/dev-uas.c index 9832385..884c003 100644 --- a/hw/usb/dev-uas.c +++ b/hw/usb/dev-uas.c @@ -892,7 +892,7 @@ static void usb_uas_handle_destroy(USBDevice *dev) qemu_bh_delete(uas->status_bh); } -static int usb_uas_init(USBDevice *dev) +static void usb_uas_realize(USBDevice *dev, Error **errp) { UASDevice *uas = DO_UPCAST(UASDevice, dev, dev); @@ -905,8 +905,6 @@ static int usb_uas_init(USBDevice *dev) scsi_bus_new(&uas->bus, sizeof(uas->bus), DEVICE(dev), &usb_uas_scsi_info, NULL); - - return 0; } static const VMStateDescription vmstate_usb_uas = { @@ -928,7 +926,7 @@ static void usb_uas_class_initfn(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); USBDeviceClass *uc = USB_DEVICE_CLASS(klass); - uc->init = usb_uas_init; + uc->realize = usb_uas_realize; uc->product_desc = desc_strings[STR_PRODUCT]; uc->usb_desc = &desc; uc->cancel_packet = usb_uas_cancel_io;