From 9327fd1195b77e67b86db8c1c1c4c4f7db009b00 Mon Sep 17 00:00:00 2001 From: Amit Shah Date: Thu, 15 Nov 2007 18:38:46 +0200 Subject: [PATCH] KVM: Make unloading of FPU state when putting vcpu arch-independent Instead of having each architecture do it individually, we do this in the arch-independent code (just x86 as of now). [avi: add svm to the mix, which was added to mainline during the 2.6.24-rc process] Signed-off-by: Amit Shah Signed-off-by: Avi Kivity --- drivers/kvm/svm.c | 1 - drivers/kvm/vmx.c | 1 - drivers/kvm/x86.c | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c index 0d32304944fc..fb3721d88dbf 100644 --- a/drivers/kvm/svm.c +++ b/drivers/kvm/svm.c @@ -659,7 +659,6 @@ static void svm_vcpu_put(struct kvm_vcpu *vcpu) wrmsrl(host_save_user_msrs[i], svm->host_user_msrs[i]); rdtscll(vcpu->host_tsc); - kvm_put_guest_fpu(vcpu); } static void svm_vcpu_decache(struct kvm_vcpu *vcpu) diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index 7130f315afdf..0c082faaa6db 100644 --- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c @@ -541,7 +541,6 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) static void vmx_vcpu_put(struct kvm_vcpu *vcpu) { vmx_load_host_state(to_vmx(vcpu)); - kvm_put_guest_fpu(vcpu); } static void vmx_fpu_activate(struct kvm_vcpu *vcpu) diff --git a/drivers/kvm/x86.c b/drivers/kvm/x86.c index fdc7632d7620..9618fcba887e 100644 --- a/drivers/kvm/x86.c +++ b/drivers/kvm/x86.c @@ -678,6 +678,7 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) { kvm_x86_ops->vcpu_put(vcpu); + kvm_put_guest_fpu(vcpu); } static void cpuid_fix_nx_cap(struct kvm_vcpu *vcpu) -- 2.30.2