From 6f7deea4e45d7f25dc4e8ec0fbdecd69e5673409 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Mon, 14 Apr 2008 23:27:07 +0300
Subject: [PATCH] --- yaml --- r: 93897 b: refs/heads/master c:
 66b85505736dbd3a3a0ed5ae38c12bb218b231c0 h: refs/heads/master i:   93895:
 c5f824dbc2e8b824bf14d756d31261a6ad16aefe v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kvm/x86_emulate.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 33799b3c5a1f..14bcada75bf7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a79d2f1805da02d7837ec2240f0093c53272fb3a
+refs/heads/master: 66b85505736dbd3a3a0ed5ae38c12bb218b231c0
diff --git a/trunk/arch/x86/kvm/x86_emulate.c b/trunk/arch/x86/kvm/x86_emulate.c
index f59ed93f5d24..8e1b32f2cd5e 100644
--- a/trunk/arch/x86/kvm/x86_emulate.c
+++ b/trunk/arch/x86/kvm/x86_emulate.c
@@ -1001,6 +1001,7 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
 		 */
 		if ((c->d & ModRM) && c->modrm_mod == 3) {
 			c->src.type = OP_REG;
+			c->src.val = c->modrm_val;
 			break;
 		}
 		c->src.type = OP_MEM;
@@ -1044,6 +1045,7 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
 	case DstMem:
 		if ((c->d & ModRM) && c->modrm_mod == 3) {
 			c->dst.type = OP_REG;
+			c->dst.val = c->dst.orig_val = c->modrm_val;
 			break;
 		}
 		c->dst.type = OP_MEM;