[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/5] usb: Add QOM property "attached".
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 3/5] usb: Add QOM property "attached". |
Date: |
Wed, 22 Jun 2016 13:48:45 +0200 |
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 <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
[ minor codestyle fix ]
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/bus.c | 43 +++++++++++++++++++++++++++++++++++++++++++
include/hw/usb.h | 1 +
2 files changed, 44 insertions(+)
diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index afd70ea..c28ccb8 100644
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -736,6 +736,48 @@ 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 +791,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
- [Qemu-devel] [PULL 0/5] usb: add hotplug support for usb-bot and usb-uas., Gerd Hoffmann, 2016/06/22
- [Qemu-devel] [PULL 1/5] usb-storage: qcow2 encryption support is finally gone, zap dead code, Gerd Hoffmann, 2016/06/22
- [Qemu-devel] [PULL 5/5] usb-uas: hotplug support, Gerd Hoffmann, 2016/06/22
- [Qemu-devel] [PULL 4/5] usb-bot: hotplug support, Gerd Hoffmann, 2016/06/22
- [Qemu-devel] [PULL 2/5] usb: make USBDevice->attached bool, Gerd Hoffmann, 2016/06/22
- [Qemu-devel] [PULL 3/5] usb: Add QOM property "attached".,
Gerd Hoffmann <=
- Re: [Qemu-devel] [PULL 0/5] usb: add hotplug support for usb-bot and usb-uas., Peter Maydell, 2016/06/23