commit 034ce4b831a846130981229a7f5285b2d4c3377d
author Anthony Liguori <aliguori@us.ibm.com> Fri Dec 18 12:16:01 2009 +0100
committer Anthony Liguori <aliguori@us.ibm.com> Fri Dec 18 09:37:56 2009 -0600
tree 70b41613d9af6c785930db8a594ca9f8d6d678e6
parent dfefeb543866eb74e0668fdec1fe496bb9ffb860

Do not guard qemu shadow ram work around in CONFIG_OPTIONROMS_DEPLOYED

As we are going to disable CONFIG_OPTIONROMS_DEPLOYED under QEMU so that we can
make proper use of DDIM.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

src/shadow.c

diff --git a/src/shadow.c b/src/shadow.c
index f0f97c5..3f443ed 100644
--- a/src/shadow.c
+++ b/src/shadow.c
@@ -29,18 +29,14 @@
     int clear = 0;
     int i;
     for (i=0; i<6; i++) {
-        if (CONFIG_OPTIONROMS_DEPLOYED) {
-            int reg = pci_config_readb(bdf, 0x5a + i);
-            if ((reg & 0x11) != 0x11) {
-                // Need to copy optionroms to work around qemu implementation
-                void *mem = (void*)(BUILD_ROM_START + i * 32*1024);
-                memcpy((void*)BUILD_BIOS_TMP_ADDR, mem, 32*1024);
-                pci_config_writeb(bdf, 0x5a + i, 0x33);
-                memcpy(mem, (void*)BUILD_BIOS_TMP_ADDR, 32*1024);
-                clear = 1;
-            } else {
-                pci_config_writeb(bdf, 0x5a + i, 0x33);
-            }
+        int reg = pci_config_readb(bdf, 0x5a + i);
+        if ((reg & 0x11) != 0x11) {
+            // Need to copy optionroms to work around qemu implementation
+            void *mem = (void*)(BUILD_ROM_START + i * 32*1024);
+            memcpy((void*)BUILD_BIOS_TMP_ADDR, mem, 32*1024);
+            pci_config_writeb(bdf, 0x5a + i, 0x33);
+            memcpy(mem, (void*)BUILD_BIOS_TMP_ADDR, 32*1024);
+            clear = 1;
         } else {
             pci_config_writeb(bdf, 0x5a + i, 0x33);
         }