From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41375) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO146-0001hK-Gr for qemu-devel@nongnu.org; Tue, 26 Jan 2016 05:41:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aO144-0007mP-C9 for qemu-devel@nongnu.org; Tue, 26 Jan 2016 05:41:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47738) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO144-0007m9-7G for qemu-devel@nongnu.org; Tue, 26 Jan 2016 05:41:36 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 6A0525709 for ; Tue, 26 Jan 2016 10:41:35 +0000 (UTC) From: Gerd Hoffmann Date: Tue, 26 Jan 2016 11:41:24 +0100 Message-Id: <1453804885-15544-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1453804885-15544-1-git-send-email-kraxel@redhat.com> References: <1453804885-15544-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 3/4] usb-bot: hotplug support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , Gerd Hoffmann 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 --- 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 597d8fd..275e0ed 100644 --- a/hw/usb/dev-storage.c +++ b/hw/usb/dev-storage.c @@ -665,9 +665,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); @@ -839,10 +844,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