| Message ID | 1321374998-18214-1-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
Am 15.11.2011 17:36, schrieb Paolo Bonzini: > 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> > --- > v1->v2: include scsi-disk hunk too Thanks, applied to the block-stable branch (for 1.0) Kevin
Am 18.11.2011 13:35, schrieb Kevin Wolf: > Am 15.11.2011 17:36, schrieb Paolo Bonzini: >> 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> >> --- >> v1->v2: include scsi-disk hunk too > > Thanks, applied to the block-stable branch (for 1.0) Did you guys check the consistency part against OpenFirmware syntax? I didn't get around to that yet. Andreas
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 372fe7f..b4e6e29 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -1304,7 +1304,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 9da6d36..16a4714 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1581,7 +1581,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; }
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> --- v1->v2: include scsi-disk hunk too hw/scsi-bus.c | 2 +- hw/scsi-disk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)