From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40865) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5FtI-0005M3-6O for qemu-devel@nongnu.org; Thu, 10 Jul 2014 11:04:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X5Ft8-0004eJ-L8 for qemu-devel@nongnu.org; Thu, 10 Jul 2014 11:04:08 -0400 Received: from e23smtp07.au.ibm.com ([202.81.31.140]:52085) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5Ft7-0004d1-SM for qemu-devel@nongnu.org; Thu, 10 Jul 2014 11:03:58 -0400 Received: from /spool/local by e23smtp07.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 11 Jul 2014 01:03:50 +1000 From: Alexey Kardashevskiy Date: Fri, 11 Jul 2014 01:03:42 +1000 Message-Id: <1405004622-12304-3-git-send-email-aik@ozlabs.ru> In-Reply-To: <1405004622-12304-1-git-send-email-aik@ozlabs.ru> References: <1405004622-12304-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH v3 2/2] spapr: Enable use of huge pages List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , Paolo Bonzini , qemu-ppc@nongnu.org, Alexander Graf 0b183fc87 "memory: move mem_path handling to memory_region_allocate_system_memory" disabled -mempath use for all machines that do not use memory_region_allocate_system_memory() to register RAM. Since SPAPR uses memory_region_init_ram(), the huge pages support was disabled for it. This replaces memory_region_init_ram()+vmstate_register_ram_global() with memory_region_allocate_system_memory() to get huge pages back. This changes RAM size from (ram_limit - rma_alloc_size) to ram_limit as the previous patch moved RMA memory region allocation after RAM allocation and therefore this change does not have immediate effect but simplifies the code. Signed-off-by: Alexey Kardashevskiy --- hw/ppc/spapr.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index e182bd5..6b48a26 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1372,14 +1372,9 @@ static void ppc_spapr_init(MachineState *machine) /* allocate RAM */ spapr->ram_limit = ram_size; - if (spapr->ram_limit > rma_alloc_size) { - ram_addr_t nonrma_base = rma_alloc_size; - ram_addr_t nonrma_size = spapr->ram_limit - rma_alloc_size; - - memory_region_init_ram(ram, NULL, "ppc_spapr.ram", nonrma_size); - vmstate_register_ram_global(ram); - memory_region_add_subregion(sysmem, nonrma_base, ram); - } + memory_region_allocate_system_memory(ram, NULL, "ppc_spapr.ram", + spapr->ram_limit); + memory_region_add_subregion(sysmem, 0, ram); if (rma_alloc_size && rma) { rma_region = g_new(MemoryRegion, 1); -- 2.0.0