diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-12-17 04:22:03 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-01-15 04:09:13 +0100 |
| commit | 1b1ed8dc40635d60dd95c04658989af63542fcbf (patch) | |
| tree | 8e1e93bac615d3dac4a901af9bd7d371982634da /hw/spapr.c | |
| parent | 66afd1ad5a7a25e573577ac45979d8a3213796c3 (diff) | |
| download | qemu-1b1ed8dc40635d60dd95c04658989af63542fcbf.tar.gz | |
cpu: Move numa_node field to CPUState
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/spapr.c')
| -rw-r--r-- | hw/spapr.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/spapr.c b/hw/spapr.c index b5e15b884a..a61c71e931 100644 --- a/hw/spapr.c +++ b/hw/spapr.c @@ -140,6 +140,7 @@ static int spapr_fixup_cpu_dt(void *fdt, sPAPREnvironment *spapr) { int ret = 0, offset; CPUPPCState *env; + CPUState *cpu; char cpu_model[32]; int smt = kvmppc_smt_threads(); uint32_t pft_size_prop[] = {0, cpu_to_be32(spapr->htab_shift)}; @@ -147,11 +148,12 @@ static int spapr_fixup_cpu_dt(void *fdt, sPAPREnvironment *spapr) assert(spapr->cpu_model); for (env = first_cpu; env != NULL; env = env->next_cpu) { + cpu = ENV_GET_CPU(env); uint32_t associativity[] = {cpu_to_be32(0x5), cpu_to_be32(0x0), cpu_to_be32(0x0), cpu_to_be32(0x0), - cpu_to_be32(env->numa_node), + cpu_to_be32(cpu->numa_node), cpu_to_be32(env->cpu_index)}; if ((env->cpu_index % smt) != 0) { |