| Message ID | 20230119141946.585610-1-yu.c.zhang@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/2] KVM: nVMX: Remove outdated comments in nested_vmx_setup_ctls_msrs() | expand |
On Thu, 19 Jan 2023 22:19:45 +0800, Yu Zhang wrote: > nested_vmx_setup_ctls_msrs() initializes the vmcs_conf.nested, > which stores the global VMX MSR configurations when nested is > supported, regardless of any particular CPUID settings for one > VM. > > Commit 6defc591846d ("KVM: nVMX: include conditional controls > in /dev/kvm KVM_GET_MSRS") added the some feature flags for > secondary proc-based controls, so that those features can be > available in KVM_GET_MSRS. Yet this commit did not remove the > obsolete comments in nested_vmx_setup_ctls_msrs(). > > [...] Applied to kvm-x86 vmx, thanks! [1/2] KVM: nVMX: Remove outdated comments in nested_vmx_setup_ctls_msrs() https://github.com/kvm-x86/linux/commit/ad36aab37ae4 [2/2] KVM: nVMX: Add helpers to setup VMX control msr configs https://github.com/kvm-x86/linux/commit/f6cde92083de -- https://github.com/kvm-x86/linux/tree/next https://github.com/kvm-x86/linux/tree/fixes
diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index d93c715cda6a..81dfbffae575 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -6863,11 +6863,6 @@ void nested_vmx_setup_ctls_msrs(struct vmcs_config *vmcs_conf, u32 ept_caps) msrs->procbased_ctls_low &= ~(CPU_BASED_CR3_LOAD_EXITING | CPU_BASED_CR3_STORE_EXITING); - /* - * secondary cpu-based controls. Do not include those that - * depend on CPUID bits, they are added later by - * vmx_vcpu_after_set_cpuid. - */ msrs->secondary_ctls_low = 0; msrs->secondary_ctls_high = vmcs_conf->cpu_based_2nd_exec_ctrl;
nested_vmx_setup_ctls_msrs() initializes the vmcs_conf.nested, which stores the global VMX MSR configurations when nested is supported, regardless of any particular CPUID settings for one VM. Commit 6defc591846d ("KVM: nVMX: include conditional controls in /dev/kvm KVM_GET_MSRS") added the some feature flags for secondary proc-based controls, so that those features can be available in KVM_GET_MSRS. Yet this commit did not remove the obsolete comments in nested_vmx_setup_ctls_msrs(). Just fix the comments, and no functional change intended. Fixes: 6defc591846d ("KVM: nVMX: include conditional controls in /dev/kvm KVM_GET_MSRS") Signed-off-by: Yu Zhang <yu.c.zhang@linux.intel.com> --- arch/x86/kvm/vmx/nested.c | 5 ----- 1 file changed, 5 deletions(-)