Likely, we will never support alternative irqchips to the GIC (only cascaded ones). So this copying-over is not required.
Signed-off-by: Jan Kiszka <[email protected]> --- hypervisor/arch/arm/gic-v2.c | 2 +- hypervisor/arch/arm/gic-v3.c | 2 +- hypervisor/arch/arm/irqchip.c | 7 ++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/hypervisor/arch/arm/gic-v2.c b/hypervisor/arch/arm/gic-v2.c index 8f5fc0b..ff0036b 100644 --- a/hypervisor/arch/arm/gic-v2.c +++ b/hypervisor/arch/arm/gic-v2.c @@ -293,7 +293,7 @@ unsigned int irqchip_mmio_count_regions(struct cell *cell) return 1; } -struct irqchip_ops gic_irqchip = { +struct irqchip_ops irqchip = { .init = gic_init, .cpu_init = gic_cpu_init, .cpu_reset = gic_cpu_reset, diff --git a/hypervisor/arch/arm/gic-v3.c b/hypervisor/arch/arm/gic-v3.c index 4ab03ad..b422200 100644 --- a/hypervisor/arch/arm/gic-v3.c +++ b/hypervisor/arch/arm/gic-v3.c @@ -410,7 +410,7 @@ unsigned int irqchip_mmio_count_regions(struct cell *cell) return 2; } -struct irqchip_ops gic_irqchip = { +struct irqchip_ops irqchip = { .init = gic_init, .cpu_init = gic_cpu_init, .cpu_reset = gic_cpu_reset, diff --git a/hypervisor/arch/arm/irqchip.c b/hypervisor/arch/arm/irqchip.c index 26b3026..0b1193c 100644 --- a/hypervisor/arch/arm/irqchip.c +++ b/hypervisor/arch/arm/irqchip.c @@ -24,6 +24,8 @@ /* AMBA's biosfood */ #define AMBA_DEVICE 0xb105f00d +extern struct irqchip_ops irqchip; + void *gicd_base; unsigned long gicd_size; @@ -32,7 +34,6 @@ unsigned long gicd_size; * per-cpu setup, which means that a bool must be set by the master CPU */ static bool irqchip_is_init; -static struct irqchip_ops irqchip; bool spi_in_cell(struct cell *cell, unsigned int spi) { @@ -189,9 +190,6 @@ void irqchip_root_cell_shrink(struct cell *cell) root_cell.arch.spis &= ~(cell->arch.spis); } -/* Only the GIC is implemented */ -extern struct irqchip_ops gic_irqchip; - int irqchip_init(void) { int i, err; @@ -222,7 +220,6 @@ int irqchip_init(void) case 0x2: case 0x3: case 0x4: - memcpy(&irqchip, &gic_irqchip, sizeof(struct irqchip_ops)); break; default: goto err_no_distributor; -- 2.1.4 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
