From patchwork Mon Oct 26 14:56:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [4/7] usb: make attach optional. Date: Mon, 26 Oct 2009 04:56:48 -0000 From: Gerd Hoffmann X-Patchwork-Id: 36915 Message-Id: <1256569011-20256-5-git-send-email-kraxel@redhat.com> To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 (see next patches): * attaching encrypted mass storage devices. * -usbdevice host:... Signed-off-by: Gerd Hoffmann --- hw/usb-bus.c | 3 ++- hw/usb.h | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/hw/usb-bus.c b/hw/usb-bus.c index 28b517f..87dcc7f 100644 --- a/hw/usb-bus.c +++ b/hw/usb-bus.c @@ -45,8 +45,9 @@ static int usb_qdev_init(DeviceState *qdev, DeviceInfo *base) pstrcpy(dev->devname, sizeof(dev->devname), qdev->info->name); dev->info = info; + dev->auto_attach = 1; rc = dev->info->init(dev); - if (rc == 0) + if (rc == 0 && dev->auto_attach) usb_device_attach(dev); return rc; } 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;