OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

usb-hub: convert init to realize

Browse Source 
In this way, all the implementations now use
error_setg instead of error_report for reporting error.

Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gonglei 2014-09-19 14:48:28 +08:00 committed by Gerd Hoffmann
parent 2e6a0dd1ac
commit f3f8c45972
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/usb/dev-hub.c
View File

@ -511,15 +511,15 @@ static USBPortOps usb_hub_port_ops = {
.complete = usb_hub_complete, .complete = usb_hub_complete,
}; };
static int usb_hub_initfn(USBDevice *dev) static void usb_hub_realize(USBDevice *dev, Error **errp)
{ {
USBHubState *s = DO_UPCAST(USBHubState, dev, dev); USBHubState *s = DO_UPCAST(USBHubState, dev, dev);
USBHubPort *port; USBHubPort *port;
int i; int i;
if (dev->port->hubcount == 5) { if (dev->port->hubcount == 5) {
error_report("usb hub chain too deep"); error_setg(errp, "usb hub chain too deep");
return -1; return;
} }
usb_desc_create_serial(dev); usb_desc_create_serial(dev);
@ -533,7 +533,6 @@ static int usb_hub_initfn(USBDevice *dev)
usb_port_location(&port->port, dev->port, i+1); usb_port_location(&port->port, dev->port, i+1);
} }
usb_hub_handle_reset(dev); usb_hub_handle_reset(dev);
return 0;
} }
static const VMStateDescription vmstate_usb_hub_port = { static const VMStateDescription vmstate_usb_hub_port = {
@ -564,7 +563,7 @@ static void usb_hub_class_initfn(ObjectClass *klass, void *data)
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
USBDeviceClass *uc = USB_DEVICE_CLASS(klass); USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
uc->init = usb_hub_initfn; uc->realize = usb_hub_realize;
uc->product_desc = "QEMU USB Hub"; uc->product_desc = "QEMU USB Hub";
uc->usb_desc = &desc_hub; uc->usb_desc = &desc_hub;
uc->find_device = usb_hub_find_device; uc->find_device = usb_hub_find_device;