From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeEyD-0006KT-9S for qemu-devel@nongnu.org; Tue, 14 Oct 2014 23:09:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XeEy1-0004uR-Gp for qemu-devel@nongnu.org; Tue, 14 Oct 2014 23:09:49 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49361 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeEy0-0004rQ-KZ for qemu-devel@nongnu.org; Tue, 14 Oct 2014 23:09:36 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 15 Oct 2014 05:09:12 +0200 Message-Id: <1413342561-4754-39-git-send-email-afaerber@suse.de> In-Reply-To: <1413342561-4754-1-git-send-email-afaerber@suse.de> References: <1413342561-4754-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 38/47] usb: Convert usb-ccid to hotplug handler API List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Gerd Hoffmann From: Igor Mammedov Signed-off-by: Igor Mammedov Signed-off-by: Andreas F=C3=A4rber --- hw/usb/dev-smartcard-reader.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.= c index d37ed02..78ce681 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -1312,8 +1312,8 @@ static void ccid_realize(USBDevice *dev, Error **er= rp) usb_desc_init(dev); qbus_create_inplace(&s->bus, sizeof(s->bus), TYPE_CCID_BUS, DEVICE(d= ev), NULL); + qbus_set_hotplug_handler(BUS(&s->bus), DEVICE(dev), &error_abort); s->intr =3D usb_ep_get(dev, USB_TOKEN_IN, CCID_INT_IN_EP); - s->bus.qbus.allow_hotplug =3D 1; s->card =3D NULL; s->migration_state =3D MIGRATION_NONE; s->migration_target_ip =3D 0; @@ -1439,6 +1439,7 @@ static void ccid_class_initfn(ObjectClass *klass, v= oid *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); USBDeviceClass *uc =3D USB_DEVICE_CLASS(klass); + HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(klass); =20 uc->realize =3D ccid_realize; uc->product_desc =3D "QEMU USB CCID"; @@ -1451,6 +1452,7 @@ static void ccid_class_initfn(ObjectClass *klass, v= oid *data) dc->vmsd =3D &ccid_vmstate; dc->props =3D ccid_properties; set_bit(DEVICE_CATEGORY_INPUT, dc->categories); + hc->unplug =3D qdev_simple_device_unplug_cb; } =20 static const TypeInfo ccid_info =3D { @@ -1458,6 +1460,10 @@ static const TypeInfo ccid_info =3D { .parent =3D TYPE_USB_DEVICE, .instance_size =3D sizeof(USBCCIDState), .class_init =3D ccid_class_initfn, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_HOTPLUG_HANDLER }, + { } + } }; =20 static void ccid_card_class_init(ObjectClass *klass, void *data) --=20 1.8.4.5