[Devel] [PATCH RHEL7 COMMIT] ms/kvm/x86: Drop stimer_stop() function
Konstantin Khorenko
khorenko at virtuozzo.com
Tue Feb 16 01:50:25 PST 2016
The commit is pushed to "branch-rh7-3.10.0-327.4.5.vz7.11.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-327.4.5.vz7.11.2
------>
commit 591ba4f1fc725fd3be4f1d0e4976e79804149412
Author: Andrey Smetanin <asmetanin at virtuozzo.com>
Date: Tue Feb 16 13:50:25 2016 +0400
ms/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.
ms commit - 019b9781ccd667d4160f3636c8735e3baa085555.
Signed-off-by: Andrey Smetanin <asmetanin at virtuozzo.com>
Reviewed-by: Roman Kagan <rkagan at virtuozzo.com>
CC: Gleb Natapov <gleb at kernel.org>
CC: Paolo Bonzini <pbonzini at redhat.com>
CC: Roman Kagan <rkagan at virtuozzo.com>
CC: Denis V. Lunev <den at openvz.org>
CC: qemu-devel at nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
---
arch/x86/kvm/hyperv.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index 102378f..8ebdb07 100644
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -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;
More information about the Devel
mailing list