On Fri, Jan 08, 2016 at 01:25:32PM +1100, Alexey Kardashevskiy wrote: > On 01/07/2016 05:22 AM, Mark Cave-Ayland wrote: > >Otherwise some internal xer variables fail to get set post-migration. > > > >Signed-off-by: Mark Cave-Ayland <mark.cave-ayl...@ilande.co.uk> > >--- > > target-ppc/machine.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > >diff --git a/target-ppc/machine.c b/target-ppc/machine.c > >index 98fc63a..322ce84 100644 > >--- a/target-ppc/machine.c > >+++ b/target-ppc/machine.c > >@@ -168,7 +168,7 @@ static int cpu_post_load(void *opaque, int version_id) > > env->spr[SPR_PVR] = env->spr_cb[SPR_PVR].default_value; > > env->lr = env->spr[SPR_LR]; > > env->ctr = env->spr[SPR_CTR]; > >- env->xer = env->spr[SPR_XER]; > >+ cpu_write_xer(env, env->spr[SPR_XER]); > > #if defined(TARGET_PPC64) > > env->cfar = env->spr[SPR_CFAR]; > > #endif > > > > Reviewed-by: Alexey Kardashevskiy <a...@ozlabs.ru>
I've merged just this patch into ppc-for-2.6. The others in the series have some problems which have been pointed out elsewhere. -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature