[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/19] dev-serial: convert init to realize
From: |
arei.gonglei |
Subject: |
[Qemu-devel] [PATCH 12/19] dev-serial: convert init to realize |
Date: |
Thu, 18 Sep 2014 17:32:53 +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>
---
hw/usb/dev-serial.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index 178ecb2..3384db6 100644
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -471,7 +471,7 @@ static void usb_serial_event(void *opaque, int event)
}
}
-static int usb_serial_initfn(USBDevice *dev)
+static void usb_serial_realize(USBDevice *dev, Error **errp)
{
USBSerialState *s = DO_UPCAST(USBSerialState, dev, dev);
@@ -480,8 +480,8 @@ static int usb_serial_initfn(USBDevice *dev)
dev->auto_attach = 0;
if (!s->cs) {
- error_report("Property chardev is required");
- return -1;
+ error_setg(errp, "Property chardev is required");
+ return;
}
qemu_chr_add_handlers(s->cs, usb_serial_can_read, usb_serial_read,
@@ -491,7 +491,6 @@ static int usb_serial_initfn(USBDevice *dev)
if (s->cs->be_open && !dev->attached) {
usb_device_attach(dev, NULL);
}
- return 0;
}
static USBDevice *usb_serial_init(USBBus *bus, const char *filename)
@@ -582,7 +581,7 @@ static void usb_serial_class_initfn(ObjectClass *klass,
void *data)
DeviceClass *dc = DEVICE_CLASS(klass);
USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
- uc->init = usb_serial_initfn;
+ uc->realize = usb_serial_realize;
uc->product_desc = "QEMU USB Serial";
uc->usb_desc = &desc_serial;
uc->handle_reset = usb_serial_handle_reset;
@@ -610,7 +609,7 @@ static void usb_braille_class_initfn(ObjectClass *klass,
void *data)
DeviceClass *dc = DEVICE_CLASS(klass);
USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
- uc->init = usb_serial_initfn;
+ uc->realize = usb_serial_realize;
uc->product_desc = "QEMU USB Braille";
uc->usb_desc = &desc_braille;
uc->handle_reset = usb_serial_handle_reset;
--
1.7.12.4
- Re: [Qemu-devel] [PATCH 02/19] usb-bus: convert USBDeviceClass init to realize, (continued)
- [Qemu-devel] [PATCH 06/19] usb-hub: convert init to realize, arei.gonglei, 2014/09/18
- [Qemu-devel] [PATCH 01/19] usb-storage: fix possible memory leak and missing error message, arei.gonglei, 2014/09/18
- [Qemu-devel] [PATCH 04/19] libusb: convert init to realize, arei.gonglei, 2014/09/18
- [Qemu-devel] [PATCH 08/19] dev-storage: usring error_report instead of fprintf/printf, arei.gonglei, 2014/09/18
- [Qemu-devel] [PATCH 12/19] dev-serial: convert init to realize,
arei.gonglei <=
- [Qemu-devel] [PATCH 10/19] dev-uas: using error_report instead of fprintf, arei.gonglei, 2014/09/18
- [Qemu-devel] [PATCH 18/19] usb-mtp: convert init to realize, arei.gonglei, 2014/09/18
- [Qemu-devel] [PATCH 19/19] usb-bus: remove "init" from USBDeviceClass struct, arei.gonglei, 2014/09/18
- [Qemu-devel] [PATCH 13/19] usb-ccid: convert init to realize, arei.gonglei, 2014/09/18
- [Qemu-devel] [PATCH 14/19] dev-hid: convert init to realize, arei.gonglei, 2014/09/18