Commit 69b31b90 authored by Alexey Kardashevskiy's avatar Alexey Kardashevskiy Committed by Alexander Graf
Browse files

PPC: KVM: store SLB slot number 



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: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 66c3e328

target-ppc/kvm.c

+3 −0
Original line number Diff line number Diff line
@@ -820,6 +820,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