From 9b782c45e38bf340a821f1154ead7d40aedfd454 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Wed, 18 Aug 2010 15:12:09 +0300
Subject: [PATCH] --- yaml --- r: 215743 b: refs/heads/master c:
 40ece7c7297da90e54e147d3bfbb4531f9fbc570 h: refs/heads/master i:   215741:
 b9e5a20824716067c499f8ec8e711c2edf60548c   215739:
 d119e7f96180f4f1ca3a2a75dae07559fad7413b   215735:
 39b49244fc8c73caab82f9e24e99a01b980dbf78   215727:
 7b1315d25731e923b6d80b465365188caf789552   215711:
 6f6dbe27949c7cc9306dd47ff46a3d4e49e97be5   215679:
 54b6497ca4387999c09024318506c637b55b5ffa v: v3

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

diff --git a/[refs] b/[refs]
index 2a31bc6521fd..15008eb77802 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b250e605895d02cede78922d034f7825af72a8b5
+refs/heads/master: 40ece7c7297da90e54e147d3bfbb4531f9fbc570
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
index db80e28471da..9e58f5054c39 100644
--- a/trunk/arch/x86/kvm/emulate.c
+++ b/trunk/arch/x86/kvm/emulate.c
@@ -2249,6 +2249,21 @@ static int em_call_far(struct x86_emulate_ctxt *ctxt)
 	return X86EMUL_CONTINUE;
 }
 
+static int em_ret_near_imm(struct x86_emulate_ctxt *ctxt)
+{
+	struct decode_cache *c = &ctxt->decode;
+	int rc;
+
+	c->dst.type = OP_REG;
+	c->dst.addr.reg = &c->eip;
+	c->dst.bytes = c->op_bytes;
+	rc = emulate_pop(ctxt, ctxt->ops, &c->dst.val, c->op_bytes);
+	if (rc != X86EMUL_CONTINUE)
+		return rc;
+	register_address_increment(c, &c->regs[VCPU_REGS_RSP], c->src.val);
+	return X86EMUL_CONTINUE;
+}
+
 #define D(_y) { .flags = (_y) }
 #define N    D(0)
 #define G(_f, _g) { .flags = ((_f) | Group), .u.group = (_g) }
@@ -2394,7 +2409,9 @@ static struct opcode opcode_table[256] = {
 	X8(D(DstReg | SrcImm | Mov)),
 	/* 0xC0 - 0xC7 */
 	D(ByteOp | DstMem | SrcImm | ModRM), D(DstMem | SrcImmByte | ModRM),
-	N, D(ImplicitOps | Stack), N, N,
+	I(ImplicitOps | Stack | SrcImmU16, em_ret_near_imm),
+	D(ImplicitOps | Stack),
+	N, N,
 	D(ByteOp | DstMem | SrcImm | ModRM | Mov), D(DstMem | SrcImm | ModRM | Mov),
 	/* 0xC8 - 0xCF */
 	N, N, N, D(ImplicitOps | Stack),