From 889e2ee9ccafd63c35d86a6af9e983cbd1cd275b Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Mon, 11 Jun 2012 19:40:15 +0300
Subject: [PATCH] --- yaml --- r: 315885 b: refs/heads/master c:
 361cad2b50a2c92b91b6f568db860fabad3bf149 h: refs/heads/master i:   315883:
 cad436926c92fc42caa24a2e6cfcc25f4e9d2bc1 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 24263436274b..4e098f1f36c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2dd7caa092f0b1200a885a418e5d33b222183a71
+refs/heads/master: 361cad2b50a2c92b91b6f568db860fabad3bf149
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
index 90b549ed8997..30f4912c6a67 100644
--- a/trunk/arch/x86/kvm/emulate.c
+++ b/trunk/arch/x86/kvm/emulate.c
@@ -4517,12 +4517,12 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
 		break;
 	case 0xb6 ... 0xb7:	/* movzx */
 		ctxt->dst.bytes = ctxt->op_bytes;
-		ctxt->dst.val = (ctxt->d & ByteOp) ? (u8) ctxt->src.val
+		ctxt->dst.val = (ctxt->src.bytes == 1) ? (u8) ctxt->src.val
 						       : (u16) ctxt->src.val;
 		break;
 	case 0xbe ... 0xbf:	/* movsx */
 		ctxt->dst.bytes = ctxt->op_bytes;
-		ctxt->dst.val = (ctxt->d & ByteOp) ? (s8) ctxt->src.val :
+		ctxt->dst.val = (ctxt->src.bytes == 1) ? (s8) ctxt->src.val :
 							(s16) ctxt->src.val;
 		break;
 	case 0xc0 ... 0xc1:	/* xadd */