Commit 70109e7d authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Paolo Bonzini
Browse files

KVM: MTRR: remove mtrr_state.have_fixed 



vMTRR does not depend on any host MTRR feature and fixed MTRRs have always
been implemented, so drop this field

Signed-off-by: default avatarXiao Guangrong <guangrong.xiao@linux.intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent eb839917

arch/x86/include/asm/kvm_host.h

+8 −1
Original line number Diff line number Diff line
@@ -342,6 +342,13 @@ enum { 
	KVM_DEBUGREG_RELOAD = 4,

};



struct kvm_mtrr {

	struct mtrr_var_range var_ranges[MTRR_MAX_VAR_RANGES];

	mtrr_type fixed_ranges[KVM_NR_FIXED_MTRR_REGION];

	unsigned char enabled;

	mtrr_type def_type;

};



struct kvm_vcpu_arch {

	/*

	 * rip and regs accesses must go through
@@ -472,7 +479,7 @@ struct kvm_vcpu_arch { 
	bool nmi_injected;    /* Trying to inject an NMI this entry */

	bool smi_pending;    /* SMI queued after currently running handler */



	struct mtrr_state_type mtrr_state;

	struct kvm_mtrr mtrr_state;

	u64 pat;



	unsigned switch_db_regs;

arch/x86/kvm/mtrr.c

+3 −4
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ EXPORT_SYMBOL_GPL(kvm_mtrr_valid); 


static void update_mtrr(struct kvm_vcpu *vcpu, u32 msr)

{

	struct mtrr_state_type *mtrr_state = &vcpu->arch.mtrr_state;

	struct kvm_mtrr *mtrr_state = &vcpu->arch.mtrr_state;

	unsigned char mtrr_enabled = mtrr_state->enabled;

	gfn_t start, end, mask;

	int index;
@@ -247,7 +247,7 @@ int kvm_mtrr_get_msr(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata) 
 * The function is based on mtrr_type_lookup() in

 * arch/x86/kernel/cpu/mtrr/generic.c

 */

static int get_mtrr_type(struct mtrr_state_type *mtrr_state,

static int get_mtrr_type(struct kvm_mtrr *mtrr_state,

			 u64 start, u64 end)

{

	u64 base, mask;
@@ -262,8 +262,7 @@ static int get_mtrr_type(struct mtrr_state_type *mtrr_state, 
	end--;



	/* Look in fixed ranges. Just return the type as per start */

	if (mtrr_state->have_fixed && (mtrr_state->enabled & 0x1) &&

	      (start < 0x100000)) {

	if ((mtrr_state->enabled & 0x1) && (start < 0x100000)) {

		int idx;



		if (start < 0x80000) {

arch/x86/kvm/x86.c

+0 −1
Original line number Diff line number Diff line
@@ -7379,7 +7379,6 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) 
{

	int r;



	vcpu->arch.mtrr_state.have_fixed = 1;

	r = vcpu_load(vcpu);

	if (r)

		return r;