Patchwork [4/5] usb: make attach optional.

login
register
mail settings
Submitter Gerd Hoffmann
Date Oct. 23, 2009, 9:26 a.m.
Message ID <1256289963-26430-5-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/36772/
State New
Headers show

Comments

Gerd Hoffmann - Oct. 23, 2009, 9:26 a.m.
Add a auto_attach field to USBDevice, which is enabled by default.
USB drivers can clear this field in case they do *not* want the device
being attached (i.e. plugged into a usb port) automatically after
successfull init().

Use cases:
 * attaching encrypted mass storage devices (see next patch).
 * maybe also -usbdevice host:$vendorid:$productid

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/usb-bus.c |    7 +++++--
 hw/usb.h     |    1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

Patch

diff --git a/hw/usb-bus.c b/hw/usb-bus.c
index 28b517f..4d0c10d 100644
--- a/hw/usb-bus.c
+++ b/hw/usb-bus.c
@@ -46,7 +46,7 @@  static int usb_qdev_init(DeviceState *qdev, DeviceInfo *base)
     pstrcpy(dev->devname, sizeof(dev->devname), qdev->info->name);
     dev->info = info;
     rc = dev->info->init(dev);
-    if (rc == 0)
+    if (rc == 0 && dev->auto_attach)
         usb_device_attach(dev);
     return rc;
 }
@@ -82,6 +82,7 @@  void usb_qdev_register_many(USBDeviceInfo *info)
 USBDevice *usb_create(USBBus *bus, const char *name)
 {
     DeviceState *dev;
+    USBDevice *usb;
 
 #if 1
     /* temporary stopgap until all usb is properly qdev-ified */
@@ -95,7 +96,9 @@  USBDevice *usb_create(USBBus *bus, const char *name)
 #endif
 
     dev = qdev_create(&bus->qbus, name);
-    return DO_UPCAST(USBDevice, qdev, dev);
+    usb = DO_UPCAST(USBDevice, qdev, dev);
+    usb->auto_attach = 1;
+    return usb;
 }
 
 USBDevice *usb_create_simple(USBBus *bus, const char *name)
diff --git a/hw/usb.h b/hw/usb.h
index a875d5b..a01f334 100644
--- a/hw/usb.h
+++ b/hw/usb.h
@@ -133,6 +133,7 @@  struct USBDevice {
     int speed;
     uint8_t addr;
     char devname[32];
+    int auto_attach;
     int attached;
 
     int state;