Patchwork [07/27] pc: pc_init1(): always use rom_memory on pc_memory_init() call

login
register
mail settings
Submitter Eduardo Habkost
Date Oct. 24, 2012, 5:49 p.m.
Message ID <1351101001-14589-8-git-send-email-ehabkost@redhat.com>
Download mbox | patch
Permalink /patch/193890/
State New
Headers show

Comments

Eduardo Habkost - Oct. 24, 2012, 5:49 p.m.
When pci_enabled is false, rom_memory is already pointing to
system_memory, so there's no need to check pci_enabled again when
calling pc_memory_init().

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 hw/pc_piix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 47ebc1a..3c4ce8f 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -177,7 +177,7 @@  static void pc_init1(MemoryRegion *system_memory,
         fw_cfg = pc_memory_init(system_memory,
                        kernel_filename, kernel_cmdline, initrd_filename,
                        below_4g_mem_size, above_4g_mem_size,
-                       pci_enabled ? rom_memory : system_memory, &ram_memory);
+                       rom_memory, &ram_memory);
     }
 
     gsi_state = g_malloc0(sizeof(*gsi_state));