Revision 95b5edcd hw/scsi-disk.c

b/hw/scsi-disk.c
1295 1295
static int scsi_disk_initfn(SCSIDevice *dev)
1296 1296
{
1297 1297
    SCSIDriveKind kind;
1298
    DriveInfo *dinfo;
1298 1299

  
1299 1300
    if (!dev->conf.bs) {
1300 1301
        kind = SCSI_HD;         /* will die in scsi_initfn() */
1301 1302
    } else {
1302
        kind = bdrv_get_type_hint(dev->conf.bs) == BDRV_TYPE_CDROM
1303
            ? SCSI_CD : SCSI_HD;
1303
        dinfo = drive_get_by_blockdev(dev->conf.bs);
1304
        kind = dinfo->media_cd ? SCSI_CD : SCSI_HD;
1304 1305
    }
1305 1306

  
1306 1307
    return scsi_initfn(dev, kind);

Also available in: Unified diff