[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <f08935a03e3e8ba29f94840471f06089e7a24147.1690322424.git.isaku.yamahata@intel.com>
Date: Tue, 25 Jul 2023 15:13:15 -0700
From: isaku.yamahata@...el.com
To: kvm@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: isaku.yamahata@...el.com, isaku.yamahata@...il.com,
Paolo Bonzini <pbonzini@...hat.com>, erdemaktas@...gle.com,
Sean Christopherson <seanjc@...gle.com>,
Sagi Shahar <sagis@...gle.com>,
David Matlack <dmatlack@...gle.com>,
Kai Huang <kai.huang@...el.com>,
Zhi Wang <zhi.wang.linux@...il.com>, chen.bo@...el.com,
hang.yuan@...el.com, tina.zhang@...el.com
Subject: [PATCH v15 004/115] KVM: VMX: Reorder vmx initialization with kvm vendor initialization
From: Isaku Yamahata <isaku.yamahata@...el.com>
To match vmx_exit cleanup.
Signed-off-by: Isaku Yamahata <isaku.yamahata@...el.com>
---
arch/x86/kvm/vmx/main.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kvm/vmx/main.c b/arch/x86/kvm/vmx/main.c
index 27bfd3fcea09..deaba44c6bdf 100644
--- a/arch/x86/kvm/vmx/main.c
+++ b/arch/x86/kvm/vmx/main.c
@@ -179,11 +179,11 @@ static int __init vt_init(void)
*/
hv_init_evmcs();
- r = kvm_x86_vendor_init(&vt_init_ops);
+ r = vmx_init();
if (r)
- return r;
+ goto err_vmx_init;
- r = vmx_init();
+ r = kvm_x86_vendor_init(&vt_init_ops);
if (r)
goto err_vmx_init;
@@ -200,9 +200,9 @@ static int __init vt_init(void)
return 0;
err_kvm_init:
- vmx_exit();
-err_vmx_init:
kvm_x86_vendor_exit();
+err_vmx_init:
+ vmx_exit();
return r;
}
module_init(vt_init);
--
2.25.1
Powered by blists - more mailing lists