Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a5fbdc0 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: x86: remove eager_fpu field of struct kvm_vcpu_arch 



It is now equal to use_eager_fpu(), which simply tests a cpufeature bit.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a87036ad

arch/x86/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -503,7 +503,6 @@ struct kvm_vcpu_arch { 
	struct kvm_mmu_memory_cache mmu_page_header_cache;



	struct fpu guest_fpu;

	bool eager_fpu;

	u64 xcr0;

	u64 guest_supported_xcr0;

	u32 guest_xstate_size;

arch/x86/kvm/cpuid.c

+1 −2
Original line number Diff line number Diff line
@@ -104,8 +104,7 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu) 
	if (best && (best->eax & (F(XSAVES) | F(XSAVEC))))

		best->ebx = xstate_required_size(vcpu->arch.xcr0, true);



	vcpu->arch.eager_fpu = use_eager_fpu();

	if (vcpu->arch.eager_fpu)

	if (use_eager_fpu())

		kvm_x86_ops->fpu_activate(vcpu);



	/*

arch/x86/kvm/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -7329,7 +7329,7 @@ void kvm_put_guest_fpu(struct kvm_vcpu *vcpu) 
	 * Every 255 times fpu_counter rolls over to 0; a guest that uses

	 * the FPU in bursts will revert to loading it on demand.

	 */

	if (!vcpu->arch.eager_fpu) {

	if (!use_eager_fpu()) {

		if (++vcpu->fpu_counter < 5)

			kvm_make_request(KVM_REQ_DEACTIVATE_FPU, vcpu);

	}