From: Eduardo Habkost <ehabkost@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Roman Bolshakov <r.bolshakov@yadro.com>,
Eduardo Habkost <ehabkost@redhat.com>,
Cameron Esfahani <dirty@apple.com>,
Richard Henderson <rth@twiddle.net>
Subject: [PULL 6/6] i386: hvf: Explicitly set CR4 guest/host mask
Date: Thu, 16 Jul 2020 14:19:03 -0400 [thread overview]
Message-ID: <20200716181903.1895314-7-ehabkost@redhat.com> (raw)
In-Reply-To: <20200716181903.1895314-1-ehabkost@redhat.com>
From: Roman Bolshakov <r.bolshakov@yadro.com>
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>
---
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);
--
2.26.2
next prev parent reply other threads:[~2020-07-16 18:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-16 18:18 [PULL 0/6] x86 fixes for -rc1 Eduardo Habkost
2020-07-16 18:18 ` [PULL 1/6] i368/cpu: Clear env->user_features after loading versioned CPU model Eduardo Habkost
2020-07-16 18:18 ` [PULL 2/6] i386/cpu: Don't add unavailable_features to env->user_features Eduardo Habkost
2020-07-16 18:19 ` [PULL 3/6] target/i386: add fast short REP MOV support Eduardo Habkost
2020-07-16 18:19 ` [PULL 4/6] target/i386: fix model number and add missing features for Icelake-Server CPU model Eduardo Habkost
2020-07-16 18:19 ` [PULL 5/6] target/i386: add the missing vmx features for Skylake-Server and Cascadelake-Server CPU models Eduardo Habkost
2020-07-16 18:19 ` Eduardo Habkost [this message]
2020-07-17 9:38 ` [PULL 0/6] x86 fixes for -rc1 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200716181903.1895314-7-ehabkost@redhat.com \
--to=ehabkost@redhat.com \
--cc=dirty@apple.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=r.bolshakov@yadro.com \
--cc=rth@twiddle.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).