From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:56094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTBHr-0005rb-K8 for qemu-devel@nongnu.org; Wed, 23 Nov 2011 06:46:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RTBHo-0001yI-NN for qemu-devel@nongnu.org; Wed, 23 Nov 2011 06:46:47 -0500 Received: from mtagate7.uk.ibm.com ([194.196.100.167]:36011) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RTBHo-0001xW-85 for qemu-devel@nongnu.org; Wed, 23 Nov 2011 06:46:44 -0500 Received: from d06nrmr1507.portsmouth.uk.ibm.com (d06nrmr1507.portsmouth.uk.ibm.com [9.149.38.233]) by mtagate7.uk.ibm.com (8.13.1/8.13.1) with ESMTP id pANBkhvx008744 for ; Wed, 23 Nov 2011 11:46:43 GMT Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [9.149.37.248]) by d06nrmr1507.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pANBkhhX2064504 for ; Wed, 23 Nov 2011 11:46:43 GMT Received: from d06av07.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pANBkg9B028769 for ; Wed, 23 Nov 2011 04:46:42 -0700 From: Stefan Hajnoczi Date: Wed, 23 Nov 2011 11:45:02 +0000 Message-Id: <1322048728-26061-13-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1322048728-26061-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1322048728-26061-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v3 12/38] scsi: fix fw path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , Marcelo Tosatti 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. 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 | 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), "%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