|
 |
e752ca |
From 1522cd13558aa821de7435b291d47009907f3466 Mon Sep 17 00:00:00 2001
|
|
|
e752ca |
From: Marcel Apfelbaum <marcel@redhat.com>
|
|
|
e752ca |
Date: Tue, 14 Jul 2015 15:23:13 -0400
|
|
|
e752ca |
Subject: [PATCH] bootorder: Update "extra pci root" buses bootorder format to
|
|
|
e752ca |
match qemu
|
|
|
e752ca |
|
|
|
e752ca |
Message-id: <1436887393-17958-1-git-send-email-marcel@redhat.com>
|
|
|
e752ca |
Patchwork-id: 67011
|
|
|
e752ca |
O-Subject: [RHEL-7.2 seabios PATCH] bootorder: Update "extra pci root" buses bootorder format to match qemu
|
|
|
e752ca |
Bugzilla: 1242968
|
|
|
e752ca |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
e752ca |
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
e752ca |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
e752ca |
|
|
|
e752ca |
From: Kevin O'Connor <kevin@koconnor.net>
|
|
|
e752ca |
|
|
|
e752ca |
The QEMU code will use the prefix "/pci@i0cf8,%x/" for devices on
|
|
|
e752ca |
extra pci root buses, so change the SeaBIOS code to match that.
|
|
|
e752ca |
|
|
|
e752ca |
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
|
|
|
e752ca |
(cherry picked from commit 1202f03583f3b8b46e2de6b82630054d53e24801)
|
|
|
e752ca |
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
|
|
|
e752ca |
Signed-off-by: ymankad <ymankad@redhat.com>
|
|
|
e752ca |
---
|
|
|
e752ca |
src/boot.c | 4 ++--
|
|
|
e752ca |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
e752ca |
|
|
|
e752ca |
diff --git a/src/boot.c b/src/boot.c
|
|
|
e752ca |
index a719349..05cb3e4 100644
|
|
|
e752ca |
--- a/src/boot.c
|
|
|
e752ca |
+++ b/src/boot.c
|
|
|
e752ca |
@@ -111,9 +111,9 @@ build_pci_path(char *buf, int max, const char *devname, struct pci_device *pci)
|
|
|
e752ca |
if (pci->parent) {
|
|
|
e752ca |
p = build_pci_path(p, max, "pci-bridge", pci->parent);
|
|
|
e752ca |
} else {
|
|
|
e752ca |
- if (pci->rootbus)
|
|
|
e752ca |
- p += snprintf(p, max, "/pci-root@%x", pci->rootbus);
|
|
|
e752ca |
p += snprintf(p, buf+max-p, "%s", FW_PCI_DOMAIN);
|
|
|
e752ca |
+ if (pci->rootbus)
|
|
|
e752ca |
+ p += snprintf(p, buf+max-p, ",%x", pci->rootbus);
|
|
|
e752ca |
}
|
|
|
e752ca |
|
|
|
e752ca |
int dev = pci_bdf_to_dev(pci->bdf), fn = pci_bdf_to_fn(pci->bdf);
|
|
|
e752ca |
--
|
|
|
e752ca |
2.4.0
|
|
|
e752ca |
|