Skip to content

Commit 1e24bec

Browse files
Dapeng Misean-jc
authored andcommitted
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: Sean Christopherson <seanjc@google.com> Signed-off-by: Dapeng Mi <dapeng1.mi@linux.intel.com> Signed-off-by: Mingwei Zhang <mizhang@google.com> Tested-by: Xudong Hao <xudong.hao@intel.com> Link: https://lore.kernel.org/r/20250806195706.1650976-23-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 51f34b1 commit 1e24bec

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

arch/x86/kvm/vmx/vmx.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4304,7 +4304,7 @@ static u32 vmx_pin_based_exec_ctrl(struct vcpu_vmx *vmx)
43044304
return pin_based_exec_ctrl;
43054305
}
43064306

4307-
static u32 vmx_vmentry_ctrl(void)
4307+
static u32 vmx_get_initial_vmentry_ctrl(void)
43084308
{
43094309
u32 vmentry_ctrl = vmcs_config.vmentry_ctrl;
43104310

@@ -4321,7 +4321,7 @@ static u32 vmx_vmentry_ctrl(void)
43214321
return vmentry_ctrl;
43224322
}
43234323

4324-
static u32 vmx_vmexit_ctrl(void)
4324+
static u32 vmx_get_initial_vmexit_ctrl(void)
43254325
{
43264326
u32 vmexit_ctrl = vmcs_config.vmexit_ctrl;
43274327

@@ -4686,10 +4686,10 @@ static void init_vmcs(struct vcpu_vmx *vmx)
46864686
if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT)
46874687
vmcs_write64(GUEST_IA32_PAT, vmx->vcpu.arch.pat);
46884688

4689-
vm_exit_controls_set(vmx, vmx_vmexit_ctrl());
4689+
vm_exit_controls_set(vmx, vmx_get_initial_vmexit_ctrl());
46904690

46914691
/* 22.2.1, 20.8.1 */
4692-
vm_entry_controls_set(vmx, vmx_vmentry_ctrl());
4692+
vm_entry_controls_set(vmx, vmx_get_initial_vmentry_ctrl());
46934693

46944694
vmx->vcpu.arch.cr0_guest_owned_bits = vmx_l1_guest_owned_cr0_bits();
46954695
vmcs_writel(CR0_GUEST_HOST_MASK, ~vmx->vcpu.arch.cr0_guest_owned_bits);

0 commit comments

Comments
 (0)