ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spapr: convert to memory API 

Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2011-10-03 12:56:38 +02:00
parent 25793bfafa
commit 890c2b772d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/spapr.c
View File

@ -41,6 +41,8 @@
#include "kvm.h" #include "kvm.h"
#include "kvm_ppc.h" #include "kvm_ppc.h"
#include "exec-memory.h"
#include <libfdt.h> #include <libfdt.h>
#define KERNEL_LOAD_ADDR 0x00000000 #define KERNEL_LOAD_ADDR 0x00000000
@ -324,7 +326,8 @@ static void ppc_spapr_init(ram_addr_t ram_size,
{ {
CPUState *env; CPUState *env;
int i; int i;
ram_addr_t ram_offset; MemoryRegion *sysmem = get_system_memory();
MemoryRegion *ram = g_new(MemoryRegion, 1);
uint32_t initrd_base; uint32_t initrd_base;
long kernel_size, initrd_size, fw_size; long kernel_size, initrd_size, fw_size;
long pteg_shift = 17; long pteg_shift = 17;
@ -361,8 +364,8 @@ static void ppc_spapr_init(ram_addr_t ram_size,
/* allocate RAM */ /* allocate RAM */
spapr->ram_limit = ram_size; spapr->ram_limit = ram_size;
ram_offset = qemu_ram_alloc(NULL, "ppc_spapr.ram", spapr->ram_limit); memory_region_init_ram(ram, NULL, "ppc_spapr.ram", spapr->ram_limit);
cpu_register_physical_memory(0, ram_size, ram_offset); memory_region_add_subregion(sysmem, 0, ram);
/* allocate hash page table. For now we always make this 16mb, /* allocate hash page table. For now we always make this 16mb,
* later we should probably make it scale to the size of guest * later we should probably make it scale to the size of guest