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

KVM: PIT: take inject_pending into account when emulating hlt 



Otherwise hlt emulation fails if PIT is not injecting IRQ's.

Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 5ca9fd54

arch/x86/kvm/i8254.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ int pit_has_pending_timer(struct kvm_vcpu *vcpu) 
{

	struct kvm_pit *pit = vcpu->kvm->arch.vpit;



	if (pit && vcpu->vcpu_id == 0)

	if (pit && vcpu->vcpu_id == 0 && pit->pit_state.inject_pending)

		return atomic_read(&pit->pit_state.pit_timer.pending);



	return 0;