[PATCH] x86 emulator: Fix HLT instruction

[PATCH] x86 emulator: Fix HLT instruction

[Mohammed Gamal]

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>

---
 arch/x86/kvm/x86_emulate.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c
index dd4efe1..62e71b6 100644
--- a/arch/x86/kvm/x86_emulate.c
+++ b/arch/x86/kvm/x86_emulate.c
@@ -1732,7 +1732,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;

Re: [PATCH] x86 emulator: Fix HLT instruction

[Avi Kivity]

Mohammed Gamal wrote:
> 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.
>
>   

Applied, thanks.

-- 
error compiling committee.c: too many arguments to function