From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44067) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W93mF-0006bS-Hx for qemu-devel@nongnu.org; Thu, 30 Jan 2014 21:24:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W93m7-0006xt-9e for qemu-devel@nongnu.org; Thu, 30 Jan 2014 21:24:19 -0500 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:45472) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W93m6-0006xj-Hp for qemu-devel@nongnu.org; Thu, 30 Jan 2014 21:24:11 -0500 Received: from /spool/local by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 31 Jan 2014 12:24:07 +1000 From: Alexey Kardashevskiy Date: Fri, 31 Jan 2014 13:24:00 +1100 Message-Id: <1391135040-14012-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH] PPC: KVM: store SLB slot number List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , qemu-ppc@nongnu.org, Paul Mackerras , Alexander Graf , "Aneesh Kumar K . V" When ppc_store_slb() is called from kvm_arch_get_registers(), it stores a SLB in CPUPPCState::slb[slot]. However it drops the slot number from ESID so when kvm_arch_put_registers() puts SLBs back to KVM, they do not have correct "index" field anymore. This broke migration with LPCR_AIR enabled as now the guest is handling interrupts in virtual mode and unable to reconstruct correct SLBs anymore. This adds "index" field for valid SLBs when putting them to KVM. Signed-off-by: Alexey Kardashevskiy --- target-ppc/kvm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 26e854a..380f933 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -819,6 +819,9 @@ int kvm_arch_put_registers(CPUState *cs, int level) #ifdef TARGET_PPC64 for (i = 0; i < ARRAY_SIZE(env->slb); i++) { sregs.u.s.ppc64.slb[i].slbe = env->slb[i].esid; + if (env->slb[i].esid & SLB_ESID_V) { + sregs.u.s.ppc64.slb[i].slbe |= i; + } sregs.u.s.ppc64.slb[i].slbv = env->slb[i].vsid; } #endif -- 1.8.4.rc4