[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 38/47] usb: Convert usb-ccid to hotplug handler API
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 38/47] usb: Convert usb-ccid to hotplug handler API |
Date: |
Wed, 15 Oct 2014 05:09:12 +0200 |
From: Igor Mammedov <address@hidden>
Signed-off-by: Igor Mammedov <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
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 **errp)
usb_desc_init(dev);
qbus_create_inplace(&s->bus, sizeof(s->bus), TYPE_CCID_BUS, DEVICE(dev),
NULL);
+ qbus_set_hotplug_handler(BUS(&s->bus), DEVICE(dev), &error_abort);
s->intr = usb_ep_get(dev, USB_TOKEN_IN, CCID_INT_IN_EP);
- s->bus.qbus.allow_hotplug = 1;
s->card = NULL;
s->migration_state = MIGRATION_NONE;
s->migration_target_ip = 0;
@@ -1439,6 +1439,7 @@ static void ccid_class_initfn(ObjectClass *klass, void
*data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
+ HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(klass);
uc->realize = ccid_realize;
uc->product_desc = "QEMU USB CCID";
@@ -1451,6 +1452,7 @@ static void ccid_class_initfn(ObjectClass *klass, void
*data)
dc->vmsd = &ccid_vmstate;
dc->props = ccid_properties;
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
+ hc->unplug = qdev_simple_device_unplug_cb;
}
static const TypeInfo ccid_info = {
@@ -1458,6 +1460,10 @@ static const TypeInfo ccid_info = {
.parent = TYPE_USB_DEVICE,
.instance_size = sizeof(USBCCIDState),
.class_init = ccid_class_initfn,
+ .interfaces = (InterfaceInfo[]) {
+ { TYPE_HOTPLUG_HANDLER },
+ { }
+ }
};
static void ccid_card_class_init(ObjectClass *klass, void *data)
--
1.8.4.5
- [Qemu-devel] [PULL 31/47] scsi: Set SCSI BUS itself as default HotplugHandler, (continued)
- [Qemu-devel] [PULL 31/47] scsi: Set SCSI BUS itself as default HotplugHandler, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 30/47] s390x: Convert virtio-ccw to hotplug handler API, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 34/47] scsi: Cleanup not used anymore SCSIBusInfo{hotplug, hot_unplug} fields, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 32/47] scsi: Convert pvscsi HBA to hotplug handler API, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 28/47] s390x: Drop not used allow_hotplug in event-facility, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 26/47] virtio-serial: Convert to hotplug-handler API, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 33/47] scsi: Convert virtio-scsi HBA to hotplug handler API, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 36/47] usb-bot: Drop not needed "allow_hotplug = 0", Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 37/47] usb-storage: Drop not needed "allow_hotplug = 0", Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 43/47] qdev: Add description field in PropertyInfo struct, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 38/47] usb: Convert usb-ccid to hotplug handler API,
Andreas Färber <=
- [Qemu-devel] [PULL 35/47] usb-bot: Mark device as non hotpluggable, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 39/47] usb: Convert usb devices to hotplug handler API, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 42/47] qdev: device_del: Search for to be unplugged device in 'peripheral' container, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 41/47] qdev: HotplugHandler: Add support for unplugging BUS-less devices, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 45/47] qdev: Set the object property's description to the qdev property's., Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 44/47] qom: Add description field in ObjectProperty struct, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 40/47] qdev: Drop legacy hotplug fields/methods, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 46/47] qmp: Print descriptions of object properties, Andreas Färber, 2014/10/14
- [Qemu-devel] [PULL 47/47] qdev: Drop legacy_name from qdev properties, Andreas Färber, 2014/10/14
- Re: [Qemu-devel] [PULL 00/47] QOM devices patch queue 2014-10-15, Peter Maydell, 2014/10/15