Merge tag 'loongarch-kvm-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/chenh...

LoongArch KVM changes for v6.10

1. Add ParaVirt IPI support.
2. Add software breakpoint support.
3. Add mmio trace events support.

diff --cc arch/loongarch/include/asm/kvm_host.h
Simple merge

diff --cc arch/x86/include/asm/kvm_host.h
Simple merge

diff --cc arch/x86/kvm/Makefile
Simple merge

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

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

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

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

diff --cc arch/x86/kvm/svm/svm.c
index 535018f152a3a5260ebf1194eaaec6c27b5bb26d,9aaf83c8d57df7d3877484a87060769956dbb9cb..c8dc25886c16581c2e89e94b685fa6c95ad4fc7a
--- 1/arch/x86/kvm/svm/svm.c
--- 2/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@@ -1511,12 -1524,8 +1516,8 @@@ static void svm_prepare_switch_to_guest
         * or subsequent vmload of host save area.
         */
        vmsave(sd->save_area_pa);
-       if (sev_es_guest(vcpu->kvm)) {
-               struct sev_es_save_area *hostsa;
-               hostsa = (struct sev_es_save_area *)(page_address(sd->save_area) + 0x400);
- 
-               sev_es_prepare_switch_to_guest(svm, hostsa);
-       }
+       if (sev_es_guest(vcpu->kvm))
 -              sev_es_prepare_switch_to_guest(sev_es_host_save_area(sd));
++              sev_es_prepare_switch_to_guest(svm, sev_es_host_save_area(sd));
  
        if (tsc_scaling)
                __svm_write_tsc_multiplier(vcpu->arch.tsc_scaling_ratio);

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

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

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

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

diff --cc tools/testing/selftests/kvm/set_memory_region_test.c
Simple merge

diff --cc virt/kvm/kvm_main.c
Simple merge