aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorGonglei <arei.gonglei@huawei.com>2014-09-19 15:25:20 +0800
committerGerd Hoffmann <kraxel@redhat.com>2014-09-23 12:51:08 +0200
commit594a53607e5bd4a2b7555a7a2908d2c406fea9aa (patch)
tree6be9713bb4f70985f5d36c8651881b21f84b478a /hw
parentbd2ba2752d860d5a0b4f328332c3e0b79d275de8 (diff)
downloadqemu-594a53607e5bd4a2b7555a7a2908d2c406fea9aa.zip
qemu-594a53607e5bd4a2b7555a7a2908d2c406fea9aa.tar.gz
qemu-594a53607e5bd4a2b7555a7a2908d2c406fea9aa.tar.bz2
usb-bus: introduce a wrapper function to check speed
In this way, we can check speed directly, don't need call usb_device_attach(), which has other conditions, such as checking the chardev is open. Signed-off-by: Gonglei <arei.gonglei@huawei.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/usb/bus.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index b375293..da1eba9 100644
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -478,7 +478,7 @@ static void usb_mask_to_str(char *dest, size_t size,
}
}
-void usb_device_attach(USBDevice *dev, Error **errp)
+void usb_check_attach(USBDevice *dev, Error **errp)
{
USBBus *bus = usb_bus_from_device(dev);
USBPort *port = dev->port;
@@ -499,6 +499,18 @@ void usb_device_attach(USBDevice *dev, Error **errp)
bus->qbus.name, port->path, portspeed);
return;
}
+}
+
+void usb_device_attach(USBDevice *dev, Error **errp)
+{
+ USBPort *port = dev->port;
+ Error *local_err = NULL;
+
+ usb_check_attach(dev, &local_err);
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
dev->attached++;
usb_attach(port);