Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit beb20d52 authored by Arjan van de Ven's avatar Arjan van de Ven
Browse files

hrtimer: convert kvm to the new hrtimer apis 



In order to be able to do range hrtimers we need to use accessor functions
to the "expire" member of the hrtimer struct.
This patch converts KVM to these accessors.

Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
parent 63ca243b

arch/x86/kvm/i8254.c

+3 −3
Original line number Diff line number Diff line
@@ -205,8 +205,8 @@ static int __pit_timer_fn(struct kvm_kpit_state *ps) 
		wake_up_interruptible(&vcpu0->wq);

	}



	pt->timer.expires = ktime_add_ns(pt->timer.expires, pt->period);

	pt->scheduled = ktime_to_ns(pt->timer.expires);

	hrtimer_add_expires_ns(&pt->timer, pt->period);

	pt->scheduled = ktime_to_ns(hrtimer_get_expires(&pt->timer));



	return (pt->period == 0 ? 0 : 1);

}
@@ -246,7 +246,7 @@ void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu) 


	timer = &pit->pit_state.pit_timer.timer;

	if (hrtimer_cancel(timer))

		hrtimer_start(timer, timer->expires, HRTIMER_MODE_ABS);

		hrtimer_start_expires(timer, HRTIMER_MODE_ABS);

}



static void destroy_pit_timer(struct kvm_kpit_timer *pt)

arch/x86/kvm/lapic.c

+2 −4
Original line number Diff line number Diff line
@@ -953,9 +953,7 @@ static int __apic_timer_fn(struct kvm_lapic *apic) 
	}

	if (apic_lvtt_period(apic)) {

		result = 1;

		apic->timer.dev.expires = ktime_add_ns(

					apic->timer.dev.expires,

					apic->timer.period);

		hrtimer_add_expires_ns(&apic->timer.dev, apic->timer.period);

	}

	return result;

}
@@ -1124,7 +1122,7 @@ void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu) 


	timer = &apic->timer.dev;

	if (hrtimer_cancel(timer))

		hrtimer_start(timer, timer->expires, HRTIMER_MODE_ABS);

		hrtimer_start_expires(timer, HRTIMER_MODE_ABS);

}



void kvm_lapic_sync_from_vapic(struct kvm_vcpu *vcpu)