Keep vgic_* helpers in a single place. At the same time remove gic.h
from event.h since the helpers has now been moved to vgic.h (included by
domain.h).
Signed-off-by: Julien Grall <julien.gr...@arm.com>
Reviewed-by: Andrii Anisov <andrii_ani...@epam.com>
---
Changes in v2:
- Add Andrii's reviewed-by
---
xen/include/asm-arm/event.h | 1 -
xen/include/asm-arm/gic.h | 3 ---
xen/include/asm-arm/vgic.h | 5 +++++
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/xen/include/asm-arm/event.h b/xen/include/asm-arm/event.h
index 2f51864043..b14c166ad6 100644
--- a/xen/include/asm-arm/event.h
+++ b/xen/include/asm-arm/event.h
@@ -1,7 +1,6 @@
#ifndef __ASM_EVENT_H__
#define __ASM_EVENT_H__
-#include <asm/gic.h>
#include <asm/domain.h>
void vcpu_kick(struct vcpu *v);
diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h
index 22fa122e52..fab02f19f7 100644
--- a/xen/include/asm-arm/gic.h
+++ b/xen/include/asm-arm/gic.h
@@ -249,9 +249,7 @@ extern int gic_route_irq_to_guest(struct domain *, unsigned
int virq,
int gic_remove_irq_from_guest(struct domain *d, unsigned int virq,
struct irq_desc *desc);
-extern void vgic_sync_to_lrs(void);
extern void gic_clear_pending_irqs(struct vcpu *v);
-extern int vgic_vcpu_pending_irq(struct vcpu *v);
extern void init_maintenance_interrupt(void);
extern void gic_raise_guest_irq(struct vcpu *v, unsigned int irq,
@@ -306,7 +304,6 @@ extern unsigned int gic_number_lines(void);
/* IRQ translation function for the device tree */
int gic_irq_xlate(const u32 *intspec, unsigned int intsize,
unsigned int *out_hwirq, unsigned int *out_type);
-void vgic_sync_from_lrs(struct vcpu *v);
struct gic_info {
/* GIC version */
diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h
index 0316d87f66..56ed5fe8fe 100644
--- a/xen/include/asm-arm/vgic.h
+++ b/xen/include/asm-arm/vgic.h
@@ -363,6 +363,11 @@ void vgic_v3_setup_hw(paddr_t dbase,
unsigned int intid_bits);
#endif
+void vgic_sync_to_lrs(void);
+void vgic_sync_from_lrs(struct vcpu *v);
+
+int vgic_vcpu_pending_irq(struct vcpu *v);
+
#endif /* __ASM_ARM_VGIC_H__ */
/*
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
