spapr: Enable use of huge pages

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 <aik@ozlabs.ru>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Alexey Kardashevskiy 2014-07-11 01:03:42 +10:00 committed by Alexander Graf
parent 658fa66b81
commit f92f5da108

View File

@ -1335,14 +1335,9 @@ static void ppc_spapr_init(MachineState *machine)
/* allocate RAM */ /* allocate RAM */
spapr->ram_limit = ram_size; spapr->ram_limit = ram_size;
if (spapr->ram_limit > rma_alloc_size) { memory_region_allocate_system_memory(ram, NULL, "ppc_spapr.ram",
ram_addr_t nonrma_base = rma_alloc_size; spapr->ram_limit);
ram_addr_t nonrma_size = spapr->ram_limit - rma_alloc_size; memory_region_add_subregion(sysmem, 0, ram);
memory_region_init_ram(ram, NULL, "ppc_spapr.ram", nonrma_size);
vmstate_register_ram_global(ram);
memory_region_add_subregion(sysmem, nonrma_base, ram);
}
if (rma_alloc_size && rma) { if (rma_alloc_size && rma) {
rma_region = g_new(MemoryRegion, 1); rma_region = g_new(MemoryRegion, 1);