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

Commit 9c33ae0c authored by Alex Williamson's avatar Alex Williamson Committed by Paolo Bonzini
Browse files

KVM: MTRR: Use default type for non-MTRR-covered gfn before WARN_ON 

The patch was munged on commit to re-order these tests resulting in
excessive warnings when trying to do device assignment.  Return to
original ordering: https://lkml.org/lkml/2015/7/15/769



Fixes: 3e5d2fdc ("KVM: MTRR: simplify kvm_mtrr_get_guest_memory_type")
Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Reviewed-by: default avatarXiao Guangrong <guangrong.xiao@linux.intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 71ba994c

arch/x86/kvm/mtrr.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -672,16 +672,16 @@ u8 kvm_mtrr_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn) 
	if (iter.mtrr_disabled)

	if (iter.mtrr_disabled)

		return mtrr_disabled_type();

		return mtrr_disabled_type();





	/* not contained in any MTRRs. */

	if (type == -1)

		return mtrr_default_type(mtrr_state);



	/*

	/*

	 * We just check one page, partially covered by MTRRs is

	 * We just check one page, partially covered by MTRRs is

	 * impossible.

	 * impossible.

	 */

	 */

	WARN_ON(iter.partial_map);

	WARN_ON(iter.partial_map);





	/* not contained in any MTRRs. */

	if (type == -1)

		return mtrr_default_type(mtrr_state);



	return type;

	return type;

}

}

EXPORT_SYMBOL_GPL(kvm_mtrr_get_guest_memory_type);

EXPORT_SYMBOL_GPL(kvm_mtrr_get_guest_memory_type);