From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60366) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bD7Pm-0002vR-5y for qemu-devel@nongnu.org; Wed, 15 Jun 2016 05:47:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bD7Pd-0001fX-Ja for qemu-devel@nongnu.org; Wed, 15 Jun 2016 05:47:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40139) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bD7Pd-0001eS-EC for qemu-devel@nongnu.org; Wed, 15 Jun 2016 05:47:05 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 97BD16266F for ; Wed, 15 Jun 2016 09:47:03 +0000 (UTC) From: Gerd Hoffmann Date: Wed, 15 Jun 2016 11:46:57 +0200 Message-Id: <1465984019-28963-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1465984019-28963-1-git-send-email-kraxel@redhat.com> References: <1465984019-28963-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH v2 3/5] usb: Add QOM property "attached ". List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann USB devices in attached state are visible to the guest. This patch adds a QOM property for this. Write access is opt-in per device. Some devices manage attached state automatically (usb-host, usb-serial, usb-redir), so we can't enable write access universally but have to do it on a case by case base. So far, no device opts in. Signed-off-by: Gerd Hoffmann Reviewed-by: Markus Armbruster --- hw/usb/bus.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/hw/usb.h | 1 + 2 files changed, 43 insertions(+) diff --git a/hw/usb/bus.c b/hw/usb/bus.c index afd70ea..93dfe13 100644 --- a/hw/usb/bus.c +++ b/hw/usb/bus.c @@ -736,6 +736,47 @@ USBDevice *usbdevice_create(const char *cmdline) return dev; } +static bool usb_get_attached(Object *obj, Error **errp) +{ + USBDevice *dev = USB_DEVICE(obj); + + return dev->attached; +} + +static void usb_set_attached(Object *obj, bool value, Error **errp) +{ + USBDevice *dev = USB_DEVICE(obj); + Error *err = NULL; + + if (dev->attached == value) + return; + + if (value) { + usb_device_attach(dev, &err); + if (err) { + error_propagate(errp, err); + } + } else { + usb_device_detach(dev); + } +} + +static void usb_device_instance_init(Object *obj) +{ + USBDevice *dev = USB_DEVICE(obj); + USBDeviceClass *klass = USB_DEVICE_GET_CLASS(dev); + + if (klass->attached_settable) { + object_property_add_bool(obj, "attached", + usb_get_attached, usb_set_attached, + NULL); + } else { + object_property_add_bool(obj, "attached", + usb_get_attached, NULL, + NULL); + } +} + static void usb_device_class_init(ObjectClass *klass, void *data) { DeviceClass *k = DEVICE_CLASS(klass); @@ -749,6 +790,7 @@ static const TypeInfo usb_device_type_info = { .name = TYPE_USB_DEVICE, .parent = TYPE_DEVICE, .instance_size = sizeof(USBDevice), + .instance_init = usb_device_instance_init, .abstract = true, .class_size = sizeof(USBDeviceClass), .class_init = usb_device_class_init, diff --git a/include/hw/usb.h b/include/hw/usb.h index 8f39470..847c9de 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -347,6 +347,7 @@ typedef struct USBDeviceClass { const char *product_desc; const USBDesc *usb_desc; + bool attached_settable; } USBDeviceClass; typedef struct USBPortOps { -- 1.8.3.1