KVM: x86: Switch to use hrtimer_setup()

hrtimer_setup() takes the callback function pointer as argument and
initializes the timer completely.

Replace hrtimer_init() and the open coded initialization of
hrtimer::function with the new setup mechanism.

Patch was created by using Coccinelle.

Signed-off-by: Nam Cao <namcao@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Sean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/all/5051cfe7ed48ef9913bf2583eeca6795cb53d6ae.1738746821.git.namcao@linutronix.de

diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index 6ebeb6cea6c0d530cd8d78bcdeb6729ebf23ba17..24f0318c50d790ce70b04f3b61a827d4768da3da 100644 (file)
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -952,8 +952,7 @@ static void stimer_init(struct kvm_vcpu_hv_stimer *stimer, int timer_index)
 {
        memset(stimer, 0, sizeof(*stimer));
        stimer->index = timer_index;
-       hrtimer_init(&stimer->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
-       stimer->timer.function = stimer_timer_callback;
+       hrtimer_setup(&stimer->timer, stimer_timer_callback, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
        stimer_prepare_msg(stimer);
 }
 

diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
index d7ab8780ab9e123650b51c68319dfbd41d914048..739aa6c0d0c365b227d1edf49dd2cf160f48ab64 100644 (file)
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
@@ -690,8 +690,7 @@ struct kvm_pit *kvm_create_pit(struct kvm *kvm, u32 flags)
        pit->kvm = kvm;
 
        pit_state = &pit->pit_state;
-       hrtimer_init(&pit_state->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
-       pit_state->timer.function = pit_timer_fn;
+       hrtimer_setup(&pit_state->timer, pit_timer_fn, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
 
        pit_state->irq_ack_notifier.gsi = 0;
        pit_state->irq_ack_notifier.irq_acked = kvm_pit_ack_irq;

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index a009c94c26c2a09c39457b02047a4e9e414cb6f0..eb56cd9895748721aec8a46dae9d3415c9ac1000 100644 (file)
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -2921,9 +2921,8 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu)
 
        apic->nr_lvt_entries = kvm_apic_calc_nr_lvt_entries(vcpu);
 
-       hrtimer_init(&apic->lapic_timer.timer, CLOCK_MONOTONIC,
-                    HRTIMER_MODE_ABS_HARD);
-       apic->lapic_timer.timer.function = apic_timer_fn;
+       hrtimer_setup(&apic->lapic_timer.timer, apic_timer_fn, CLOCK_MONOTONIC,
+                     HRTIMER_MODE_ABS_HARD);
        if (lapic_timer_advance)
                apic->lapic_timer.timer_advance_ns = LAPIC_TIMER_ADVANCE_NS_INIT;
 

diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
index 8a7af02d466e9ff738c255533c09e1d34cb7c452..ca18c3eec76d81e4479f5e56def42f4e1d7b4cb5 100644 (file)
--- a/arch/x86/kvm/vmx/nested.c
+++ b/arch/x86/kvm/vmx/nested.c
@@ -5316,9 +5316,8 @@ static int enter_vmx_operation(struct kvm_vcpu *vcpu)
        if (enable_shadow_vmcs && !alloc_shadow_vmcs(vcpu))
                goto out_shadow_vmcs;
 
-       hrtimer_init(&vmx->nested.preemption_timer, CLOCK_MONOTONIC,
-                    HRTIMER_MODE_ABS_PINNED);
-       vmx->nested.preemption_timer.function = vmx_preemption_timer_fn;
+       hrtimer_setup(&vmx->nested.preemption_timer, vmx_preemption_timer_fn, CLOCK_MONOTONIC,
+                     HRTIMER_MODE_ABS_PINNED);
 
        vmx->nested.vpid02 = allocate_vpid();
 

diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c
index a909b817b9c0da1714169d937c135474e8a9cf7d..1ac738dcf7a26fa2eeb5b5cfe0ab723b19c67f9f 100644 (file)
--- a/arch/x86/kvm/xen.c
+++ b/arch/x86/kvm/xen.c
@@ -2225,8 +2225,8 @@ void kvm_xen_init_vcpu(struct kvm_vcpu *vcpu)
        vcpu->arch.xen.poll_evtchn = 0;
 
        timer_setup(&vcpu->arch.xen.poll_timer, cancel_evtchn_poll, 0);
-       hrtimer_init(&vcpu->arch.xen.timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);
-       vcpu->arch.xen.timer.function = xen_timer_callback;
+       hrtimer_setup(&vcpu->arch.xen.timer, xen_timer_callback, CLOCK_MONOTONIC,
+                     HRTIMER_MODE_ABS_HARD);
 
        kvm_gpc_init(&vcpu->arch.xen.runstate_cache, vcpu->kvm);
        kvm_gpc_init(&vcpu->arch.xen.runstate2_cache, vcpu->kvm);