From 05844a25a6b97801be701000d52cfed19240ce9e Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Tue, 13 Sep 2011 10:45:45 +0300
Subject: [PATCH] --- yaml --- r: 271531 b: refs/heads/master c:
 608aabe316eab9116ddd73418217277693df3bb8 h: refs/heads/master i:   271529:
 e661d884ecb955c8cbff77a6d3121091011c0be6   271527:
 a0da990d170131d8b6ee0d9aa597efd409fd9b4d v: v3

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

diff --git a/[refs] b/[refs]
index 9cb6c5b62fb1..9911e1e4ee36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20c29ff205ea9c4e2bf4ef79b0e5b934d6c60aff
+refs/heads/master: 608aabe316eab9116ddd73418217277693df3bb8
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
index 00e0904fab22..a0d6ceb4b454 100644
--- a/trunk/arch/x86/kvm/emulate.c
+++ b/trunk/arch/x86/kvm/emulate.c
@@ -3349,10 +3349,7 @@ static int decode_operand(struct x86_emulate_ctxt *ctxt, struct operand *op,
 			 ctxt->twobyte && (ctxt->b == 0xb6 || ctxt->b == 0xb7));
 		break;
 	case OpImmUByte:
-		op->type = OP_IMM;
-		op->addr.mem.ea = ctxt->_eip;
-		op->bytes = 1;
-		op->val = insn_fetch(u8, ctxt);
+		rc = decode_imm(ctxt, op, 1, false);
 		break;
 	case OpMem:
 	case OpMem64: