From patchwork Tue Nov 15 16:36:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 125818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 68238B6F7B for ; Wed, 16 Nov 2011 03:37:03 +1100 (EST) Received: from localhost ([::1]:58839 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQM0F-0004jK-41 for incoming@patchwork.ozlabs.org; Tue, 15 Nov 2011 11:36:55 -0500 Received: from eggs.gnu.org ([140.186.70.92]:54056) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQM09-0004jD-PZ for qemu-devel@nongnu.org; Tue, 15 Nov 2011 11:36:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RQM08-0004yM-8h for qemu-devel@nongnu.org; Tue, 15 Nov 2011 11:36:49 -0500 Received: from mail-yw0-f45.google.com ([209.85.213.45]:47716) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RQM08-0004yC-2j for qemu-devel@nongnu.org; Tue, 15 Nov 2011 11:36:48 -0500 Received: by ywa17 with SMTP id 17so4474734ywa.4 for ; Tue, 15 Nov 2011 08:36:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=lvd9KTdRjuoKPTrtslQoomtZcmw1Pn3I8SThaBFfRLg=; b=Ha9xXvaqAgYK/XE/ek5BTZtFmqNEF3wEVYY6zJ4/gs/y9qOQzREDjd8QDTO5RXfSWO j4HNvAD8AsPeoW+1qjV7571UJwermI3zywisgm8QI4OEditrslJJf2+IFoiBhHORbQNu iHa6lYvaOkdYvowuaz6kb0KV9K3LgKvuGiJKI= Received: by 10.101.93.18 with SMTP id v18mr8206495anl.58.1321375007616; Tue, 15 Nov 2011 08:36:47 -0800 (PST) Received: from localhost.localdomain (93-34-207-114.ip51.fastwebnet.it. [93.34.207.114]) by mx.google.com with ESMTPS id f14sm49778227ani.8.2011.11.15.08.36.44 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 15 Nov 2011 08:36:45 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 15 Nov 2011 17:36:38 +0100 Message-Id: <1321374998-18214-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1321363722-23687-1-git-send-email-pbonzini@redhat.com> References: <1321363722-23687-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.213.45 Subject: [Qemu-devel] [PATCH 1.0 v2] scsi: fix fw path X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- v1->v2: include scsi-disk hunk too 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 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); diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 9da6d36..16a4714 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -1581,7 +1581,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; }