]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
pc: register e820 entries for ram
authorGerd Hoffmann <kraxel@redhat.com>
Thu, 10 Oct 2013 08:30:27 +0000 (10:30 +0200)
committerGerd Hoffmann <kraxel@redhat.com>
Mon, 4 Nov 2013 11:31:33 +0000 (12:31 +0100)
So RAM shows up in the new etc/e820 fw_cfg file.

Cc: Andrea Arcangeli <aarcange@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
hw/i386/pc.c

index a653ae428481bb30dbc83f1ee213f7e79c58dbc3..12c436e7f1f38c0632ee16bbd8d759be894af7c1 100644 (file)
@@ -1174,13 +1174,7 @@ FWCfgState *pc_memory_init(MemoryRegion *system_memory,
     memory_region_init_alias(ram_below_4g, NULL, "ram-below-4g", ram,
                              0, below_4g_mem_size);
     memory_region_add_subregion(system_memory, 0, ram_below_4g);
-    if (0) {
-        /*
-         * Ideally we should do that too, but that would ruin the e820
-         * reservations added by seabios before initializing fw_cfg.
-         */
-        e820_add_entry(0, below_4g_mem_size, E820_RAM);
-    }
+    e820_add_entry(0, below_4g_mem_size, E820_RAM);
     if (above_4g_mem_size > 0) {
         ram_above_4g = g_malloc(sizeof(*ram_above_4g));
         memory_region_init_alias(ram_above_4g, NULL, "ram-above-4g", ram,