motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 02:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/ppc: Pass cpu instead of env to ppc_create_page_sizes_prop()

Browse source 
As a rule we prefer to pass PowerPCCPU instead of CPUPPCState, and this
change will make some things simpler later on.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
David Gibson 2018-03-22 16:18:40 +11:00
parent 197600ecc4
commit 644a2c99a9
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hw/ppc/fdt.c
View file

@ -13,9 +13,10 @@
#include "hw/ppc/fdt.h" #include "hw/ppc/fdt.h"
#if defined(TARGET_PPC64) #if defined(TARGET_PPC64)
size_t ppc_create_page_sizes_prop(CPUPPCState *env, uint32_t *prop, size_t ppc_create_page_sizes_prop(PowerPCCPU *cpu, uint32_t *prop,
size_t maxsize) size_t maxsize)
{ {
CPUPPCState *env = &cpu->env;
size_t maxcells = maxsize / sizeof(uint32_t); size_t maxcells = maxsize / sizeof(uint32_t);
int i, j, count; int i, j, count;
uint32_t *p = prop; uint32_t *p = prop;

4
hw/ppc/pnv.c
View file

@ -209,8 +209,8 @@ static void pnv_dt_core(PnvChip *chip, PnvCore *pc, void *fdt)
_FDT((fdt_setprop_cell(fdt, offset, "ibm,dfp", 1))); _FDT((fdt_setprop_cell(fdt, offset, "ibm,dfp", 1)));
} }
page_sizes_prop_size = ppc_create_page_sizes_prop(env, page_sizes_prop, page_sizes_prop_size = ppc_create_page_sizes_prop(cpu, page_sizes_prop,
sizeof(page_sizes_prop)); sizeof(page_sizes_prop));
if (page_sizes_prop_size) { if (page_sizes_prop_size) {
_FDT((fdt_setprop(fdt, offset, "ibm,segment-page-sizes", _FDT((fdt_setprop(fdt, offset, "ibm,segment-page-sizes",
page_sizes_prop, page_sizes_prop_size))); page_sizes_prop, page_sizes_prop_size)));

4
hw/ppc/spapr.c
View file

@ -581,8 +581,8 @@ static void spapr_populate_cpu_dt(CPUState *cs, void *fdt, int offset,
_FDT((fdt_setprop_cell(fdt, offset, "ibm,dfp", 1))); _FDT((fdt_setprop_cell(fdt, offset, "ibm,dfp", 1)));
} }
page_sizes_prop_size = ppc_create_page_sizes_prop(env, page_sizes_prop, page_sizes_prop_size = ppc_create_page_sizes_prop(cpu, page_sizes_prop,
sizeof(page_sizes_prop)); sizeof(page_sizes_prop));
if (page_sizes_prop_size) { if (page_sizes_prop_size) {
_FDT((fdt_setprop(fdt, offset, "ibm,segment-page-sizes", _FDT((fdt_setprop(fdt, offset, "ibm,segment-page-sizes",
page_sizes_prop, page_sizes_prop_size))); page_sizes_prop, page_sizes_prop_size)));

2
include/hw/ppc/fdt.h
View file

@ -23,7 +23,7 @@
} \ } \
} while (0) } while (0)
size_t ppc_create_page_sizes_prop(CPUPPCState *env, uint32_t *prop, size_t ppc_create_page_sizes_prop(PowerPCCPU *cpu, uint32_t *prop,
size_t maxsize); size_t maxsize);
#endif /* PPC_FDT_H */ #endif /* PPC_FDT_H */