Il 18/09/2014 11:32, arei.gong...@huawei.com ha scritto:
> From: Gonglei <arei.gong...@huawei.com>
>
> Signed-off-by: Gonglei <arei.gong...@huawei.com>
> ---
> 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 <pbonz...@redhat.com>
