From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RROzF-0007fe-VK for qemu-devel@nongnu.org; Fri, 18 Nov 2011 09:00:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RROzE-0002WT-8K for qemu-devel@nongnu.org; Fri, 18 Nov 2011 09:00:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:22308) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RROzE-0002WO-1M for qemu-devel@nongnu.org; Fri, 18 Nov 2011 09:00:12 -0500 From: Kevin Wolf Date: Fri, 18 Nov 2011 15:03:06 +0100 Message-Id: <1321624993-19033-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1321624993-19033-1-git-send-email-kwolf@redhat.com> References: <1321624993-19033-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 2/9] scsi: fix fw path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: 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 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; } -- 1.7.6.4