From fe870ab9ce1c3e64c6d6b6ee3fe53d0d029f1044 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Wed, 20 Apr 2011 15:01:23 +0300
Subject: [PATCH] KVM: x86 emulator: avoid using ctxt->vcpu in check_perm()
callbacks
Unneeded for register access.
Signed-off-by: Avi Kivity <avi@redhat.com>
---
arch/x86/kvm/emulate.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index acb9fcc283ee..0ff7d4bd1bb2 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -2720,7 +2720,7 @@ static int check_svme(struct x86_emulate_ctxt *ctxt)
static int check_svme_pa(struct x86_emulate_ctxt *ctxt)
{
- u64 rax = kvm_register_read(ctxt->vcpu, VCPU_REGS_RAX);
+ u64 rax = ctxt->decode.regs[VCPU_REGS_RAX];
/* Valid physical address? */
if (rax & 0xffff000000000000)
@@ -2742,7 +2742,7 @@ static int check_rdtsc(struct x86_emulate_ctxt *ctxt)
static int check_rdpmc(struct x86_emulate_ctxt *ctxt)
{
u64 cr4 = ctxt->ops->get_cr(ctxt, 4);
- u64 rcx = kvm_register_read(ctxt->vcpu, VCPU_REGS_RCX);
+ u64 rcx = ctxt->decode.regs[VCPU_REGS_RCX];
if ((!(cr4 & X86_CR4_PCE) && ctxt->ops->cpl(ctxt)) ||
(rcx > 3))
--
GitLab