[Qemu-devel] [PATCH] pc: Drop redundant test for ROM memory region

[Qemu-devel] [PATCH] pc: Drop redundant test for ROM memory region

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Just a few lines above, we already initialize rom_memory accordingly.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 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 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));
-- 
1.7.3.4

Re: [Qemu-devel] [PATCH] pc: Drop redundant test for ROM memory region

[Stefan Hajnoczi]

On Thu, Nov 01, 2012 at 05:29:24PM +0100, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Just a few lines above, we already initialize rom_memory accordingly.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>  hw/pc_piix.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Thanks, applied to the trivial patches tree:
https://github.com/stefanha/qemu/commits/trivial-patches

Stefan