Re: Boot Problem (and fix)

Avi Kivity
2008-11-11T17:09:45Z

[-- Attachment #1: Type: text/plain, Size: 396 bytes --]

the uni wrote:
>> Can you try modules from older versions (keeping userspace and the bios) to
>> see which version introduced the fix?
>>
>
>
> Keeping userspace and bios, versions 71 and up are fixed... 70 is broken.
>

Please try kvm-70 with the attached patch attached.

(from 214fc251236fd1d0e0f2b7c3b7b7ad5243928fa9)

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

[-- Attachment #2: fix-halt.patch --]
[-- Type: text/plain, Size: 1043 bytes --]

commit 214fc251236fd1d0e0f2b7c3b7b7ad5243928fa9
Author: Mohammed Gamal <m.gamal005@gmail.com>
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 <m.gamal005@gmail.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>

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;