Re: [Qemu-devel] [Qemu-ppc] [PATCH] PPC: KVM: store SLB slot number

[Aneesh Kumar K.V]

Alexey Kardashevskiy <address@hidden> writes:

> 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 <address@hidden>

Reviewed-by: Aneesh Kumar K.V <address@hidden>

> ---
>  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