diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2011-11-15 17:36:38 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-11-18 13:35:20 +0100 |
| commit | 7082826eb41887da7795b3135eaeda1726647987 (patch) | |
| tree | 65b9f8204c718006fe0c3d4f1396dcc797b9add8 | |
| parent | 00984e395363bd924627f8c332ca08007c861a1e (diff) | |
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. I missed that when
making channel and LUN customizable. 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>
| -rw-r--r-- | hw/scsi-bus.c | 2 | ||||
| -rw-r--r-- | hw/scsi-disk.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index e6ebbd594e..07419b8b3f 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -1279,7 +1279,7 @@ 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), + snprintf(path, sizeof(path), "%s@%d,%d,%d", qdev_fw_name(dev), d->channel, d->id, d->lun); return strdup(path); diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 62f538f4f8..cc4f9efa59 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1553,7 +1553,7 @@ static int scsi_initfn(SCSIDevice *dev) bdrv_set_buffer_alignment(s->qdev.conf.bs, s->qdev.blocksize); bdrv_iostatus_enable(s->qdev.conf.bs); - add_boot_device_path(s->qdev.conf.bootindex, &dev->qdev, ",0"); + add_boot_device_path(s->qdev.conf.bootindex, &dev->qdev, NULL); return 0; } |