From: Hans de Goede <hdegoede@redhat.com>
Date: Tue, 31 May 2011 09:35:29 +0000 (+0200)
Subject: usb-bus: Don't detach non attached devices on device exit
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~5684^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=290a5c60a3d203a62a09c88083456ed3ad20329f;p=sdk%2Femulator%2Fqemu.git

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>
---

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 @@ static int usb_qdev_exit(DeviceState *qdev)
     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);