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>
This commit is contained in:
Hans de Goede 2011-05-31 11:35:29 +02:00 committed by Gerd Hoffmann
parent 290d26d2e7
commit 290a5c60a3
1 changed files with 3 additions and 1 deletions

View File

@ -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);