From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38414) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RRQux-0007s5-UJ for qemu-devel@nongnu.org; Fri, 18 Nov 2011 11:03:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RRQuv-0004ad-B1 for qemu-devel@nongnu.org; Fri, 18 Nov 2011 11:03:55 -0500 Received: from mail-yx0-f173.google.com ([209.85.213.173]:55712) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RRQuv-0004aN-8Z for qemu-devel@nongnu.org; Fri, 18 Nov 2011 11:03:53 -0500 Received: by yenq2 with SMTP id q2so3134136yen.4 for ; Fri, 18 Nov 2011 08:03:52 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 18 Nov 2011 17:03:45 +0100 Message-Id: <1321632225-21250-1-git-send-email-pbonzini@redhat.com> In-Reply-To: <1321630322-19309-4-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH rebased 3/4] 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 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 086bddd..8f19f07 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -1395,8 +1395,8 @@ 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), - d->channel, d->id, d->lun); + snprintf(path, sizeof(path), "channel@%x/%s@%x,%x", d->channel, + qdev_fw_name(dev), d->id, d->lun); return strdup(path); } -- 1.7.7.1