projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f0c13ef
)
KVM: x86 emulator: cleanup nop emulation
author
Gleb Natapov
<gleb@redhat.com>
Wed, 28 Apr 2010 16:15:25 +0000
(19:15 +0300)
committer
Avi Kivity
<avi@redhat.com>
Sun, 1 Aug 2010 07:35:29 +0000
(10:35 +0300)
Make it more explicit what we are checking for.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
arch/x86/kvm/emulate.c
patch
|
blob
|
history
diff --git
a/arch/x86/kvm/emulate.c
b/arch/x86/kvm/emulate.c
index
a99d49c
..
03a7291
100644
(file)
--- a/
arch/x86/kvm/emulate.c
+++ b/
arch/x86/kvm/emulate.c
@@
-2799,8
+2799,8
@@
special_insn:
goto done;
break;
case 0x90: /* nop / xchg r8,rax */
- if (
!(c->rex_prefix & 1)) { /* nop */
- c->dst.type = OP_NONE;
+ if (
c->dst.ptr == (unsigned long *)&c->regs[VCPU_REGS_RAX]) {
+ c->dst.type = OP_NONE;
/* nop */
break;
}
case 0x91 ... 0x97: /* xchg reg,rax */