From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41013) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQJ4M-0002QI-Rv for qemu-devel@nongnu.org; Tue, 15 Nov 2011 08:28:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RQJ4L-0008IJ-PK for qemu-devel@nongnu.org; Tue, 15 Nov 2011 08:28:58 -0500 Received: from mail-iy0-f173.google.com ([209.85.210.173]:51340) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQJ4L-0008ID-MH for qemu-devel@nongnu.org; Tue, 15 Nov 2011 08:28:57 -0500 Received: by iakk32 with SMTP id k32so9938924iak.4 for ; Tue, 15 Nov 2011 05:28:56 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 15 Nov 2011 14:28:42 +0100 Message-Id: <1321363722-23687-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 1.0] scsi: fix fw path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- hw/scsi-bus.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 372fe7f..b4e6e29 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -1304,7 +1304,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); -- 1.7.7.1