[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/9] scsi: fix fw path
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 2/9] scsi: fix fw path |
Date: |
Fri, 18 Nov 2011 15:03:06 +0100 |
From: Paolo Bonzini <address@hidden>
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 <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
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), "address@hidden:%d:%d", qdev_fw_name(dev),
+ snprintf(path, sizeof(path), "address@hidden,%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;
}
--
1.7.6.4
- [Qemu-devel] [PULL 0/9] Block patches for 1.0, Kevin Wolf, 2011/11/18
- [Qemu-devel] [PATCH 1/9] Documentation: Add section about iSCSI LUNS to qemu-doc, Kevin Wolf, 2011/11/18
- [Qemu-devel] [PATCH 3/9] scsi-disk: guess geometry, Kevin Wolf, 2011/11/18
- [Qemu-devel] [PATCH 4/9] atapi: kill MODE SENSE(6), fix MODE SENSE(10), Kevin Wolf, 2011/11/18
- [Qemu-devel] [PATCH 2/9] scsi: fix fw path,
Kevin Wolf <=
- [Qemu-devel] [PATCH 5/9] scsi: update list of commands, Kevin Wolf, 2011/11/18
- [Qemu-devel] [PATCH 7/9] scsi: remove block descriptors from CDs, Kevin Wolf, 2011/11/18
- [Qemu-devel] [PATCH 6/9] scsi: fix parsing of allocation length field, Kevin Wolf, 2011/11/18
- [Qemu-devel] [PATCH 8/9] scsi: pass down REQUEST SENSE to the device when there is no stored sense, Kevin Wolf, 2011/11/18
- [Qemu-devel] [PATCH 9/9] scsi-block: always use SG_IO for MMC devices, Kevin Wolf, 2011/11/18
- Re: [Qemu-devel] [PULL 0/9] Block patches for 1.0, Anthony Liguori, 2011/11/21