From af5ec1ad35da29d1e065b6e6026d9052afeb3e11 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Fri, 28 Nov 2008 00:14:07 +0200
Subject: [PATCH] --- yaml --- r: 125265 b: refs/heads/master c:
 cf5de4f886116871c2ae2eee53524edd741a68ae h: refs/heads/master i:   125263:
 7de0078fd52252eb05bb3e09c1842210f4b9b232 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 ce9eac725f06..e098f213ba7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a09b6877f3100207b3572e7e12ea796493fe914
+refs/heads/master: cf5de4f886116871c2ae2eee53524edd741a68ae
diff --git a/trunk/arch/x86/kvm/x86_emulate.c b/trunk/arch/x86/kvm/x86_emulate.c
index 702de9869c19..72ae86b1b131 100644
--- a/trunk/arch/x86/kvm/x86_emulate.c
+++ b/trunk/arch/x86/kvm/x86_emulate.c
@@ -1650,7 +1650,9 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
 		emulate_grp2(ctxt);
 		break;
 	case 0xc3: /* ret */
+		c->dst.type = OP_REG;
 		c->dst.ptr = &c->eip;
+		c->dst.bytes = c->op_bytes;
 		goto pop_instruction;
 	case 0xc6 ... 0xc7:	/* mov (sole member of Grp11) */
 	mov: