diff options
| author | Richard Henderson | 2021-03-15 19:46:02 +0100 |
|---|---|---|
| committer | David Gibson | 2021-05-04 03:41:24 +0200 |
| commit | da77d2b03708c4b2a8cd32f689a6d65af243952d (patch) | |
| tree | f21570e867df85a24c563ff876a8dae7a5ce6233 /target | |
| parent | target/ppc: Properly sync cpu state with new msr in cpu_load_old (diff) | |
| download | qemu-da77d2b03708c4b2a8cd32f689a6d65af243952d.tar.gz qemu-da77d2b03708c4b2a8cd32f689a6d65af243952d.tar.xz qemu-da77d2b03708c4b2a8cd32f689a6d65af243952d.zip | |
target/ppc: Do not call hreg_compute_mem_idx after ppc_store_msr
In ppc_store_msr we call hreg_compute_hflags, which itself
calls hreg_compute_mem_idx. Rely on ppc_store_msr to update
everything required by the msr update.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210315184615.1985590-5-richard.henderson@linaro.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'target')
| -rw-r--r-- | target/ppc/machine.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/target/ppc/machine.c b/target/ppc/machine.c index 87d7bffb86..f6eeda9642 100644 --- a/target/ppc/machine.c +++ b/target/ppc/machine.c @@ -125,9 +125,6 @@ static int cpu_load_old(QEMUFile *f, void *opaque, int version_id) env->msr ^= env->msr_mask & ~((1ULL << MSR_TGPR) | MSR_HVB); ppc_store_msr(env, msr); - /* Recompute mmu indices */ - hreg_compute_mem_idx(env); - return 0; } @@ -418,14 +415,12 @@ static int cpu_post_load(void *opaque, int version_id) /* * Invalidate all supported msr bits except MSR_TGPR/MSR_HVB - * before restoring + * 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); - hreg_compute_mem_idx(env); - return 0; } |