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

spapr: Add a helper for node0_size calculation 

In multiple places there is a node0_size variable calculation
which assumes that NUMA node #0 and memory node #0 are the same
things which they are not. Since we are going to change it and
do not want to change it in multiple places, let's make a helper.

This adds a spapr_node0_size() helper and makes use of it.

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-03 13:10:06 +10:00 committed by Alexander Graf
parent 6010818c30
commit b082d65a30
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/ppc/spapr.c
View File

@ -283,6 +283,19 @@ static size_t create_page_sizes_prop(CPUPPCState *env, uint32_t *prop,
return (p - prop) * sizeof(uint32_t); return (p - prop) * sizeof(uint32_t);
} }
static hwaddr spapr_node0_size(void)
{
if (nb_numa_nodes) {
int i;
for (i = 0; i < nb_numa_nodes; ++i) {
if (numa_info[i].node_mem) {
return MIN(pow2floor(numa_info[i].node_mem), ram_size);
}
}
}
return ram_size;
}
#define _FDT(exp) \ #define _FDT(exp) \
do { \ do { \
int ret = (exp); \ int ret = (exp); \
@ -833,9 +846,8 @@ static void spapr_reset_htab(sPAPREnvironment *spapr)
/* Update the RMA size if necessary */ /* Update the RMA size if necessary */
if (spapr->vrma_adjust) { if (spapr->vrma_adjust) {
hwaddr node0_size = (nb_numa_nodes > 1) ? spapr->rma_size = kvmppc_rma_size(spapr_node0_size(),
numa_info[0].node_mem : ram_size; spapr->htab_shift);
spapr->rma_size = kvmppc_rma_size(node0_size, spapr->htab_shift);
} }
} }
@ -1268,7 +1280,7 @@ static void ppc_spapr_init(MachineState *machine)
MemoryRegion *rma_region; MemoryRegion *rma_region;
void *rma = NULL; void *rma = NULL;
hwaddr rma_alloc_size; hwaddr rma_alloc_size;
hwaddr node0_size = (nb_numa_nodes > 1) ? numa_info[0].node_mem : ram_size; hwaddr node0_size = spapr_node0_size();
uint32_t initrd_base = 0; uint32_t initrd_base = 0;
long kernel_size = 0, initrd_size = 0; long kernel_size = 0, initrd_size = 0;
long load_limit, rtas_limit, fw_size; long load_limit, rtas_limit, fw_size;