diff options
Diffstat (limited to 'hw/ppc')
| -rw-r--r-- | hw/ppc/spapr.c | 8 | ||||
| -rw-r--r-- | hw/ppc/spapr_cpu_core.c | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index baedadf20b..d063312a3b 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1752,7 +1752,13 @@ static void spapr_machine_reset(MachineState *machine) spapr_ovec_cleanup(spapr->ov5_cas); spapr->ov5_cas = spapr_ovec_new(); - ppc_set_compat(first_ppc_cpu, spapr->max_compat_pvr, &error_fatal); + /* + * reset compat_pvr for all CPUs + * as qemu_devices_reset() is called before this, + * it can't be propagated by spapr_cpu_reset() + * from the first CPU to all the others + */ + ppc_set_compat_all(spapr->max_compat_pvr, &error_fatal); } /* diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index bf47fbdf6f..45e2f2747f 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -43,6 +43,8 @@ static void spapr_cpu_reset(void *opaque) /* Set compatibility mode to match the boot CPU, which was either set * by the machine reset code or by CAS. This should never fail. + * At startup the value is already set for all the CPUs + * but we need this when we hotplug a new CPU */ ppc_set_compat(cpu, POWERPC_CPU(first_cpu)->compat_pvr, &error_abort); |