KVM: fix polling for guest halt continued even if disable it

If there is already some polling ongoing, it's impossible to disable the
polling, since as soon as somebody sets halt_poll_ns to 0, polling will
never stop, as grow and shrink are only handled if halt_poll_ns is != 0.

This patch fix it by reset vcpu->halt_poll_ns in order to stop polling
when polling is disabled.

Reported-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Wanpeng Li 2015-09-14 17:38:51 +08:00 committed by Paolo Bonzini
parent 6ff33f3902
commit edb9272f35

View File

@ -2043,7 +2043,8 @@ out:
else if (vcpu->halt_poll_ns < halt_poll_ns && else if (vcpu->halt_poll_ns < halt_poll_ns &&
block_ns < halt_poll_ns) block_ns < halt_poll_ns)
grow_halt_poll_ns(vcpu); grow_halt_poll_ns(vcpu);
} } else
vcpu->halt_poll_ns = 0;
trace_kvm_vcpu_wakeup(block_ns, waited); trace_kvm_vcpu_wakeup(block_ns, waited);
} }