ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kvm/irqchip: use bitmap utility for gsi tracking 

By using utilities in bitops and bitmap, this patch tries to make it more
friendly to audience. No functional change.

Signed-off-by: Wei Yang <richard.weiyang@gmail.com>
Message-Id: <1457229445-25954-1-git-send-email-richard.weiyang@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Wei Yang 2016-03-06 01:57:25 +00:00 committed by Paolo Bonzini
parent a95e9a485b
commit 8269fb7082
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
kvm-all.c
View File

@ -89,7 +89,7 @@ struct KVMState
#ifdef KVM_CAP_IRQ_ROUTING #ifdef KVM_CAP_IRQ_ROUTING
struct kvm_irq_routing *irq_routes; struct kvm_irq_routing *irq_routes;
int nr_allocated_irq_routes; int nr_allocated_irq_routes;
uint32_t *used_gsi_bitmap; unsigned long *used_gsi_bitmap;
unsigned int gsi_count; unsigned int gsi_count;
QTAILQ_HEAD(msi_hashtab, KVMMSIRoute) msi_hashtab[KVM_MSI_HASHTAB_SIZE]; QTAILQ_HEAD(msi_hashtab, KVMMSIRoute) msi_hashtab[KVM_MSI_HASHTAB_SIZE];
#endif #endif
@ -951,12 +951,12 @@ typedef struct KVMMSIRoute {
static void set_gsi(KVMState *s, unsigned int gsi) static void set_gsi(KVMState *s, unsigned int gsi)
{ {
s->used_gsi_bitmap[gsi / 32] |= 1U << (gsi % 32); set_bit(gsi, s->used_gsi_bitmap);
} }
static void clear_gsi(KVMState *s, unsigned int gsi) static void clear_gsi(KVMState *s, unsigned int gsi)
{ {
s->used_gsi_bitmap[gsi / 32] &= ~(1U << (gsi % 32)); clear_bit(gsi, s->used_gsi_bitmap);
} }
void kvm_init_irq_routing(KVMState *s) void kvm_init_irq_routing(KVMState *s)
@ -965,17 +965,9 @@ void kvm_init_irq_routing(KVMState *s)
gsi_count = kvm_check_extension(s, KVM_CAP_IRQ_ROUTING) - 1; gsi_count = kvm_check_extension(s, KVM_CAP_IRQ_ROUTING) - 1;
if (gsi_count > 0) { if (gsi_count > 0) {
unsigned int gsi_bits, i;
/* Round up so we can search ints using ffs */ /* Round up so we can search ints using ffs */
gsi_bits = ALIGN(gsi_count, 32); s->used_gsi_bitmap = bitmap_new(gsi_count);
s->used_gsi_bitmap = g_malloc0(gsi_bits / 8);
s->gsi_count = gsi_count; s->gsi_count = gsi_count;
/* Mark any over-allocated bits as already in use */
for (i = gsi_count; i < gsi_bits; i++) {
set_gsi(s, i);
}
} }
s->irq_routes = g_malloc0(sizeof(*s->irq_routes)); s->irq_routes = g_malloc0(sizeof(*s->irq_routes));
@ -1105,9 +1097,7 @@ static void kvm_flush_dynamic_msi_routes(KVMState *s)
static int kvm_irqchip_get_virq(KVMState *s) static int kvm_irqchip_get_virq(KVMState *s)
{ {
uint32_t *word = s->used_gsi_bitmap; int next_virq;
int max_words = ALIGN(s->gsi_count, 32) / 32;
int i, zeroes;
/* /*
* PIC and IOAPIC share the first 16 GSI numbers, thus the available * PIC and IOAPIC share the first 16 GSI numbers, thus the available
@ -1120,16 +1110,12 @@ static int kvm_irqchip_get_virq(KVMState *s)
} }
/* Return the lowest unused GSI in the bitmap */ /* Return the lowest unused GSI in the bitmap */
for (i = 0; i < max_words; i++) { next_virq = find_first_zero_bit(s->used_gsi_bitmap, s->gsi_count);
zeroes = ctz32(~word[i]); if (next_virq >= s->gsi_count) {
if (zeroes == 32) { return -ENOSPC;
continue; } else {
} return next_virq;
return zeroes + i * 32;
} }
return -ENOSPC;
} }
static KVMMSIRoute *kvm_lookup_msi_route(KVMState *s, MSIMessage msg) static KVMMSIRoute *kvm_lookup_msi_route(KVMState *s, MSIMessage msg)