Commit 7c1b761b authored by Xiaoyao Li's avatar Xiaoyao Li Committed by Paolo Bonzini
Browse files

KVM: x86: Rename cpuid_update() callback to vcpu_after_set_cpuid() 



The name of callback cpuid_update() is misleading that it's not about
updating CPUID settings of vcpu but updating the configurations of vcpu
based on the CPUIDs. So rename it to vcpu_after_set_cpuid().

Signed-off-by: default avatarXiaoyao Li <xiaoyao.li@intel.com>
Message-Id: <20200709043426.92712-5-xiaoyao.li@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 346ce359

arch/x86/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -1052,7 +1052,7 @@ struct kvm_x86_ops { 
	void (*hardware_unsetup)(void);

	bool (*cpu_has_accelerated_tpr)(void);

	bool (*has_emulated_msr)(u32 index);

	void (*cpuid_update)(struct kvm_vcpu *vcpu);

	void (*vcpu_after_set_cpuid)(struct kvm_vcpu *vcpu);



	unsigned int vm_size;

	int (*vm_init)(struct kvm *kvm);

arch/x86/kvm/cpuid.c

+2 −2
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu, 
	}



	cpuid_fix_nx_cap(vcpu);

	kvm_x86_ops.cpuid_update(vcpu);

	kvm_x86_ops.vcpu_after_set_cpuid(vcpu);

	kvm_update_cpuid_runtime(vcpu);

	kvm_vcpu_after_set_cpuid(vcpu);
@@ -257,7 +257,7 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu, 
		goto out;

	}



	kvm_x86_ops.cpuid_update(vcpu);

	kvm_x86_ops.vcpu_after_set_cpuid(vcpu);

	kvm_update_cpuid_runtime(vcpu);

	kvm_vcpu_after_set_cpuid(vcpu);

out:

arch/x86/kvm/svm/svm.c

+2 −2
Original line number Diff line number Diff line
@@ -3550,7 +3550,7 @@ static u64 svm_get_mt_mask(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio) 
	return 0;

}



static void svm_cpuid_update(struct kvm_vcpu *vcpu)

static void svm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)

{

	struct vcpu_svm *svm = to_svm(vcpu);
@@ -4050,7 +4050,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { 


	.get_exit_info = svm_get_exit_info,



	.cpuid_update = svm_cpuid_update,

	.vcpu_after_set_cpuid = svm_vcpu_after_set_cpuid,



	.has_wbinvd_exit = svm_has_wbinvd_exit,

arch/x86/kvm/vmx/nested.c

+2 −1
Original line number Diff line number Diff line
@@ -6354,7 +6354,8 @@ void nested_vmx_setup_ctls_msrs(struct nested_vmx_msrs *msrs, u32 ept_caps) 


	/*

	 * secondary cpu-based controls.  Do not include those that

	 * depend on CPUID bits, they are added later by vmx_cpuid_update.

	 * depend on CPUID bits, they are added later by

	 * vmx_vcpu_after_set_cpuid.

	 */

	if (msrs->procbased_ctls_high & CPU_BASED_ACTIVATE_SECONDARY_CONTROLS)

		rdmsr(MSR_IA32_VMX_PROCBASED_CTLS2,

arch/x86/kvm/vmx/vmx.c

+2 −2
Original line number Diff line number Diff line
@@ -7236,7 +7236,7 @@ static void update_intel_pt_cfg(struct kvm_vcpu *vcpu) 
		vmx->pt_desc.ctl_bitmask &= ~(0xfULL << (32 + i * 4));

}



static void vmx_cpuid_update(struct kvm_vcpu *vcpu)

static void vmx_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)

{

	struct vcpu_vmx *vmx = to_vmx(vcpu);
@@ -7894,7 +7894,7 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = { 


	.get_exit_info = vmx_get_exit_info,



	.cpuid_update = vmx_cpuid_update,

	.vcpu_after_set_cpuid = vmx_vcpu_after_set_cpuid,



	.has_wbinvd_exit = cpu_has_vmx_wbinvd_exit,