From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Amos Kong Date: Tue, 28 May 2013 20:28:14 +0800 Message-Id: <1369744094-21727-1-git-send-email-akong@redhat.com> Subject: [Qemu-devel] [SeaBIOS PATCH] boot: fix fw_dev_path pattern for q35-pcihost List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kevin@koconnor.net Cc: pbonzini@redhat.com, seabios@seabios.org, qemu-devel@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 --- 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) -- 1.8.1.4