From: Avi Kivity <avi@redhat.com>
Date: Thu, 27 Nov 2008 22:14:07 +0000 (+0200)
Subject: KVM: x86 emulator: fix ret emulation
X-Git-Tag: v2.6.29-rc1~539^2~43
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=cf5de4f886116871c2ae2eee53524edd741a68ae;p=~shefty%2Frdma-dev.git

KVM: x86 emulator: fix ret emulation

'ret' did not set the operand type or size for the destination, so
writeback ignored it.

Signed-off-by: Avi Kivity <avi@redhat.com>
---

diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c
index 702de9869c1..72ae86b1b13 100644
--- a/arch/x86/kvm/x86_emulate.c
+++ b/arch/x86/kvm/x86_emulate.c
@@ -1650,7 +1650,9 @@ special_insn:
 		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: