diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2008-09-10 16:40:55 -0300 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-10-15 10:15:26 +0200 |
| commit | 9c3e4aab5ae27bf8589d61c7874e213832b4b7d2 (patch) | |
| tree | 38e3fcc1cbf7c2fdecfc5e95cd63f6c3b6b14702 /arch | |
| parent | d19292e457a7c1b7f6c12bccbfdfd53630de1cee (diff) | |
| download | op-kernel-dev-9c3e4aab5ae27bf8589d61c7874e213832b4b7d2.zip op-kernel-dev-9c3e4aab5ae27bf8589d61c7874e213832b4b7d2.tar.gz | |
KVM: x86: unhalt vcpu0 on reset
Since "KVM: x86: do not execute halted vcpus", HLT by vcpu0 before system
reset by the IO thread will hang the guest.
Mark vcpu as runnable in such case.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kvm/x86.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index bf98d40..2134f3e 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3959,6 +3959,12 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, kvm_set_segment(vcpu, &sregs->tr, VCPU_SREG_TR); kvm_set_segment(vcpu, &sregs->ldt, VCPU_SREG_LDTR); + /* Older userspace won't unhalt the vcpu on reset. */ + if (vcpu->vcpu_id == 0 && kvm_rip_read(vcpu) == 0xfff0 && + sregs->cs.selector == 0xf000 && sregs->cs.base == 0xffff0000 && + !(vcpu->arch.cr0 & X86_CR0_PE)) + vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE; + vcpu_put(vcpu); return 0; |
