From e9aff71586514a2b20f1aaeac85d2785a33ce55e Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 15 Nov 2011 17:36:38 +0100 Subject: [PATCH] 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 Signed-off-by: Kevin Wolf --- hw/scsi-bus.c | 2 +- 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 e6ebbd5..07419b8 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 62f538f..cc4f9ef 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; } -- 2.7.4