[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] target/i386: disable VMX features if nested=0
From: |
Yang Zhong |
Subject: |
[PATCH] target/i386: disable VMX features if nested=0 |
Date: |
Fri, 6 Dec 2019 15:11:11 +0800 |
If kvm does not support VMX feature by nested=0, the kvm_vmx_basic
can't get the right value from MSR_IA32_VMX_BASIC register, which
make qemu coredump when qemu do KVM_SET_MSRS.
The coredump info:
error: failed to set MSR 0x480 to 0x0
kvm_put_msrs: Assertion `ret == cpu->kvm_msr_buf->nmsrs' failed.
Signed-off-by: Yang Zhong <address@hidden>
---
target/i386/kvm.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index bf1655645b..e8841dcdb9 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -2572,6 +2572,14 @@ static void kvm_msr_entry_add_vmx(X86CPU *cpu,
FeatureWordArray f)
uint64_t kvm_vmx_basic =
kvm_arch_get_supported_msr_feature(kvm_state,
MSR_IA32_VMX_BASIC);
+ if (!kvm_vmx_basic) {
+ /* If the kernel does't support VMX feature(nested=0 in kvm)
+ * and kvm_vmx_basic will be 0. This will set 0 value to
+ * MSR_IA32_VMX_BASIC MSR.
+ */
+ return;
+ }
+
uint64_t kvm_vmx_misc =
kvm_arch_get_supported_msr_feature(kvm_state,
MSR_IA32_VMX_MISC);
--
2.17.1
- [PATCH] target/i386: disable VMX features if nested=0,
Yang Zhong <=