Commit 1e24bece authored by Dapeng Mi's avatar Dapeng Mi Committed by Sean Christopherson
Browse files

KVM: x86: Rename vmx_vmentry/vmexit_ctrl() helpers 



Rename the two helpers vmx_vmentry/vmexit_ctrl() to
vmx_get_initial_vmentry/vmexit_ctrl() to represent their real meaning.

No functional change intended.

Suggested-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarDapeng Mi <dapeng1.mi@linux.intel.com>
Signed-off-by: default avatarMingwei Zhang <mizhang@google.com>
Tested-by: default avatarXudong Hao <xudong.hao@intel.com>
Link: https://lore.kernel.org/r/20250806195706.1650976-23-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 51f34b1e

arch/x86/kvm/vmx/vmx.c

+4 −4
Original line number Diff line number Diff line
@@ -4304,7 +4304,7 @@ static u32 vmx_pin_based_exec_ctrl(struct vcpu_vmx *vmx) 
	return pin_based_exec_ctrl;

}



static u32 vmx_vmentry_ctrl(void)

static u32 vmx_get_initial_vmentry_ctrl(void)

{

	u32 vmentry_ctrl = vmcs_config.vmentry_ctrl;
@@ -4321,7 +4321,7 @@ static u32 vmx_vmentry_ctrl(void) 
	return vmentry_ctrl;

}



static u32 vmx_vmexit_ctrl(void)

static u32 vmx_get_initial_vmexit_ctrl(void)

{

	u32 vmexit_ctrl = vmcs_config.vmexit_ctrl;
@@ -4686,10 +4686,10 @@ static void init_vmcs(struct vcpu_vmx *vmx) 
	if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT)

		vmcs_write64(GUEST_IA32_PAT, vmx->vcpu.arch.pat);



	vm_exit_controls_set(vmx, vmx_vmexit_ctrl());

	vm_exit_controls_set(vmx, vmx_get_initial_vmexit_ctrl());



	/* 22.2.1, 20.8.1 */

	vm_entry_controls_set(vmx, vmx_vmentry_ctrl());

	vm_entry_controls_set(vmx, vmx_get_initial_vmentry_ctrl());



	vmx->vcpu.arch.cr0_guest_owned_bits = vmx_l1_guest_owned_cr0_bits();

	vmcs_writel(CR0_GUEST_HOST_MASK, ~vmx->vcpu.arch.cr0_guest_owned_bits);