Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c3e4aab authored by Marcelo Tosatti's avatar Marcelo Tosatti Committed by Avi Kivity
Browse files

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: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent d19292e4

arch/x86/kvm/x86.c

+6 −0
Original line number Diff line number Diff line
@@ -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;