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

KVM: Introduce kvm_vcpu_is_bsp() function. 



Use it instead of open code "vcpu_id zero is BSP" assumption.

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

arch/ia64/kvm/kvm-ia64.c

+1 −1
Original line number Diff line number Diff line
@@ -1216,7 +1216,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) 
	if (IS_ERR(vmm_vcpu))

		return PTR_ERR(vmm_vcpu);



	if (vcpu->vcpu_id == 0) {

	if (kvm_vcpu_is_bsp(vcpu)) {

		vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;



		/*Set entry address for first run.*/

arch/ia64/kvm/vcpu.c

+1 −1
Original line number Diff line number Diff line
@@ -830,7 +830,7 @@ static void vcpu_set_itc(struct kvm_vcpu *vcpu, u64 val) 


	kvm = (struct kvm *)KVM_VM_BASE;



	if (vcpu->vcpu_id == 0) {

	if (kvm_vcpu_is_bsp(vcpu)) {

		for (i = 0; i < kvm->arch.online_vcpus; i++) {

			v = (struct kvm_vcpu *)((char *)vcpu +

					sizeof(struct kvm_vcpu_data) * i);

arch/x86/kvm/i8254.c

+2 −2
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ int pit_has_pending_timer(struct kvm_vcpu *vcpu) 
{

	struct kvm_pit *pit = vcpu->kvm->arch.vpit;



	if (pit && vcpu->vcpu_id == 0 && pit->pit_state.irq_ack)

	if (pit && kvm_vcpu_is_bsp(vcpu) && pit->pit_state.irq_ack)

		return atomic_read(&pit->pit_state.pit_timer.pending);

	return 0;

}
@@ -252,7 +252,7 @@ void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu) 
	struct kvm_pit *pit = vcpu->kvm->arch.vpit;

	struct hrtimer *timer;



	if (vcpu->vcpu_id != 0 || !pit)

	if (!kvm_vcpu_is_bsp(vcpu) || !pit)

		return;



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

arch/x86/kvm/i8259.c

+3 −3
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static void pic_unlock(struct kvm_pic *s) 
	}



	if (wakeup) {

		vcpu = s->kvm->vcpus[0];

		vcpu = s->kvm->bsp_vcpu;

		if (vcpu)

			kvm_vcpu_kick(vcpu);

	}
@@ -254,7 +254,7 @@ void kvm_pic_reset(struct kvm_kpic_state *s) 
{

	int irq, irqbase, n;

	struct kvm *kvm = s->pics_state->irq_request_opaque;

	struct kvm_vcpu *vcpu0 = kvm->vcpus[0];

	struct kvm_vcpu *vcpu0 = kvm->bsp_vcpu;



	if (s == &s->pics_state->pics[0])

		irqbase = 0;
@@ -512,7 +512,7 @@ static void picdev_read(struct kvm_io_device *this, 
static void pic_irq_request(void *opaque, int level)

{

	struct kvm *kvm = opaque;

	struct kvm_vcpu *vcpu = kvm->vcpus[0];

	struct kvm_vcpu *vcpu = kvm->bsp_vcpu;

	struct kvm_pic *s = pic_irqchip(kvm);

	int irq = pic_get_irq(&s->pics[0]);

arch/x86/kvm/lapic.c

+4 −3
Original line number Diff line number Diff line
@@ -793,7 +793,8 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value) 
		vcpu->arch.apic_base = value;

		return;

	}

	if (apic->vcpu->vcpu_id)



	if (!kvm_vcpu_is_bsp(apic->vcpu))

		value &= ~MSR_IA32_APICBASE_BSP;



	vcpu->arch.apic_base = value;
@@ -844,7 +845,7 @@ void kvm_lapic_reset(struct kvm_vcpu *vcpu) 
	}

	update_divide_count(apic);

	atomic_set(&apic->lapic_timer.pending, 0);

	if (vcpu->vcpu_id == 0)

	if (kvm_vcpu_is_bsp(vcpu))

		vcpu->arch.apic_base |= MSR_IA32_APICBASE_BSP;

	apic_update_ppr(apic);
@@ -985,7 +986,7 @@ int kvm_apic_accept_pic_intr(struct kvm_vcpu *vcpu) 
	u32 lvt0 = apic_get_reg(vcpu->arch.apic, APIC_LVT0);

	int r = 0;



	if (vcpu->vcpu_id == 0) {

	if (kvm_vcpu_is_bsp(vcpu)) {

		if (!apic_hw_enabled(vcpu->arch.apic))

			r = 1;

		if ((lvt0 & APIC_LVT_MASKED) == 0 &&