From 79e241d269bf35ab0a12cf671eddd48b9302e573 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Wed, 20 Apr 2011 15:01:23 +0300 Subject: [PATCH] --- yaml --- r: 248057 b: refs/heads/master c: fe870ab9ce1c3e64c6d6b6ee3fe53d0d029f1044 h: refs/heads/master i: 248055: d51b4cc176a1f46c1ef3caab0f42cad87ccae7c2 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/emulate.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1d737113b967..941aade0a742 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2953538ebbd95b145bd3629126fe5af61b88be11 +refs/heads/master: fe870ab9ce1c3e64c6d6b6ee3fe53d0d029f1044 diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c index acb9fcc283ee..0ff7d4bd1bb2 100644 --- a/trunk/arch/x86/kvm/emulate.c +++ b/trunk/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))