From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59343) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUYjv-0008R9-Ll for qemu-devel@nongnu.org; Thu, 18 Sep 2014 06:15:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XUYjq-0006Hi-5P for qemu-devel@nongnu.org; Thu, 18 Sep 2014 06:15:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46118) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XUYjp-0006Gv-Rd for qemu-devel@nongnu.org; Thu, 18 Sep 2014 06:14:58 -0400 Message-ID: <541AB08F.4090607@redhat.com> Date: Thu, 18 Sep 2014 12:14:39 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1411032780-10692-1-git-send-email-arei.gonglei@huawei.com> <1411032780-10692-14-git-send-email-arei.gonglei@huawei.com> In-Reply-To: <1411032780-10692-14-git-send-email-arei.gonglei@huawei.com> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 13/19] usb-ccid: 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 > > Signed-off-by: Gonglei > --- > hw/usb/dev-smartcard-reader.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c > index 470e69f..442f487 100644 > --- a/hw/usb/dev-smartcard-reader.c > +++ b/hw/usb/dev-smartcard-reader.c > @@ -1304,7 +1304,7 @@ static int ccid_card_init(DeviceState *qdev) > return ret; > } > > -static int ccid_initfn(USBDevice *dev) > +static void ccid_realize(USBDevice *dev, Error **errp) > { > USBCCIDState *s = DO_UPCAST(USBCCIDState, dev, dev); > > @@ -1332,7 +1332,6 @@ static int ccid_initfn(USBDevice *dev) > ccid_reset_parameters(s); > ccid_reset(s); > s->debug = parse_debug_env("QEMU_CCID_DEBUG", D_VERBOSE, s->debug); > - return 0; > } > > static int ccid_post_load(void *opaque, int version_id) > @@ -1441,7 +1440,7 @@ static void ccid_class_initfn(ObjectClass *klass, void *data) > DeviceClass *dc = DEVICE_CLASS(klass); > USBDeviceClass *uc = USB_DEVICE_CLASS(klass); > > - uc->init = ccid_initfn; > + uc->realize = ccid_realize; > uc->product_desc = "QEMU USB CCID"; > uc->usb_desc = &desc_ccid; > uc->handle_reset = ccid_handle_reset; > Reviewed-by: Paolo Bonzini