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

Commit 1ed0ce00 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: Use pointer to vcpu instead of vcpu_id in timer code. 



Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent c5af89b6

arch/x86/kvm/i8254.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static void create_pit_timer(struct kvm_kpit_state *ps, u32 val, int is_period) 
	pt->timer.function = kvm_timer_fn;

	pt->t_ops = &kpit_ops;

	pt->kvm = ps->pit->kvm;

	pt->vcpu_id = 0;

	pt->vcpu = pt->kvm->bsp_vcpu;



	atomic_set(&pt->pending, 0);

	ps->irq_ack = 1;

arch/x86/kvm/kvm_timer.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ struct kvm_timer { 
	bool reinject;

	struct kvm_timer_ops *t_ops;

	struct kvm *kvm;

	int vcpu_id;

	struct kvm_vcpu *vcpu;

};



struct kvm_timer_ops {

arch/x86/kvm/lapic.c

+1 −1
Original line number Diff line number Diff line
@@ -950,7 +950,7 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu) 
	apic->lapic_timer.timer.function = kvm_timer_fn;

	apic->lapic_timer.t_ops = &lapic_timer_ops;

	apic->lapic_timer.kvm = vcpu->kvm;

	apic->lapic_timer.vcpu_id = vcpu->vcpu_id;

	apic->lapic_timer.vcpu = vcpu;



	apic->base_address = APIC_DEFAULT_PHYS_BASE;

	vcpu->arch.apic_base = APIC_DEFAULT_PHYS_BASE;

arch/x86/kvm/timer.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ enum hrtimer_restart kvm_timer_fn(struct hrtimer *data) 
	struct kvm_vcpu *vcpu;

	struct kvm_timer *ktimer = container_of(data, struct kvm_timer, timer);



	vcpu = ktimer->kvm->vcpus[ktimer->vcpu_id];

	vcpu = ktimer->vcpu;

	if (!vcpu)

		return HRTIMER_NORESTART;