[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 4/5] usb-bot: hotplug support
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v2 4/5] usb-bot: hotplug support |
Date: |
Wed, 15 Jun 2016 11:46:58 +0200 |
This patch marks usb-bot as hot-pluggable device, makes attached
property settable and turns off auto-attach in case the device
was hotplugged.
Hot-plugging a usb-bot device with one or more scsi devices can be
done this way now:
(1) device-add usb-bot,id=foo
(2) device-add scsi-{hd,cd},bus=foo.0,lun=0
(2b) optionally add more devices (luns 0 ... 15).
(3) qom-set foo.attached = true
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
---
hw/usb/dev-storage.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index f67c090..e7f27d0 100644
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -634,9 +634,14 @@ static void usb_msd_realize_storage(USBDevice *dev, Error
**errp)
static void usb_msd_realize_bot(USBDevice *dev, Error **errp)
{
MSDState *s = USB_STORAGE_DEV(dev);
+ DeviceState *d = DEVICE(dev);
usb_desc_create_serial(dev);
usb_desc_init(dev);
+ if (d->hotplugged) {
+ s->dev.auto_attach = 0;
+ }
+
scsi_bus_new(&s->bus, sizeof(s->bus), DEVICE(dev),
&usb_msd_scsi_info_bot, NULL);
usb_msd_handle_reset(dev);
@@ -808,10 +813,9 @@ static void usb_msd_instance_init(Object *obj)
static void usb_msd_class_initfn_bot(ObjectClass *klass, void *data)
{
USBDeviceClass *uc = USB_DEVICE_CLASS(klass);
- DeviceClass *dc = DEVICE_CLASS(klass);
uc->realize = usb_msd_realize_bot;
- dc->hotpluggable = false;
+ uc->attached_settable = true;
}
static const TypeInfo msd_info = {
--
1.8.3.1
- [Qemu-devel] [PATCH v2 0/5] usb: hotplug support for usb-bot and usb-uas, Gerd Hoffmann, 2016/06/15
- [Qemu-devel] [PATCH v2 4/5] usb-bot: hotplug support,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v2 5/5] usb-uas: hotplug support, Gerd Hoffmann, 2016/06/15
- [Qemu-devel] [PATCH v2 3/5] usb: Add QOM property "attached "., Gerd Hoffmann, 2016/06/15
- [Qemu-devel] [PATCH v2 1/5] usb-storage: qcow2 encryption support is finally gone, zap dead code, Gerd Hoffmann, 2016/06/15
- [Qemu-devel] [PATCH v2 2/5] usb: make USBDevice->attached bool, Gerd Hoffmann, 2016/06/15