Merge branch 'x86-seves-for-paolo' of https://git.kernel.org/pub/scm/linux/kernel...

diff --cc arch/arm64/kvm/arm.c
Simple merge

diff --cc arch/arm64/kvm/hyp/include/hyp/switch.h
Simple merge

diff --cc arch/x86/kvm/emulate.c
Simple merge

diff --cc arch/x86/kvm/mmu/mmu.c
Simple merge

diff --cc arch/x86/kvm/svm/nested.c
index e90bc43,2803662..598a769
--- 1/arch/x86/kvm/svm/nested.c
--- 2/arch/x86/kvm/svm/nested.c
+++ b/arch/x86/kvm/svm/nested.c
@@@ -1128,18 -1139,21 +1141,24 @@@ static int svm_set_nested_state(struct 
         * contains saved L1 state.
         */
        copy_vmcb_control_area(&hsave->control, &svm->vmcb->control);
-       hsave->save = save;
+       hsave->save = *save;
  
        svm->nested.vmcb = kvm_state->hdr.svm.vmcb_pa;
-       load_nested_vmcb_control(svm, &ctl);
+       load_nested_vmcb_control(svm, ctl);
        nested_prepare_vmcb_control(svm);
  
 +      if (!nested_svm_vmrun_msrpm(svm))
 +              return -EINVAL;
 +
  out_set_gif:
        svm_set_gif(svm, !!(kvm_state->flags & KVM_STATE_NESTED_GIF_SET));
-       return 0;
+ 
+       ret = 0;
+ out_free:
+       kfree(save);
+       kfree(ctl);
+ 
+       return ret;
  }
  
  struct kvm_x86_nested_ops svm_nested_ops = {

diff --cc arch/x86/kvm/svm/svm.c
Simple merge

diff --cc arch/x86/kvm/vmx/vmx.c
Simple merge

diff --cc arch/x86/kvm/x86.c
Simple merge