Commit 110c2fae authored by Sheng Yang's avatar Sheng Yang Committed by Avi Kivity
Browse files

KVM: Update intr delivery func to accept unsigned long* bitmap 



Would be used with bit ops, and would be easily extended if KVM_MAX_VCPUS is
increased.

Signed-off-by: default avatarSheng Yang <sheng@linux.intel.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent e5871be0

arch/x86/kvm/lapic.c

+4 −4
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode, 
}



static struct kvm_lapic *kvm_apic_round_robin(struct kvm *kvm, u8 vector,

				       unsigned long bitmap)

				       unsigned long *bitmap)

{

	int last;

	int next;
@@ -421,7 +421,7 @@ static struct kvm_lapic *kvm_apic_round_robin(struct kvm *kvm, u8 vector, 
	do {

		if (++next == KVM_MAX_VCPUS)

			next = 0;

		if (kvm->vcpus[next] == NULL || !test_bit(next, &bitmap))

		if (kvm->vcpus[next] == NULL || !test_bit(next, bitmap))

			continue;

		apic = kvm->vcpus[next]->arch.apic;

		if (apic && apic_enabled(apic))
@@ -437,7 +437,7 @@ static struct kvm_lapic *kvm_apic_round_robin(struct kvm *kvm, u8 vector, 
}



struct kvm_vcpu *kvm_get_lowest_prio_vcpu(struct kvm *kvm, u8 vector,

		unsigned long bitmap)

		unsigned long *bitmap)

{

	struct kvm_lapic *apic;
@@ -508,7 +508,7 @@ static void apic_send_ipi(struct kvm_lapic *apic) 
	}



	if (delivery_mode == APIC_DM_LOWEST) {

		target = kvm_get_lowest_prio_vcpu(vcpu->kvm, vector, lpr_map);

		target = kvm_get_lowest_prio_vcpu(vcpu->kvm, vector, &lpr_map);

		if (target != NULL)

			__apic_accept_irq(target->arch.apic, delivery_mode,

					  vector, level, trig_mode);

virt/kvm/ioapic.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static inline struct kvm_ioapic *ioapic_irqchip(struct kvm *kvm) 
}



struct kvm_vcpu *kvm_get_lowest_prio_vcpu(struct kvm *kvm, u8 vector,

				       unsigned long bitmap);

				       unsigned long *bitmap);

void kvm_ioapic_update_eoi(struct kvm *kvm, int vector, int trigger_mode);

int kvm_ioapic_init(struct kvm *kvm);

int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int level);

virt/kvm/irq_comm.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ void kvm_get_intr_delivery_bitmask(struct kvm_ioapic *ioapic, 
	switch (entry->fields.delivery_mode) {

	case IOAPIC_LOWEST_PRIORITY:

		vcpu = kvm_get_lowest_prio_vcpu(ioapic->kvm,

				entry->fields.vector, *deliver_bitmask);

				entry->fields.vector, deliver_bitmask);

		*deliver_bitmask = 1 << vcpu->vcpu_id;

		break;

	case IOAPIC_FIXED: