From dc4eed72667ab8d94227960f30d0a6ee89d73d53 Mon Sep 17 00:00:00 2001
From: Gleb Natapov <gleb@redhat.com>
Date: Wed, 24 Apr 2013 13:38:36 +0300
Subject: [PATCH] --- yaml --- r: 373083 b: refs/heads/master c:
 660696d1d16a71e15549ce1bf74953be1592bcd3 h: refs/heads/master i:   373081:
 5df34f5e2df72aed5053a27e2c3cf8c6953fd901   373079:
 7684d9ba06c71b466a2af64a6ec75c7f631bf49a v: v3

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

diff --git a/[refs] b/[refs]
index 79d2de7f09bc..b455c4e019af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1fa0352a151a597e8749e7be84121a1ff0d3502
+refs/heads/master: 660696d1d16a71e15549ce1bf74953be1592bcd3
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
index 46f63b8d09f4..8e517bba6a7c 100644
--- a/trunk/arch/x86/kvm/emulate.c
+++ b/trunk/arch/x86/kvm/emulate.c
@@ -4172,6 +4172,10 @@ static int decode_operand(struct x86_emulate_ctxt *ctxt, struct operand *op,
 		break;
 	case OpMem8:
 		ctxt->memop.bytes = 1;
+		if (ctxt->memop.type == OP_REG) {
+			ctxt->memop.addr.reg = decode_register(ctxt, ctxt->modrm_rm, 1);
+			fetch_register_operand(&ctxt->memop);
+		}
 		goto mem_common;
 	case OpMem16:
 		ctxt->memop.bytes = 2;