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: Sheng Yang <sheng@linux.intel.com> Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
parent
e5871be0f5
commit
110c2faeba
|
@ -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,
|
static struct kvm_lapic *kvm_apic_round_robin(struct kvm *kvm, u8 vector,
|
||||||
unsigned long bitmap)
|
unsigned long *bitmap)
|
||||||
{
|
{
|
||||||
int last;
|
int last;
|
||||||
int next;
|
int next;
|
||||||
|
@ -421,7 +421,7 @@ static struct kvm_lapic *kvm_apic_round_robin(struct kvm *kvm, u8 vector,
|
||||||
do {
|
do {
|
||||||
if (++next == KVM_MAX_VCPUS)
|
if (++next == KVM_MAX_VCPUS)
|
||||||
next = 0;
|
next = 0;
|
||||||
if (kvm->vcpus[next] == NULL || !test_bit(next, &bitmap))
|
if (kvm->vcpus[next] == NULL || !test_bit(next, bitmap))
|
||||||
continue;
|
continue;
|
||||||
apic = kvm->vcpus[next]->arch.apic;
|
apic = kvm->vcpus[next]->arch.apic;
|
||||||
if (apic && apic_enabled(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,
|
struct kvm_vcpu *kvm_get_lowest_prio_vcpu(struct kvm *kvm, u8 vector,
|
||||||
unsigned long bitmap)
|
unsigned long *bitmap)
|
||||||
{
|
{
|
||||||
struct kvm_lapic *apic;
|
struct kvm_lapic *apic;
|
||||||
|
|
||||||
|
@ -508,7 +508,7 @@ static void apic_send_ipi(struct kvm_lapic *apic)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (delivery_mode == APIC_DM_LOWEST) {
|
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)
|
if (target != NULL)
|
||||||
__apic_accept_irq(target->arch.apic, delivery_mode,
|
__apic_accept_irq(target->arch.apic, delivery_mode,
|
||||||
vector, level, trig_mode);
|
vector, level, trig_mode);
|
||||||
|
|
|
@ -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,
|
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);
|
void kvm_ioapic_update_eoi(struct kvm *kvm, int vector, int trigger_mode);
|
||||||
int kvm_ioapic_init(struct kvm *kvm);
|
int kvm_ioapic_init(struct kvm *kvm);
|
||||||
int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int level);
|
int kvm_ioapic_set_irq(struct kvm_ioapic *ioapic, int irq, int level);
|
||||||
|
|
|
@ -55,7 +55,7 @@ void kvm_get_intr_delivery_bitmask(struct kvm_ioapic *ioapic,
|
||||||
switch (entry->fields.delivery_mode) {
|
switch (entry->fields.delivery_mode) {
|
||||||
case IOAPIC_LOWEST_PRIORITY:
|
case IOAPIC_LOWEST_PRIORITY:
|
||||||
vcpu = kvm_get_lowest_prio_vcpu(ioapic->kvm,
|
vcpu = kvm_get_lowest_prio_vcpu(ioapic->kvm,
|
||||||
entry->fields.vector, *deliver_bitmask);
|
entry->fields.vector, deliver_bitmask);
|
||||||
*deliver_bitmask = 1 << vcpu->vcpu_id;
|
*deliver_bitmask = 1 << vcpu->vcpu_id;
|
||||||
break;
|
break;
|
||||||
case IOAPIC_FIXED:
|
case IOAPIC_FIXED:
|
||||||
|
|
Loading…
Reference in a new issue