From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39488) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWOyz-0005vR-NN for qemu-devel@nongnu.org; Tue, 23 Sep 2014 08:14:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XWOyu-0002D7-U9 for qemu-devel@nongnu.org; Tue, 23 Sep 2014 08:14:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57649) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XWOyu-0002B0-M7 for qemu-devel@nongnu.org; Tue, 23 Sep 2014 08:14:08 -0400 From: Gerd Hoffmann Date: Tue, 23 Sep 2014 14:13:25 +0200 Message-Id: <1411474417-9704-15-git-send-email-kraxel@redhat.com> In-Reply-To: <1411474417-9704-1-git-send-email-kraxel@redhat.com> References: <1411474417-9704-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 14/26] dev-serial: convert init to realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gonglei , Gerd Hoffmann From: Gonglei In this way, all the implementations now use error_setg instead of error_report for reporting error. Signed-off-by: Gonglei Reviewed-by: Paolo Bonzini Signed-off-by: Gerd Hoffmann --- hw/usb/dev-serial.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c index eb1b115..3784f4a 100644 --- a/hw/usb/dev-serial.c +++ b/hw/usb/dev-serial.c @@ -476,18 +476,17 @@ 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); - Error *local_err = NULL; usb_desc_create_serial(dev); usb_desc_init(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, @@ -495,13 +494,8 @@ static int usb_serial_initfn(USBDevice *dev) usb_serial_handle_reset(dev); if (s->cs->be_open && !dev->attached) { - usb_device_attach(dev, &local_err); - if (local_err) { - qerror_report_err(local_err); - error_free(local_err); - } + usb_device_attach(dev, errp); } - return 0; } static USBDevice *usb_serial_init(USBBus *bus, const char *filename) @@ -592,7 +586,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; @@ -620,7 +614,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.8.3.1