From patchwork Fri Nov 18 16:03:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 126438 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 51339B7236 for ; Sat, 19 Nov 2011 03:04:06 +1100 (EST) Received: from localhost ([::1]:47332 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RRQv4-0007sk-6K for incoming@patchwork.ozlabs.org; Fri, 18 Nov 2011 11:04:02 -0500 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) 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; bh=eNEgM59m38VaxobeqQ5bjNPYWWIXJn+hbckaIsupO18=; b=heiZ9cSUsYnr8Y+608aq7sCqEi6cqo3FfosiyyHsoNJdVlYggvpP+EDNev/cN8GJur doZ4dvpVFd3Cyc0bCUGIw499zsEjksng6z0n1GlBxzI5E8Linj8ylsZEUWPu3fv3ogU2 yoicN4Wu03iElQQD0DHx+ldYt0M2z4OStIqRg= Received: by 10.229.189.129 with SMTP id de1mr395862qcb.187.1321632232763; Fri, 18 Nov 2011 08:03:52 -0800 (PST) Received: from localhost.localdomain (93-34-207-114.ip51.fastwebnet.it. [93.34.207.114]) by mx.google.com with ESMTPS id ed2sm1093528qab.15.2011.11.18.08.03.50 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 18 Nov 2011 08:03:51 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 18 Nov 2011 17:03:45 +0100 Message-Id: <1321632225-21250-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1321630322-19309-4-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.173 Subject: [Qemu-devel] [PATCH rebased 3/4] 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. 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); }