From 9bcd11daf18c189b908a752e0a617a564b6b0ca7 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 16 Jan 2014 14:28:15 -0500 Subject: [PATCH 11/14] pci: fix pci bridge fw path Message-id: <1389882495-30964-2-git-send-email-kraxel@redhat.com> Patchwork-id: 56747 O-Subject: [RHEL-7 qemu-kvm PATCH 1/1] pci: fix pci bridge fw path Bugzilla: 1034518 RH-Acked-by: Paolo Bonzini RH-Acked-by: Laszlo Ersek RH-Acked-by: Bandan Das qemu uses "pci" as name for pci bridges in the firmware device path. seabios expects "pci-bridge". Result is that bootorder is broken for devices behind pci bridges. Some googling suggests that "pci-bridge" is the correct one. At least PPC-based Apple machines are using this. See question "How do I boot from a device attached to a PCI card" here: http://www.netbsd.org/ports/macppc/faq.html So lets change qemu to use "pci-bridge" too. Signed-off-by: Gerd Hoffmann Signed-off-by: Michael S. Tsirkin (cherry picked from commit 4c41425d2e79f267b2236da31abedb866777d92f) --- hw/pci/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Miroslav Rezanina --- hw/pci/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 598d288..d166ab0 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1308,7 +1308,7 @@ static const pci_class_desc pci_class_descriptions[] = { 0x0601, "ISA bridge", "isa"}, { 0x0602, "EISA bridge", "eisa"}, { 0x0603, "MC bridge", "mca"}, - { 0x0604, "PCI bridge", "pci"}, + { 0x0604, "PCI bridge", "pci-bridge"}, { 0x0605, "PCMCIA bridge", "pcmcia"}, { 0x0606, "NUBUS bridge", "nubus"}, { 0x0607, "CARDBUS bridge", "cardbus"}, -- 1.8.3.1