From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 19 Mar 2025 13:23:24 +0000 (-0400)
Subject: Merge branch 'kvm-pre-tdx' into HEAD
X-Git-Tag: v6.15-rc1~195^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=782f9feaa9517caf33186dcdd6b50a8f770ed29b;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'kvm-pre-tdx' into HEAD

- Add common secure TSC infrastructure for use within SNP and in the
  future TDX

- Block KVM_CAP_SYNC_REGS if guest state is protected.  It does not make
  sense to use the capability if the relevant registers are not
  available for reading or writing.
---

782f9feaa9517caf33186dcdd6b50a8f770ed29b
diff --cc arch/x86/kvm/x86.c
index 068fce7e91e5c,eceb97734646c..c841817a914a3
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@@ -12873,8 -12892,8 +12887,7 @@@ void kvm_arch_destroy_vm(struct kvm *kv
  		__x86_set_memory_region(kvm, TSS_PRIVATE_MEMSLOT, 0, 0);
  		mutex_unlock(&kvm->slots_lock);
  	}
 -	kvm_unload_vcpu_mmus(kvm);
  	kvm_destroy_vcpus(kvm);
- 	kvm_x86_call(vm_destroy)(kvm);
  	kvm_free_msr_filter(srcu_dereference_check(kvm->arch.msr_filter, &kvm->srcu, 1));
  	kvm_pic_destroy(kvm);
  	kvm_ioapic_destroy(kvm);