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

calmisi · bonzini · commit 7c1b761be029 · 2020-07-09T07:08:18.000-04:00
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: Xiaoyao Li &lt;xiaoyao.li@intel.com&gt;
Message-Id: &lt;20200709043426.92712-5-xiaoyao.li@intel.com&gt;
Signed-off-by: Paolo Bonzini &lt;pbonzini@redhat.com&gt;
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
@@ -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);
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
@@ -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:
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
@@ -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,
 
diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
@@ -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,
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
@@ -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,
 

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu,`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`cpuid_fix_nx_cap(vcpu);`
`231`		`- kvm_x86_ops.cpuid_update(vcpu);`
	`231`	`+ kvm_x86_ops.vcpu_after_set_cpuid(vcpu);`
`232`	`232`	`kvm_update_cpuid_runtime(vcpu);`
`233`	`233`	`kvm_vcpu_after_set_cpuid(vcpu);`
`234`	`234`
`@@ -257,7 +257,7 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,`
`257`	`257`	`goto out;`
`258`	`258`	`}`
`259`	`259`
`260`		`- kvm_x86_ops.cpuid_update(vcpu);`
	`260`	`+ kvm_x86_ops.vcpu_after_set_cpuid(vcpu);`
`261`	`261`	`kvm_update_cpuid_runtime(vcpu);`
`262`	`262`	`kvm_vcpu_after_set_cpuid(vcpu);`
`263`	`263`	`out:`
Original file line number	Diff line number	Diff line change
`@@ -3550,7 +3550,7 @@ static u64 svm_get_mt_mask(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio)`
`3550`	`3550`	`return 0;`
`3551`	`3551`	`}`
`3552`	`3552`
`3553`		`-static void svm_cpuid_update(struct kvm_vcpu *vcpu)`
	`3553`	`+static void svm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)`
`3554`	`3554`	`{`
`3555`	`3555`	`struct vcpu_svm *svm = to_svm(vcpu);`
`3556`	`3556`
`@@ -4050,7 +4050,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = {`
`4050`	`4050`
`4051`	`4051`	`.get_exit_info = svm_get_exit_info,`
`4052`	`4052`
`4053`		`- .cpuid_update = svm_cpuid_update,`
	`4053`	`+ .vcpu_after_set_cpuid = svm_vcpu_after_set_cpuid,`
`4054`	`4054`
`4055`	`4055`	`.has_wbinvd_exit = svm_has_wbinvd_exit,`
`4056`	`4056`
Original file line number	Diff line number	Diff line change
`@@ -7236,7 +7236,7 @@ static void update_intel_pt_cfg(struct kvm_vcpu *vcpu)`
`7236`	`7236`	`vmx->pt_desc.ctl_bitmask &= ~(0xfULL << (32 + i * 4));`
`7237`	`7237`	`}`
`7238`	`7238`
`7239`		`-static void vmx_cpuid_update(struct kvm_vcpu *vcpu)`
	`7239`	`+static void vmx_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)`
`7240`	`7240`	`{`
`7241`	`7241`	`struct vcpu_vmx *vmx = to_vmx(vcpu);`
`7242`	`7242`
`@@ -7894,7 +7894,7 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = {`
`7894`	`7894`
`7895`	`7895`	`.get_exit_info = vmx_get_exit_info,`
`7896`	`7896`
`7897`		`- .cpuid_update = vmx_cpuid_update,`
	`7897`	`+ .vcpu_after_set_cpuid = vmx_vcpu_after_set_cpuid,`
`7898`	`7898`
`7899`	`7899`	`.has_wbinvd_exit = cpu_has_vmx_wbinvd_exit,`
`7900`	`7900`