[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/12] scsi: fix fw path
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 03/12] scsi: fix fw path |
Date: |
Fri, 25 Nov 2011 19:12: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. 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 | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c
index 2feeaa2..64e709e 100644
--- a/hw/scsi-bus.c
+++ b/hw/scsi-bus.c
@@ -1370,8 +1370,8 @@ 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),
- d->channel, d->id, d->lun);
+ snprintf(path, sizeof(path), "address@hidden/address@hidden,%x",
d->channel,
+ qdev_fw_name(dev), d->id, d->lun);
return strdup(path);
}
--
1.7.6.4
- [Qemu-devel] [PULL 00/12] Block patches for 1.0, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 01/12] virtio-blk: fix cross-endian config space, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 02/12] usb-msd: do not register twice in the boot order, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 04/12] scsi-generic: add as boot device, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 03/12] scsi: fix fw path,
Kevin Wolf <=
- [Qemu-devel] [PATCH 05/12] sheepdog: Avoid deadlock in error path, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 06/12] qcow: Add migration blocker, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 07/12] vdi: Add migration blocker, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 08/12] vmdk: Add migration blocker, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 10/12] vvfat: Add migration blocker, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 12/12] vpc: Add missing error handling in alloc_block, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 11/12] vdi: Fix memory leak, Kevin Wolf, 2011/11/25
- [Qemu-devel] [PATCH 09/12] vpc: Add migration blocker, Kevin Wolf, 2011/11/25
- Re: [Qemu-devel] [PULL 00/12] Block patches for 1.0, Anthony Liguori, 2011/11/28