diff options
| author | Paolo Bonzini | 2011-11-18 17:03:45 +0100 |
|---|---|---|
| committer | Kevin Wolf | 2011-11-22 10:33:30 +0100 |
| commit | 795928f61daff10b06bb21e837bc5bf0227cf076 (patch) | |
| tree | 562f3e2b4e5ae2e677b068ece10c3fa2184ec34f /hw | |
| parent | usb-msd: do not register twice in the boot order (diff) | |
| download | qemu-795928f61daff10b06bb21e837bc5bf0227cf076.tar.gz qemu-795928f61daff10b06bb21e837bc5bf0227cf076.tar.xz qemu-795928f61daff10b06bb21e837bc5bf0227cf076.zip | |
scsi: fix fw path
The pre-1.0 firmware path for SCSI devices already included the LUN
using the suffix argument to add_boot_device_path. Avoid that it is
included twice, and convert the colons to commas for consistency with
other kinds of devices
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/scsi-bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 2feeaa2998..64e709ee9f 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -1370,8 +1370,8 @@ static char *scsibus_get_fw_dev_path(DeviceState *dev) SCSIDevice *d = DO_UPCAST(SCSIDevice, qdev, dev); char path[100]; - snprintf(path, sizeof(path), "%s@%d,%d,%d", qdev_fw_name(dev), - d->channel, d->id, d->lun); + snprintf(path, sizeof(path), "channel@%x/%s@%x,%x", d->channel, + qdev_fw_name(dev), d->id, d->lun); return strdup(path); } |