From 2af8ba1ab23d01006b080e57900325e35f464481 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sun, 29 Jan 2012 12:17:33 -0500 Subject: [PATCH] vgabios: Compare PCI ids against pci rom struct instead of config settings. QEMU can update the pci rom struct - so use that as the location to determine if the pci address passed into the option rom is accurate. Signed-off-by: Kevin O'Connor --- vgasrc/vgabios.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/vgasrc/vgabios.c b/vgasrc/vgabios.c index 2f24e78..e69c6c5 100644 --- a/vgasrc/vgabios.c +++ b/vgasrc/vgabios.c @@ -1279,8 +1279,10 @@ vga_post(struct bregs *regs) if (CONFIG_VGA_PCI) { u16 bdf = regs->ax; - if (pci_config_readw(bdf, PCI_VENDOR_ID) == CONFIG_VGA_VID - && pci_config_readw(bdf, PCI_DEVICE_ID) == CONFIG_VGA_DID) + if ((pci_config_readw(bdf, PCI_VENDOR_ID) + == GET_GLOBAL(rom_pci_data.vendor)) + && (pci_config_readw(bdf, PCI_DEVICE_ID) + == GET_GLOBAL(rom_pci_data.device))) SET_VGA(VgaBDF, bdf); } -- 2.25.1