e500: Replace open-coded loop with qemu_get_cpu()
Since we still need env for ppc-specific fields, obtain it via the new env_ptr fields to avoid "cpu" name conflicts between CPUState and PowerPCCPU for now. This fixes a potential issue with env being NULL at the end of the loop but cpu still being a valid pointer corresponding to a previous env. Acked-by: Alexander Graf <agraf@suse.de> Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
c05efcb18e
commit
440c8152bd
|
@ -240,20 +240,15 @@ static int ppce500_load_device_tree(CPUPPCState *env,
|
||||||
/* We need to generate the cpu nodes in reverse order, so Linux can pick
|
/* We need to generate the cpu nodes in reverse order, so Linux can pick
|
||||||
the first node as boot node and be happy */
|
the first node as boot node and be happy */
|
||||||
for (i = smp_cpus - 1; i >= 0; i--) {
|
for (i = smp_cpus - 1; i >= 0; i--) {
|
||||||
CPUState *cpu = NULL;
|
CPUState *cpu;
|
||||||
char cpu_name[128];
|
char cpu_name[128];
|
||||||
uint64_t cpu_release_addr = MPC8544_SPIN_BASE + (i * 0x20);
|
uint64_t cpu_release_addr = MPC8544_SPIN_BASE + (i * 0x20);
|
||||||
|
|
||||||
for (env = first_cpu; env != NULL; env = env->next_cpu) {
|
cpu = qemu_get_cpu(i);
|
||||||
cpu = ENV_GET_CPU(env);
|
|
||||||
if (cpu->cpu_index == i) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cpu == NULL) {
|
if (cpu == NULL) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
env = cpu->env_ptr;
|
||||||
|
|
||||||
snprintf(cpu_name, sizeof(cpu_name), "/cpus/PowerPC,8544@%x",
|
snprintf(cpu_name, sizeof(cpu_name), "/cpus/PowerPC,8544@%x",
|
||||||
cpu->cpu_index);
|
cpu->cpu_index);
|
||||||
|
|
Loading…
Reference in a new issue