[qemu-xen staging] i386: hvf: Explicitly set CR4 guest/host mask

[patchbot@xxxxxxx]

commit 818b9f111d64b40661d08f5e23236ac1ca5df505
Author:     Roman Bolshakov <r.bolshakov@xxxxxxxxx>
AuthorDate: Tue Jul 14 12:07:27 2020 +0300
Commit:     Eduardo Habkost <ehabkost@xxxxxxxxxx>
CommitDate: Thu Jul 16 14:15:13 2020 -0400

    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@xxxxxxxxx>
    Message-Id: <20200714090726.41082-1-r.bolshakov@xxxxxxxxx>
    Signed-off-by: Eduardo Habkost <ehabkost@xxxxxxxxxx>
---
 target/i386/hvf/vmx.h | 1 +
 1 file changed, 1 insertion(+)

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);
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging