From 290a5c60a3d203a62a09c88083456ed3ad20329f Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 31 May 2011 11:35:29 +0200 Subject: [PATCH] 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 --- hw/usb-bus.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/usb-bus.c b/hw/usb-bus.c index 91f20839b7..480956dfcf 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);