From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUYjd-0007uk-2Z for qemu-devel@nongnu.org; Thu, 18 Sep 2014 06:14:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XUYjY-0006FO-8e for qemu-devel@nongnu.org; Thu, 18 Sep 2014 06:14:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47578) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUYjX-0006Em-Vh for qemu-devel@nongnu.org; Thu, 18 Sep 2014 06:14:40 -0400 Message-ID: <541AB083.8090300@redhat.com> Date: Thu, 18 Sep 2014 12:14:27 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1411032780-10692-1-git-send-email-arei.gonglei@huawei.com> <1411032780-10692-13-git-send-email-arei.gonglei@huawei.com> In-Reply-To: <1411032780-10692-13-git-send-email-arei.gonglei@huawei.com> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 12/19] dev-serial: convert init to realize List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: arei.gonglei@huawei.com, qemu-devel@nongnu.org Cc: luonengjun@huawei.com, peter.huangpeng@huawei.com, weidong.huang@huawei.com, kraxel@redhat.com, armbru@redhat.com Il 18/09/2014 11:32, arei.gonglei@huawei.com ha scritto: > From: Gonglei > > In this way, all the implementations now use > error_setg instead of error_report for reporting error. > > Signed-off-by: Gonglei > --- > 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; > Reviewed-by: Paolo Bonzini