From 77d2758e9a9c0ca4259731aa641ba50188ddbd7b Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Sun, 1 Aug 2010 14:42:51 +0300
Subject: [PATCH] --- yaml --- r: 215666 b: refs/heads/master c:
 1e87e3efe764285133866a14ddc71cf211f022c2 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86/kvm/emulate.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 04a5c87d27a8..0df81bdbf96d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4709c78eeff2b272e0b9727748b72371b0e71ab
+refs/heads/master: 1e87e3efe764285133866a14ddc71cf211f022c2
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
index 7d2c715f1a2a..a832019138f3 100644
--- a/trunk/arch/x86/kvm/emulate.c
+++ b/trunk/arch/x86/kvm/emulate.c
@@ -2358,9 +2358,8 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt)
 done_prefixes:
 
 	/* REX prefix. */
-	if (c->rex_prefix)
-		if (c->rex_prefix & 8)
-			c->op_bytes = 8;	/* REX.W */
+	if (c->rex_prefix & 8)
+		c->op_bytes = 8;	/* REX.W */
 
 	/* Opcode byte(s). */
 	opcode = opcode_table[c->b];