From patchwork Tue May 28 12:28:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 246855 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 25B732C02F8 for ; Tue, 28 May 2013 22:28:55 +1000 (EST) Received: from localhost ([::1]:41037 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhJ1J-0000v6-As for incoming@patchwork.ozlabs.org; Tue, 28 May 2013 08:28:53 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhJ0t-0000o7-RJ for qemu-devel@nongnu.org; Tue, 28 May 2013 08:28:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UhJ0n-0006tc-Oz for qemu-devel@nongnu.org; Tue, 28 May 2013 08:28:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19641) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhJ0n-0006tX-HD for qemu-devel@nongnu.org; Tue, 28 May 2013 08:28:21 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r4SCSJ3n030216 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 28 May 2013 08:28:20 -0400 Received: from t430s.nay.redhat.com (vpn1-113-167.nay.redhat.com [10.66.113.167]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r4SCSGRF004017; Tue, 28 May 2013 08:28:17 -0400 From: Amos Kong To: kevin@koconnor.net Date: Tue, 28 May 2013 20:28:14 +0800 Message-Id: <1369744094-21727-1-git-send-email-akong@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, seabios@seabios.org, qemu-devel@nongnu.org Subject: [Qemu-devel] [SeaBIOS PATCH] boot: fix fw_dev_path pattern for q35-pcihost 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 Bootindex string passed from qemu: /q35-pcihost@i0cf8/ethernet@2/ethernet-phy@0 We match pci domain by "/pci@i0cf8" in SeaBIOS, but fw_dev_path prefix of q35 is "/q35-pcihost@i0cf8". So bootindex in qemu commandline doesn't work if it uses q35 machine type. This patch fixes the pattern to match both original pc-i440fx & q35 Signed-off-by: Amos Kong Reviewed-by: Paolo Bonzini --- src/boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/boot.c b/src/boot.c index cd9d784..f30d47e 100644 --- a/src/boot.c +++ b/src/boot.c @@ -97,7 +97,7 @@ find_prio(const char *glob) return -1; } -#define FW_PCI_DOMAIN "/pci@i0cf8" +#define FW_PCI_DOMAIN "/*pci*@i0cf8" static char * build_pci_path(char *buf, int max, const char *devname, struct pci_device *pci)