commit 290a5c60a3d203a62a09c88083456ed3ad20329f
author Hans de Goede <hdegoede@redhat.com> Tue May 31 11:35:29 2011 +0200
committer Gerd Hoffmann <kraxel@redhat.com> Tue Jun 14 12:56:49 2011 +0200
tree 27adb8a9278d63a66c6e1df7b38dfd5df63c5d8d
parent 290d26d2e7510fbbcb68a765695b5838af60b3f0

usb-bus: Don't detach non attached devices on device exit

This causes an "Error: tried to detach unattached usb device " to be printed,
this can happen when deleting ie a usb host qdev, which did not
get attached (because a device matching the filter never got plugged in).

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

hw/usb-bus.c

diff --git a/hw/usb-bus.c b/hw/usb-bus.c
index 91f2083..480956d 100644
--- a/hw/usb-bus.c
+++ b/hw/usb-bus.c
@@ -84,7 +84,9 @@
     USBDevice *dev = DO_UPCAST(USBDevice, qdev, qdev);
     USBBus *bus = usb_bus_from_device(dev);
 
-    usb_device_detach(dev);
+    if (dev->attached) {
+        usb_device_detach(dev);
+    }
     bus->ops->device_destroy(bus, dev);
     if (dev->info->handle_destroy) {
         dev->info->handle_destroy(dev);