[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 02/38] scsi: fix fw path
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v3 02/38] scsi: fix fw path |
Date: |
Wed, 23 Nov 2011 11:44:52 +0000 |
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.7.1
- [Qemu-devel] [PATCH v3 00/38] block: generic copy-on-read, Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 02/38] scsi: fix fw path,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v3 01/38] Documentation: Add section about iSCSI LUNS to qemu-doc, Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 09/38] scsi-block: always use SG_IO for MMC devices, Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 07/38] scsi: remove block descriptors from CDs, Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 05/38] scsi: update list of commands, Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 04/38] atapi: kill MODE SENSE(6), fix MODE SENSE(10), Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 08/38] scsi: pass down REQUEST SENSE to the device when there is no stored sense, Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 06/38] scsi: fix parsing of allocation length field, Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 13/38] scsi-generic: add as boot device, Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 12/38] scsi: fix fw path, Stefan Hajnoczi, 2011/11/23
- [Qemu-devel] [PATCH v3 10/38] virtio-blk: fix cross-endian config space, Stefan Hajnoczi, 2011/11/23