As the Notifier struct contains everything it needs to get removed from the notifiers list, there is no need in ioapic_remove_gsi_eoi_notifier(). This patch removes it.
Signed-off-by: Alexey Kardashevskiy <a...@ozlabs.ru> --- hw/ioapic.c | 19 ++----------------- hw/ioapic.h | 1 - 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/hw/ioapic.c b/hw/ioapic.c index a6e0387..ead1b5f 100644 --- a/hw/ioapic.c +++ b/hw/ioapic.c @@ -139,8 +139,7 @@ void ioapic_eoi_broadcast(int vector) } } -static void ioapic_update_gsi_eoi_notifier(Notifier *notify, uint32_t gsi, - bool add) +void ioapic_add_gsi_eoi_notifier(Notifier *notify, uint32_t gsi) { IOAPICCommonState *s; int i; @@ -159,25 +158,11 @@ static void ioapic_update_gsi_eoi_notifier(Notifier *notify, uint32_t gsi, continue; } - if (add) { - notifier_list_add(&s->eoi_notifiers[pin], notify); - } else { - notifier_remove(notify); - } + notifier_list_add(&s->eoi_notifiers[pin], notify); return; } } -void ioapic_add_gsi_eoi_notifier(Notifier *notify, uint32_t gsi) -{ - ioapic_update_gsi_eoi_notifier(notify, gsi, true); -} - -void ioapic_remove_gsi_eoi_notifier(Notifier *notify, uint32_t gsi) -{ - ioapic_update_gsi_eoi_notifier(notify, gsi, false); -} - static uint64_t ioapic_mem_read(void *opaque, target_phys_addr_t addr, unsigned int size) { diff --git a/hw/ioapic.h b/hw/ioapic.h index a28fada..2d7d6a2 100644 --- a/hw/ioapic.h +++ b/hw/ioapic.h @@ -27,6 +27,5 @@ void ioapic_eoi_broadcast(int vector); void ioapic_add_gsi_eoi_notifier(Notifier *notify, uint32_t gsi); -void ioapic_remove_gsi_eoi_notifier(Notifier *notify, uint32_t gsi); #endif /* !HW_IOAPIC_H */ -- 1.7.10.4