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

Commit 74fec5b9 authored by Tianyu Lan's avatar Tianyu Lan Committed by Paolo Bonzini
Browse files

KVM/x86: Move X86_CR4_OSXSAVE check into kvm_valid_sregs() 



X86_CR4_OSXSAVE check belongs to sregs check and so move into
kvm_valid_sregs().

Signed-off-by: default avatarLan Tianyu <Tianyu.Lan@microsoft.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ee6268ba

arch/x86/kvm/x86.c

+4 −4
Original line number Diff line number Diff line
@@ -8049,6 +8049,10 @@ EXPORT_SYMBOL_GPL(kvm_task_switch); 


static int kvm_valid_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs)

{

	if (!guest_cpuid_has(vcpu, X86_FEATURE_XSAVE) &&

			(sregs->cr4 & X86_CR4_OSXSAVE))

		return  -EINVAL;



	if ((sregs->efer & EFER_LME) && (sregs->cr0 & X86_CR0_PG)) {

		/*

		 * When EFER.LME and CR0.PG are set, the processor is in
@@ -8079,10 +8083,6 @@ static int __set_sregs(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs) 
	struct desc_ptr dt;

	int ret = -EINVAL;



	if (!guest_cpuid_has(vcpu, X86_FEATURE_XSAVE) &&

			(sregs->cr4 & X86_CR4_OSXSAVE))

		goto out;



	if (kvm_valid_sregs(vcpu, sregs))

		goto out;