Commit 1b84292b authored by Xiaoyao Li's avatar Xiaoyao Li Committed by Paolo Bonzini
Browse files

KVM: VMX: Rename {vmx,nested_vmx}_vcpu_setup() 



Rename {vmx,nested_vmx}_vcpu_setup() to match what they really do.

Signed-off-by: default avatarXiaoyao Li <xiaoyao.li@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4be53410

arch/x86/kvm/vmx/nested.c

+1 −1
Original line number Diff line number Diff line
@@ -5768,7 +5768,7 @@ static int vmx_set_nested_state(struct kvm_vcpu *vcpu, 
	return ret;

}



void nested_vmx_vcpu_setup(void)

void nested_vmx_set_vmcs_shadowing_bitmap(void)

{

	if (enable_shadow_vmcs) {

		vmcs_write64(VMREAD_BITMAP, __pa(vmx_vmread_bitmap));

arch/x86/kvm/vmx/nested.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ void nested_vmx_setup_ctls_msrs(struct nested_vmx_msrs *msrs, u32 ept_caps, 
				bool apicv);

void nested_vmx_hardware_unsetup(void);

__init int nested_vmx_hardware_setup(int (*exit_handlers[])(struct kvm_vcpu *));

void nested_vmx_vcpu_setup(void);

void nested_vmx_set_vmcs_shadowing_bitmap(void);

void nested_vmx_free_vcpu(struct kvm_vcpu *vcpu);

int nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, bool from_vmentry);

bool nested_vmx_exit_reflected(struct kvm_vcpu *vcpu, u32 exit_reason);

arch/x86/kvm/vmx/vmx.c

+5 −4
Original line number Diff line number Diff line
@@ -4162,12 +4162,13 @@ static void ept_set_mmio_spte_mask(void) 
#define VMX_XSS_EXIT_BITMAP 0



/*

 * Sets up the vmcs for emulated real mode.

 * Noting that the initialization of Guest-state Area of VMCS is in

 * vmx_vcpu_reset().

 */

static void vmx_vcpu_setup(struct vcpu_vmx *vmx)

static void init_vmcs(struct vcpu_vmx *vmx)

{

	if (nested)

		nested_vmx_vcpu_setup();

		nested_vmx_set_vmcs_shadowing_bitmap();



	if (cpu_has_vmx_msr_bitmap())

		vmcs_write64(MSR_BITMAP, __pa(vmx->vmcs01.msr_bitmap));
@@ -6774,7 +6775,7 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id) 
	cpu = get_cpu();

	vmx_vcpu_load(&vmx->vcpu, cpu);

	vmx->vcpu.cpu = cpu;

	vmx_vcpu_setup(vmx);

	init_vmcs(vmx);

	vmx_vcpu_put(&vmx->vcpu);

	put_cpu();

	if (cpu_need_virtualize_apic_accesses(&vmx->vcpu)) {