Commit 7cfe0526 authored by Aaron Lewis's avatar Aaron Lewis Committed by Paolo Bonzini
Browse files

kvm: vmx: Rename NR_AUTOLOAD_MSRS to NR_LOADSTORE_MSRS 



Rename NR_AUTOLOAD_MSRS to NR_LOADSTORE_MSRS.  This needs to be done
due to the addition of the MSR-autostore area that will be added in a
future patch.  After that the name AUTOLOAD will no longer make sense.

Reviewed-by: default avatarJim Mattson <jmattson@google.com>
Signed-off-by: default avatarAaron Lewis <aaronlewis@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 365d3d55

arch/x86/kvm/vmx/vmx.c

+2 −2
Original line number Diff line number Diff line
@@ -938,8 +938,8 @@ static void add_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr, 
	if (!entry_only)

		j = find_msr(&m->host, msr);



	if ((i < 0 && m->guest.nr == NR_AUTOLOAD_MSRS) ||

		(j < 0 &&  m->host.nr == NR_AUTOLOAD_MSRS)) {

	if ((i < 0 && m->guest.nr == NR_LOADSTORE_MSRS) ||

		(j < 0 &&  m->host.nr == NR_LOADSTORE_MSRS)) {

		printk_once(KERN_WARNING "Not enough msr switch entries. "

				"Can't add msr %x\n", msr);

		return;

arch/x86/kvm/vmx/vmx.h

+2 −2
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ extern u32 get_umwait_control_msr(void); 


#define X2APIC_MSR(r) (APIC_BASE_MSR + ((r) >> 4))



#define NR_AUTOLOAD_MSRS 8

#define NR_LOADSTORE_MSRS 8



struct vmx_msrs {

	unsigned int		nr;

	struct vmx_msr_entry	val[NR_AUTOLOAD_MSRS];

	struct vmx_msr_entry	val[NR_LOADSTORE_MSRS];

};



struct shared_msr_entry {

CRA Git | Maintained and supported by SUSTech CRA and CCSE