[patch] 2.6.25 kernel patch

fix-halt.patch (text/plain), 1.02 KB, created by Cory on 2008-11-11 22:47:42 UTC

commit 214fc251236fd1d0e0f2b7c3b7b7ad5243928fa9
Author: Mohammed Gamal <[e-mail]>
Date:   Sun Jul 6 16:51:26 2008 +0300

    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 <[e-mail]>
    Signed-off-by: Avi Kivity <[e-mail]>

diff --git a/kernel/x86_emulate.c b/kernel/x86_emulate.c
index dd4efe1..62e71b6 100644
--- a/kernel/x86_emulate.c
+++ b/kernel/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;