On 3/15/21 7:46 PM, Richard Henderson wrote: > Match cpu_post_load in using ppc_store_msr to set all of > the cpu state implied by the value of msr. Do not restore > hflags or hflags_nmsr, as we recompute them in ppc_store_msr. > > Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
Could we add a common routine used by cpu_post_load() and cpu_load_old() ? Reviewed-by: Cédric Le Goater <c...@kaod.org> Thanks, C. > --- > target/ppc/machine.c | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/target/ppc/machine.c b/target/ppc/machine.c > index 283db1d28a..87d7bffb86 100644 > --- a/target/ppc/machine.c > +++ b/target/ppc/machine.c > @@ -21,6 +21,7 @@ static int cpu_load_old(QEMUFile *f, void *opaque, int > version_id) > int32_t slb_nr; > #endif > target_ulong xer; > + target_ulong msr; > > for (i = 0; i < 32; i++) { > qemu_get_betls(f, &env->gpr[i]); > @@ -111,11 +112,19 @@ static int cpu_load_old(QEMUFile *f, void *opaque, int > version_id) > qemu_get_betls(f, &env->ivpr_mask); > qemu_get_betls(f, &env->hreset_vector); > qemu_get_betls(f, &env->nip); > - qemu_get_betls(f, &env->hflags); > - qemu_get_betls(f, &env->hflags_nmsr); > + qemu_get_sbetl(f); /* Discard unused hflags */ > + qemu_get_sbetl(f); /* Discard unused hflags_nmsr */ > qemu_get_sbe32(f); /* Discard unused mmu_idx */ > qemu_get_sbe32(f); /* Discard unused power_mode */ > > + /* > + * Invalidate all supported msr bits except MSR_TGPR/MSR_HVB > + * before restoring. Note that this recomputes hflags and mem_idx. > + */ > + msr = env->msr; > + env->msr ^= env->msr_mask & ~((1ULL << MSR_TGPR) | MSR_HVB); > + ppc_store_msr(env, msr); > + > /* Recompute mmu indices */ > hreg_compute_mem_idx(env); > >