[PATCH v2 16/25] KVM: VMX: Invoke vmx_set_cpu_caps() before nested setup

[Xin Li]

Set VMX CPU capabilities before initializing nested instead of after,
as it needs to check VMX CPU capabilities to setup the VMX basic MSR
for nested.

Signed-off-by: Xin Li <xin3...@intel.com>
---
 arch/x86/kvm/vmx/vmx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index e3409607122d..fc808d599493 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -8912,6 +8912,8 @@ static __init int hardware_setup(void)
 
        setup_default_sgx_lepubkeyhash();
 
+       vmx_set_cpu_caps();
+
        if (nested) {
                nested_vmx_setup_ctls_msrs(&vmcs_config, vmx_capability.ept);
 
@@ -8920,8 +8922,6 @@ static __init int hardware_setup(void)
                        return r;
        }
 
-       vmx_set_cpu_caps();
-
        r = alloc_kvm_area();
        if (r && nested)
                nested_vmx_hardware_unsetup();
-- 
2.43.0