From: Mohammed Gamal <m.gamal005@gmail.com>
Date: Sun, 6 Jul 2008 13:51:26 +0000 (+0300)
Subject: KVM: x86 emulator: Fix HLT instruction
X-Git-Tag: v2.6.27-rc1~968^2~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=19fdfa0d133ae216e9d1c69a8333fe63fcf8e584;p=linux-2.6-omap-h63xx.git

KVM: x86 emulator: Fix HLT instruction

This patch fixes issue encountered with HLT instruction
under FreeDOS's HIMEM XMS Driver.

The HLT instruction jumped directly to the done label and
skips updating the EIP value, therefore causing the guest
to spin endlessly on the same instruction.

The patch changes the instruction so that it writes back
the updated EIP value.

Signed-off-by: Mohammed Gamal <m.gamal005@gmail.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
---

diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c
index 18ca25c2d4a..8bc63f62fbb 100644
--- a/arch/x86/kvm/x86_emulate.c
+++ b/arch/x86/kvm/x86_emulate.c
@@ -1731,7 +1731,7 @@ special_insn:
 		break;
 	case 0xf4:              /* hlt */
 		ctxt->vcpu->arch.halt_request = 1;
-		goto done;
+		break;
 	case 0xf5:	/* cmc */
 		/* complement carry flag from eflags reg */
 		ctxt->eflags ^= EFLG_CF;