[PATCH 07/17] Fixup 4GB+ memslot large page alignment

From: Anthony Liguori <aliguori@us.ibm.com>
To: kvm@vger.kernel.org
Cc: Glauber Costa <glommer@gmail.com>,
	Marcelo Tosatti <mtosatti@redhat.com>,
	Avi Kivity <avi@redhat.com>,
	Anthony Liguori <aliguori@us.ibm.com>
Subject: [PATCH 07/17] Fixup 4GB+ memslot large page alignment
Date: Sun, 17 May 2009 10:43:08 -0500	[thread overview]
Message-ID: <1242574999-20887-8-git-send-email-aliguori@us.ibm.com> (raw)
In-Reply-To: <1242574999-20887-1-git-send-email-aliguori@us.ibm.com>

From: Marcelo Tosatti <mtosatti@redhat.com>

Need to align the 4GB+ memslot after we know its address, not before.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/hw/pc.c b/hw/pc.c
index 062c306..d6486a1 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -873,6 +873,7 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
 
     /* above 4giga memory allocation */
     if (above_4g_mem_size > 0) {
+        ram_addr = qemu_ram_alloc(above_4g_mem_size);
         if (hpagesize) {
             if (ram_addr & (hpagesize-1)) {
                 unsigned long aligned_addr;
@@ -881,7 +882,6 @@ static void pc_init1(ram_addr_t ram_size, int vga_ram_size,
                 ram_addr = aligned_addr;
             }
         }
-        ram_addr = qemu_ram_alloc(above_4g_mem_size);
         cpu_register_physical_memory(0x100000000ULL,
                                      above_4g_mem_size,
                                      ram_addr);
-- 
1.6.0.6

