aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2016-04-15 11:03:00 +0200
committerDavid Gibson <david@gibson.dropbear.id.au>2016-04-18 15:14:38 +1000
commitaa378598fea819b15c00d48048bedfa0dc631132 (patch)
tree22cd9753e38d9fbe3e2691aec88e323b3cee4711
parent537d3e8e6beea9a0fbd6469eb38450e718244dad (diff)
downloadqemu-arm-aa378598fea819b15c00d48048bedfa0dc631132.tar.gz
ppc: Fix migration of the XER register
env->xer only holds the lower bits of the XER register nowadays, the SO, OV and CA bits are stored in separate variables (see the function cpu_write_xer() for details). Since the migration code currently only reads the "xer" variable, the upper bits are lost during migration. Fix it by using cpu_read_xer() instead. Signed-off-by: Thomas Huth <thuth@redhat.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
-rw-r--r--target-ppc/machine.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target-ppc/machine.c b/target-ppc/machine.c
index 692121e983..46684fb933 100644
--- a/target-ppc/machine.c
+++ b/target-ppc/machine.c
@@ -136,7 +136,7 @@ static void cpu_pre_save(void *opaque)
env->spr[SPR_LR] = env->lr;
env->spr[SPR_CTR] = env->ctr;
- env->spr[SPR_XER] = env->xer;
+ env->spr[SPR_XER] = cpu_read_xer(env);
#if defined(TARGET_PPC64)
env->spr[SPR_CFAR] = env->cfar;
#endif