diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-11-03 12:55:05 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-11-03 12:55:05 +0000 |
| commit | ef84755ebb38b4f5629b24440bb00f1ef5287707 (patch) | |
| tree | c2d74584b5f8c85c4c61ae650e628e08403b69ec /hw/pc_piix.c | |
| parent | b76f0d8c2e3eac94bc7fd90a510cb7426b2a2699 (diff) | |
| parent | 0d3cf3b6ff469bba95ae235021a3be232af4068d (diff) | |
| download | qemu-ef84755ebb38b4f5629b24440bb00f1ef5287707.tar.gz | |
Merge branch 'trivial-patches' of git://github.com/stefanha/qemu
* 'trivial-patches' of git://github.com/stefanha/qemu:
pc: Drop redundant test for ROM memory region
exec: make some functions static
target-ppc: make some functions static
ppc: add missing static
vnc: add missing static
vl.c: add missing static
target-sparc: make do_unaligned_access static
m68k: Return semihosting errno values correctly
cadence_uart: More debug information
Conflicts:
target-m68k/m68k-semi.c
Diffstat (limited to 'hw/pc_piix.c')
| -rw-r--r-- | hw/pc_piix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 85529b2cea..cfa839c8b4 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)); |