From 230801cdf0748dcf9dc1a658d2ee130689b28d49 Mon Sep 17 00:00:00 2001
From: Gleb Natapov <gleb@redhat.com>
Date: Wed, 28 Apr 2010 19:15:25 +0300
Subject: [PATCH] --- yaml --- r: 202238 b: refs/heads/master c:
 b8a98945ea5b735e083eaf92906aa0ff9ece92e8 h: refs/heads/master 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 557a8344c6ec..14f234456a2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0c13ef1a8f31be08bf1b1244fe4565f11f4b009
+refs/heads/master: b8a98945ea5b735e083eaf92906aa0ff9ece92e8
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
index a99d49cc8934..03a72912d7b9 100644
--- a/trunk/arch/x86/kvm/emulate.c
+++ b/trunk/arch/x86/kvm/emulate.c
@@ -2799,8 +2799,8 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
 			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 */