summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Bolshakov2020-07-14 11:07:27 +0200
committerEduardo Habkost2020-07-16 20:15:13 +0200
commit818b9f111d64b40661d08f5e23236ac1ca5df505 (patch)
tree8e28b7ac960c74045afd9b3645cc37d7ade412d4
parenttarget/i386: add the missing vmx features for Skylake-Server and Cascadelake-... (diff)
downloadqemu-818b9f111d64b40661d08f5e23236ac1ca5df505.tar.gz
qemu-818b9f111d64b40661d08f5e23236ac1ca5df505.tar.xz
qemu-818b9f111d64b40661d08f5e23236ac1ca5df505.zip
i386: hvf: Explicitly set CR4 guest/host mask
Removal of register reset omitted initialization of CR4 guest/host mask. x86_64 guests aren't booting without it. Fixes: 5009ef22c6bb2 ("i386: hvf: Don't duplicate register reset") Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com> Message-Id: <20200714090726.41082-1-r.bolshakov@yadro.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
-rw-r--r--target/i386/hvf/vmx.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/target/i386/hvf/vmx.h b/target/i386/hvf/vmx.h
index 75ba1e2a5f..587b1b8375 100644
--- a/target/i386/hvf/vmx.h
+++ b/target/i386/hvf/vmx.h
@@ -166,6 +166,7 @@ static inline void macvm_set_cr4(hv_vcpuid_t vcpu, uint64_t cr4)
wvmcs(vcpu, VMCS_GUEST_CR4, guest_cr4);
wvmcs(vcpu, VMCS_CR4_SHADOW, cr4);
+ wvmcs(vcpu, VMCS_CR4_MASK, CR4_VMXE);
hv_vcpu_invalidate_tlb(vcpu);
hv_vcpu_flush(vcpu);