kvm: Refactor KVMState::max_gsi to gsi_count
Instead of the bitmap size, store the maximum of GSIs the kernel support. Move the GSI limit assertion to the API function kvm_irqchip_add_route and make it stricter. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
parent
3145fcb605
commit
4e2e4e6355
|
@ -86,7 +86,7 @@ struct KVMState
|
||||||
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;
|
uint32_t *used_gsi_bitmap;
|
||||||
unsigned int max_gsi;
|
unsigned int gsi_count;
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -859,8 +859,6 @@ int kvm_irqchip_set_irq(KVMState *s, int irq, int level)
|
||||||
#ifdef KVM_CAP_IRQ_ROUTING
|
#ifdef KVM_CAP_IRQ_ROUTING
|
||||||
static void set_gsi(KVMState *s, unsigned int gsi)
|
static void set_gsi(KVMState *s, unsigned int gsi)
|
||||||
{
|
{
|
||||||
assert(gsi < s->max_gsi);
|
|
||||||
|
|
||||||
s->used_gsi_bitmap[gsi / 32] |= 1U << (gsi % 32);
|
s->used_gsi_bitmap[gsi / 32] |= 1U << (gsi % 32);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -875,7 +873,7 @@ static void kvm_init_irq_routing(KVMState *s)
|
||||||
/* Round up so we can search ints using ffs */
|
/* Round up so we can search ints using ffs */
|
||||||
gsi_bits = ALIGN(gsi_count, 32);
|
gsi_bits = ALIGN(gsi_count, 32);
|
||||||
s->used_gsi_bitmap = g_malloc0(gsi_bits / 8);
|
s->used_gsi_bitmap = g_malloc0(gsi_bits / 8);
|
||||||
s->max_gsi = gsi_bits;
|
s->gsi_count = gsi_count;
|
||||||
|
|
||||||
/* Mark any over-allocated bits as already in use */
|
/* Mark any over-allocated bits as already in use */
|
||||||
for (i = gsi_count; i < gsi_bits; i++) {
|
for (i = gsi_count; i < gsi_bits; i++) {
|
||||||
|
@ -920,6 +918,8 @@ void kvm_irqchip_add_route(KVMState *s, int irq, int irqchip, int pin)
|
||||||
{
|
{
|
||||||
struct kvm_irq_routing_entry e;
|
struct kvm_irq_routing_entry e;
|
||||||
|
|
||||||
|
assert(pin < s->gsi_count);
|
||||||
|
|
||||||
e.gsi = irq;
|
e.gsi = irq;
|
||||||
e.type = KVM_IRQ_ROUTING_IRQCHIP;
|
e.type = KVM_IRQ_ROUTING_IRQCHIP;
|
||||||
e.flags = 0;
|
e.flags = 0;
|
||||||
|
|
Loading…
Reference in New Issue