From b44fd70fdaaed96242ac7aa9e1ede599c9c6d302 Mon Sep 17 00:00:00 2001
From: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
Date: Tue, 6 Dec 2011 18:06:02 +0900
Subject: [PATCH] --- yaml --- r: 282050 b: refs/heads/master c:
 c15af35f54631b9e9b7ad1981016cc6e73cec794 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index da717d8e3285..a781d561d89a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f69b6805c4f818cf7f4126978cc4a54c489119f
+refs/heads/master: c15af35f54631b9e9b7ad1981016cc6e73cec794
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
index f641201c7b31..cd49774f2d0e 100644
--- a/trunk/arch/x86/kvm/emulate.c
+++ b/trunk/arch/x86/kvm/emulate.c
@@ -1675,11 +1675,6 @@ static int em_jmp_far(struct x86_emulate_ctxt *ctxt)
 	return X86EMUL_CONTINUE;
 }
 
-static int em_grp1a(struct x86_emulate_ctxt *ctxt)
-{
-	return emulate_pop(ctxt, &ctxt->dst.val, ctxt->dst.bytes);
-}
-
 static int em_grp2(struct x86_emulate_ctxt *ctxt)
 {
 	switch (ctxt->modrm_reg) {
@@ -3203,7 +3198,7 @@ static struct opcode group1[] = {
 };
 
 static struct opcode group1A[] = {
-	D(DstMem | SrcNone | ModRM | Mov | Stack), N, N, N, N, N, N, N,
+	I(DstMem | SrcNone | ModRM | Mov | Stack, em_pop), N, N, N, N, N, N, N,
 };
 
 static struct opcode group3[] = {
@@ -4031,9 +4026,6 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
 	case 0x8d: /* lea r16/r32, m */
 		ctxt->dst.val = ctxt->src.addr.mem.ea;
 		break;
-	case 0x8f:		/* pop (sole member of Grp1a) */
-		rc = em_grp1a(ctxt);
-		break;
 	case 0x90 ... 0x97: /* nop / xchg reg, rax */
 		if (ctxt->dst.addr.reg == &ctxt->regs[VCPU_REGS_RAX])
 			break;