From: Sheng Yang <sheng@linux.intel.com>
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: kvm@vger.kernel.org, Sheng Yang <sheng@linux.intel.com>
Subject: [PATCH][v2 1/3] KVM: x86: Check LMA bit before set_efer
Date: Wed, 12 May 2010 16:40:40 +0800 [thread overview]
Message-ID: <1273653642-23132-2-git-send-email-sheng@linux.intel.com> (raw)
In-Reply-To: <1273653642-23132-1-git-send-email-sheng@linux.intel.com>
kvm_x86_ops->set_efer() would execute vcpu->arch.efer = efer, so the
checking of LMA bit didn't work.
Signed-off-by: Sheng Yang <sheng@linux.intel.com>
---
arch/x86/kvm/x86.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index cd8a606..2cae460 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -715,11 +715,11 @@ static int set_efer(struct kvm_vcpu *vcpu, u64 efer)
return 1;
}
- kvm_x86_ops->set_efer(vcpu, efer);
-
efer &= ~EFER_LMA;
efer |= vcpu->arch.efer & EFER_LMA;
+ kvm_x86_ops->set_efer(vcpu, efer);
+
vcpu->arch.efer = efer;
vcpu->arch.mmu.base_role.nxe = (efer & EFER_NX) && !tdp_enabled;
--
1.7.0.1
next prev parent reply other threads:[~2010-05-12 8:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-12 8:40 [PATCH][v2 0/3] Some MMU related fix/clean up Sheng Yang
2010-05-12 8:40 ` Sheng Yang [this message]
2010-05-12 8:40 ` [PATCH][v2 2/3] KVM: Clean up duplicate assignment Sheng Yang
2010-05-12 8:40 ` [PATCH][v2 3/3] VMX: x86: Only reset MMU when necessary Sheng Yang
2010-05-12 8:47 ` Avi Kivity
[not found] ` <201005121654.34980.sheng@linux.intel.com>
2010-05-12 8:56 ` Avi Kivity
2010-05-13 22:18 ` [PATCH][v2 0/3] Some MMU related fix/clean up Marcelo Tosatti
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=1273653642-23132-2-git-send-email-sheng@linux.intel.com \
--to=sheng@linux.intel.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mtosatti@redhat.com \
/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).