This patch series refactors the ARMv7M NVIC so it no longer textually includes arm_gic.c Instead we have a single common base class which has the state struct, and a subclass for the GIC and another for the NVIC.
As well as being generally rather nicer, this lays the groundwork for supporting a KVM in-kernel irqchip by getting the NVIC out of our hair. (My current KVM support code is another couple of patches on top of this which add a third subclass of ARMGICCommon which is the KVM model.) (Not intended for 1.1, but I expect I'll put it into my arm-devs.next tree to go a pullreq after master reopens for 1.2.) Peter Maydell (9): hw/arm_gic: Remove NVIC ifdefs from gic_state struct hw/arm_gic: Remove the special casing of NCPU for the NVIC hw/arm_gic: Move NVIC specific reset to armv7m_nvic_reset hw/armv7m_nvic: Use MemoryRegions for NVIC specific registers hw/arm_gic: Add qdev property for GIC revision hw/arm_gic: Make CPU target registers RAZ/WI on uniprocessor hw/arm_gic.c: Make NVIC interrupt numbering a runtime setting hw/arm_gic: Move CPU interface memory region setup into arm_gic_init hw/armv7m_nvic: Make the NVIC a freestanding class Makefile.target | 2 +- hw/a15mpcore.c | 1 + hw/arm11mpcore.c | 2 + hw/arm_gic.c | 366 ++++++++----------------------------------------- hw/arm_gic_common.c | 184 +++++++++++++++++++++++++ hw/arm_gic_internal.h | 136 ++++++++++++++++++ hw/armv7m_nvic.c | 138 ++++++++++++++++--- 7 files changed, 501 insertions(+), 328 deletions(-) create mode 100644 hw/arm_gic_common.c create mode 100644 hw/arm_gic_internal.h
