[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 06/19] usb-hub: convert init to realize
From: |
arei.gonglei |
Subject: |
[Qemu-devel] [PATCH v3 06/19] usb-hub: convert init to realize |
Date: |
Fri, 19 Sep 2014 14:48:28 +0800 |
From: Gonglei <address@hidden>
In this way, all the implementations now use
error_setg instead of error_report for reporting error.
Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
---
hw/usb/dev-hub.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c
index 7492174..0482f58 100644
--- a/hw/usb/dev-hub.c
+++ b/hw/usb/dev-hub.c
@@ -511,15 +511,15 @@ static USBPortOps usb_hub_port_ops = {
.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);
USBHubPort *port;
int i;
if (dev->port->hubcount == 5) {
- error_report("usb hub chain too deep");
- return -1;
+ error_setg(errp, "usb hub chain too deep");
+ return;
}
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_hub_handle_reset(dev);
- return 0;
}
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);
USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
- uc->init = usb_hub_initfn;
+ uc->realize = usb_hub_realize;
uc->product_desc = "QEMU USB Hub";
uc->usb_desc = &desc_hub;
uc->find_device = usb_hub_find_device;
--
1.7.12.4
- [Qemu-devel] [PATCH v3 00/19] usb: convert device init to realize, arei.gonglei, 2014/09/19
- [Qemu-devel] [PATCH v3 08/19] dev-storage: usring error_report instead of fprintf/printf, arei.gonglei, 2014/09/19
- [Qemu-devel] [PATCH v3 05/19] libusb: using error_report instead of fprintf, arei.gonglei, 2014/09/19
- [Qemu-devel] [PATCH v3 07/19] dev-storage: convert init to realize, arei.gonglei, 2014/09/19
- [Qemu-devel] [PATCH v3 11/19] dev-bluetooth: convert init to realize, arei.gonglei, 2014/09/19
- [Qemu-devel] [PATCH v3 03/19] usb-net: convert init to realize, arei.gonglei, 2014/09/19
- [Qemu-devel] [PATCH v3 02/19] usb-bus: convert USBDeviceClass init to realize, arei.gonglei, 2014/09/19
- [Qemu-devel] [PATCH v3 09/19] dev-uas: convert init to realize, arei.gonglei, 2014/09/19
- [Qemu-devel] [PATCH v3 01/19] usb-storage: fix possible memory leak and missing error message, arei.gonglei, 2014/09/19
- [Qemu-devel] [PATCH v3 06/19] usb-hub: convert init to realize,
arei.gonglei <=
- [Qemu-devel] [PATCH v3 04/19] libusb: convert init to realize, arei.gonglei, 2014/09/19
- [Qemu-devel] [PATCH v3 10/19] dev-uas: using error_report instead of fprintf, arei.gonglei, 2014/09/19
- [Qemu-devel] [PATCH v3 13/19] usb-ccid: convert init to realize, arei.gonglei, 2014/09/19
- [Qemu-devel] [PATCH v3 15/19] dev-wacom: convert init to realize, arei.gonglei, 2014/09/19
- [Qemu-devel] [PATCH v3 19/19] usb-bus: remove "init" from USBDeviceClass struct, arei.gonglei, 2014/09/19
- [Qemu-devel] [PATCH v3 12/19] dev-serial: convert init to realize, arei.gonglei, 2014/09/19
- [Qemu-devel] [PATCH v3 16/19] usb-audio: convert init to realize, arei.gonglei, 2014/09/19
- [Qemu-devel] [PATCH v3 17/19] usb-redir: convert init to realize, arei.gonglei, 2014/09/19
- [Qemu-devel] [PATCH v3 18/19] usb-mtp: convert init to realize, arei.gonglei, 2014/09/19
- [Qemu-devel] [PATCH v3 14/19] dev-hid: convert init to realize, arei.gonglei, 2014/09/19