Merge branch 'usb.64' of git://git.kraxel.org/qemu

[mirror_qemu.git] / hw / pci-hotplug.c

diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
index 61257f457bc5acfe8707d61be421410adb99b4ca..e7fb780a088280b085e742c7547d056cbf167998 100644 (file)
--- a/hw/pci-hotplug.c
+++ b/hw/pci-hotplug.c
@@ -80,11 +80,7 @@ static int scsi_hot_add(Monitor *mon, DeviceState *adapter,
     SCSIBus *scsibus;
     SCSIDevice *scsidev;
 
-    scsibus = DO_UPCAST(SCSIBus, qbus, QLIST_FIRST(&adapter->child_bus));
-    if (!scsibus || strcmp(scsibus->qbus.info->name, "SCSI") != 0) {
-        error_report("Device is not a SCSI adapter");
-        return -1;
-    }
+    scsibus = SCSI_BUS(QLIST_FIRST(&adapter->child_bus));
 
     /*
      * drive_init() tries to find a default for dinfo->unit.  Doesn't