Revision fa66b909 hw/scsi-bus.c

b/hw/scsi-bus.c
83 83
}
84 84

  
85 85
/* handle legacy '-drive if=scsi,...' cmd line args */
86
/* FIXME callers should check for failure, but don't */
87 86
SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, DriveInfo *dinfo, int unit)
88 87
{
89 88
    const char *driver;
......
98 97
    return DO_UPCAST(SCSIDevice, qdev, dev);
99 98
}
100 99

  
101
void scsi_bus_legacy_handle_cmdline(SCSIBus *bus)
100
int scsi_bus_legacy_handle_cmdline(SCSIBus *bus)
102 101
{
103 102
    DriveInfo *dinfo;
104
    int unit;
103
    int res = 0, unit;
105 104

  
106 105
    for (unit = 0; unit < MAX_SCSI_DEVS; unit++) {
107 106
        dinfo = drive_get(IF_SCSI, bus->busnr, unit);
108 107
        if (dinfo == NULL) {
109 108
            continue;
110 109
        }
111
        scsi_bus_legacy_add_drive(bus, dinfo, unit);
110
        if (!scsi_bus_legacy_add_drive(bus, dinfo, unit)) {
111
            res = -1;
112
            break;
113
        }
112 114
    }
115
    return res;
113 116
}
114 117

  
115 118
void scsi_dev_clear_sense(SCSIDevice *dev)

Also available in: Unified diff