From patchwork Fri Nov 18 15:32:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 126431 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 5797AB725C for ; Sat, 19 Nov 2011 02:32:43 +1100 (EST) Received: from localhost ([::1]:60338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RRQQh-0006rX-Fl for incoming@patchwork.ozlabs.org; Fri, 18 Nov 2011 10:32:39 -0500 Received: from eggs.gnu.org ([140.186.70.92]:37441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RRQQT-0006Tz-Iv for qemu-devel@nongnu.org; Fri, 18 Nov 2011 10:32:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RRQQN-0006se-AI for qemu-devel@nongnu.org; Fri, 18 Nov 2011 10:32:25 -0500 Received: from mail-gx0-f173.google.com ([209.85.161.173]:41143) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RRQQN-0006rj-7b for qemu-devel@nongnu.org; Fri, 18 Nov 2011 10:32:19 -0500 Received: by mail-gx0-f173.google.com with SMTP id r4so3051366ggn.4 for ; Fri, 18 Nov 2011 07:32:18 -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=+GXotf+7mCUcGr4R5kSRSpBPcptEltYHVivze23lZXs=; b=jb90zMz60BsH9wmHhPVo9V5HfZ3WgbLi8QO+V4wDD+YWn0nmVYX2VsnhV0S7mDAh2D GUYX9zaWSNazjzVfojyKFvjks2UVTxNVabClYcRq7GIy+YBlU5rYtQD0e1jFmkWfZbVD 4Mf0P4SsiHtoecejjJjC7qOffPzQAikD78/QI= Received: by 10.101.190.10 with SMTP id s10mr870301anp.126.1321630338875; Fri, 18 Nov 2011 07:32:18 -0800 (PST) Received: from localhost.localdomain (93-34-207-114.ip51.fastwebnet.it. [93.34.207.114]) by mx.google.com with ESMTPS id l19sm2937866anc.14.2011.11.18.07.32.16 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 18 Nov 2011 07:32:17 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 18 Nov 2011 16:32:01 +0100 Message-Id: <1321630322-19309-4-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1321630322-19309-1-git-send-email-pbonzini@redhat.com> References: <1321630322-19309-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.161.173 Subject: [Qemu-devel] [PATCH 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, for consistency with the OpenFirmware spec: 1) move the "channel" to a separate device path; 2) convert the colons to commas; 3) use hex for the numbers. This is compatible with SeaBIOS USB boot, which only looks at the prefix for the usb-storage device (e.g. /pci@i0cf8/usb@1,2/storage@1), and never at the SCSI part. Signed-off-by: Paolo Bonzini --- hw/scsi-bus.c | 4 ++-- hw/scsi-disk.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/scsi-bus.c b/hw/scsi-bus.c index 61c883f..07d6a7d 100644 --- a/hw/scsi-bus.c +++ b/hw/scsi-bus.c @@ -1307,8 +1307,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); } 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; }