From: Aneesh Kumar K.V Date: Tue, 1 Oct 2013 16:19:28 +0000 (+0530) Subject: target-ppc: Update slb array with correct index values. X-Git-Tag: v1.7.0-rc0~28^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b4d4a21b988f6d56e0792058aa0b968e19fda6b;p=thirdparty%2Fqemu.git target-ppc: Update slb array with correct index values. Without this, a value of rb=0 and rs=0 results in replacing the 0th index. This can be observed when using gdb remote debugging support. (gdb) x/10i do_fork 0xc000000000085330 : Cannot access memory at address 0xc000000000085330 (gdb) This is because when we do the slb sync via kvm_cpu_synchronize_state, we overwrite the slb entry (0th entry) for 0xc000000000085330 Signed-off-by: Aneesh Kumar K.V Signed-off-by: Alexander Graf --- diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 0b5d391403b..e2f8b0303f8 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -1033,9 +1033,22 @@ int kvm_arch_get_registers(CPUState *cs) /* Sync SLB */ #ifdef TARGET_PPC64 + /* + * The packed SLB array we get from KVM_GET_SREGS only contains + * information about valid entries. So we flush our internal + * copy to get rid of stale ones, then put all valid SLB entries + * back in. + */ + memset(env->slb, 0, sizeof(env->slb)); for (i = 0; i < 64; i++) { - ppc_store_slb(env, sregs.u.s.ppc64.slb[i].slbe, - sregs.u.s.ppc64.slb[i].slbv); + target_ulong rb = sregs.u.s.ppc64.slb[i].slbe; + target_ulong rs = sregs.u.s.ppc64.slb[i].slbv; + /* + * Only restore valid entries + */ + if (rb & SLB_ESID_V) { + ppc_store_slb(env, rb, rs); + } } #endif