rebase patches on top of Ubuntu-5.19.0-16.16

[pve-kernel.git] / patches / kernel / 0017-KVM-x86-SVM-use-smram-structs.patch

diff --git a/patches/kernel/0017-KVM-x86-SVM-use-smram-structs.patch b/patches/kernel/0017-KVM-x86-SVM-use-smram-structs.patch
index 184c4d6b0890350105b78ce124bed061273d751d..f48fe6f731858c1a1244ea75319b35708a5ff630 100644 (file)
--- a/patches/kernel/0017-KVM-x86-SVM-use-smram-structs.patch
+++ b/patches/kernel/0017-KVM-x86-SVM-use-smram-structs.patch
@@ -17,10 +17,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  2 files changed, 6 insertions(+), 21 deletions(-)
 
 diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
-index 65e05d56602f..33c14d167de2 100644
+index 528df4b330ea..75878f2dbb26 100644
 --- a/arch/x86/include/asm/kvm_host.h
 +++ b/arch/x86/include/asm/kvm_host.h
-@@ -2042,12 +2042,6 @@ static inline int kvm_cpu_get_apicid(int mps_cpu)
+@@ -2043,12 +2043,6 @@ static inline int kvm_cpu_get_apicid(int mps_cpu)
  #endif
  }
  
@@ -34,10 +34,10 @@ index 65e05d56602f..33c14d167de2 100644
  
  int memslot_rmap_alloc(struct kvm_memory_slot *slot, unsigned long npages);
 diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
-index 68c9a771b457..23ad430207c5 100644
+index f7f58c4cf341..20f90c596d6a 100644
 --- a/arch/x86/kvm/svm/svm.c
 +++ b/arch/x86/kvm/svm/svm.c
-@@ -4305,15 +4305,11 @@ static int svm_enter_smm(struct kvm_vcpu *vcpu, union kvm_smram *smram)
+@@ -4314,15 +4314,11 @@ static int svm_enter_smm(struct kvm_vcpu *vcpu, union kvm_smram *smram)
        struct kvm_host_map map_save;
        int ret;
  
@@ -55,7 +55,7 @@ index 68c9a771b457..23ad430207c5 100644
  
        svm->vmcb->save.rax = vcpu->arch.regs[VCPU_REGS_RAX];
        svm->vmcb->save.rsp = vcpu->arch.regs[VCPU_REGS_RSP];
-@@ -4352,28 +4348,23 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const union kvm_smram *smram)
+@@ -4361,28 +4357,23 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const union kvm_smram *smram)
  {
        struct vcpu_svm *svm = to_svm(vcpu);
        struct kvm_host_map map, map_save;
@@ -87,7 +87,7 @@ index 68c9a771b457..23ad430207c5 100644
                return 1;
  
        ret = 1;
-@@ -4399,7 +4390,7 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const union kvm_smram *smram)
+@@ -4408,7 +4399,7 @@ static int svm_leave_smm(struct kvm_vcpu *vcpu, const union kvm_smram *smram)
        vmcb12 = map.hva;
        nested_copy_vmcb_control_to_cache(svm, &vmcb12->control);
        nested_copy_vmcb_save_to_cache(svm, &vmcb12->save);