diff options
| author |   Mohammed Gamal <m.gamal005@gmail.com> | 2008-07-06 16:51:26 +0300 |
|---|---|---|
| committer |   Avi Kivity <avi@qumranet.com> | 2008-07-20 12:42:38 +0300 |
| commit | 19fdfa0d133ae216e9d1c69a8333fe63fcf8e584 (patch) | |
| tree | 57264290c1b85a6b44e6d15814236f2c32051aed /arch | |
| parent | KVM: Apply the kernel sigmask to vcpus blocked due to being uninitialized (diff) | |
| download | linux-dev-19fdfa0d133ae216e9d1c69a8333fe63fcf8e584.tar.xz linux-dev-19fdfa0d133ae216e9d1c69a8333fe63fcf8e584.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | 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 18ca25c2d4a4..8bc63f62fbbd 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; |