From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 10 May 2024 14:49:02 +0000 (-0400)
Subject: Merge tag 'loongarch-kvm-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/chenh... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4232da23d75d173195c6766729e51947b64f83cd;p=linux.git

Merge tag 'loongarch-kvm-6.10' of git://git./linux/kernel/git/chenhuacai/linux-loongson into HEAD

LoongArch KVM changes for v6.10

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

4232da23d75d173195c6766729e51947b64f83cd
diff --cc arch/x86/kvm/svm/svm.c
index 535018f152a3a,9aaf83c8d57df..c8dc25886c165
--- a/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);