Skip to content

Commit

Permalink
KVM: x86 emulator: avoid using ctxt->vcpu in check_perm() callbacks
Browse files Browse the repository at this point in the history
Unneeded for register access.

Signed-off-by: Avi Kivity <avi@redhat.com>
  • Loading branch information
Avi Kivity committed May 22, 2011
1 parent 2953538 commit fe870ab
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/x86/kvm/emulate.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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))
Expand Down

0 comments on commit fe870ab

Please sign in to comment.