aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2012-11-01 17:29:24 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2012-11-01 19:50:57 +0100
commit0d3cf3b6ff469bba95ae235021a3be232af4068d (patch)
tree0472bef25ef49588fa04f2d6413901d44e0ee1f0 /hw
parent8b9c99d9dcbf532649f8e614becfa15d2ac4ea75 (diff)
downloadqemu-0d3cf3b6ff469bba95ae235021a3be232af4068d.zip
qemu-0d3cf3b6ff469bba95ae235021a3be232af4068d.tar.gz
qemu-0d3cf3b6ff469bba95ae235021a3be232af4068d.tar.bz2
pc: Drop redundant test for ROM memory region
Just a few lines above, we already initialize rom_memory accordingly. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/pc_piix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 85529b2..cfa839c 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -178,7 +178,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));