Commit 019b9781 authored Dec 28, 2015 by Andrey Smetanin Committed by Paolo Bonzini Jan 08, 2016

kvm/x86: Drop stimer_stop() function



The function stimer_stop() is called in one place
so remove the function and replace it's call by function
content.

Signed-off-by: Andrey Smetanin <asmetanin@virtuozzo.com>
Reviewed-by: Roman Kagan <rkagan@virtuozzo.com>
CC: Gleb Natapov <gleb@kernel.org>
CC: Paolo Bonzini <pbonzini@redhat.com>
CC: Roman Kagan <rkagan@virtuozzo.com>
CC: Denis V. Lunev <den@openvz.org>
CC: qemu-devel@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 1ac1b65a

arch/x86/kvm/hyperv.c

+1 −6

Original line number	Diff line number	Diff line
		@@ -400,16 +400,11 @@ static void stimer_mark_expired(struct kvm_vcpu_hv_stimer *stimer,
		kvm_vcpu_kick(vcpu);
		}

		static void stimer_stop(struct kvm_vcpu_hv_stimer *stimer)
		{
		hrtimer_cancel(&stimer->timer);
		}

		static void stimer_cleanup(struct kvm_vcpu_hv_stimer *stimer)
		{
		struct kvm_vcpu *vcpu = stimer_to_vcpu(stimer);

		stimer_stop(stimer);
		hrtimer_cancel(&stimer->timer);
		clear_bit(stimer->index,
		vcpu_to_hv_vcpu(vcpu)->stimer_pending_bitmap);
		stimer->msg_pending = false;

Admin message