path: root/target-ppc/machine.c
diff options
authorMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>2015-02-09 22:40:48 +0000
committerAlexander Graf <agraf@suse.de>2015-03-09 15:00:05 +0100
commit2360b6e84f78d41fa0f76555a947148b73645259 (patch)
treea167c1686e2ded9bb4c3f76e8c971453e8c1d57e /target-ppc/machine.c
parent2828c4cd92b1c0590b959ec022888b1f6909949a (diff)
target-ppc: force update of msr bits in cpu_post_load
Since env->msr has already been restored by the time cpu_post_load is called, make sure that ppc_store_msr() is explicitly called with all msr bits except MSR_TGPR marked as invalid. This solves the issue where MSR flags aren't set correctly when restoring a VM snapshot, in particular the internal env->excp_prefix value when MSR_EP has been altered by a guest. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'target-ppc/machine.c')
1 files changed, 7 insertions, 1 deletions
diff --git a/target-ppc/machine.c b/target-ppc/machine.c
index c801b822c9..3921012063 100644
--- a/target-ppc/machine.c
+++ b/target-ppc/machine.c
@@ -159,6 +159,7 @@ static int cpu_post_load(void *opaque, int version_id)
PowerPCCPU *cpu = opaque;
CPUPPCState *env = &cpu->env;
int i;
+ target_ulong msr;
* We always ignore the source PVR. The user or management
@@ -190,7 +191,12 @@ static int cpu_post_load(void *opaque, int version_id)
/* Restore htab_base and htab_mask variables */
ppc_store_sdr1(env, env->spr[SPR_SDR1]);
- hreg_compute_hflags(env);
+ /* Mark msr bits except MSR_TGPR invalid before restoring */
+ msr = env->msr;
+ env->msr ^= ~(1ULL << MSR_TGPR);
+ ppc_store_msr(env, msr);
return 0;