pvpanic is supported on ARM VIRT MACHINE as an MMIO device, no need for an ISA bus.
Signed-off-by: Mihai Carabas <mihai.cara...@oracle.com> --- hw/arm/Kconfig | 1 + hw/misc/Kconfig | 2 +- hw/misc/pvpanic.c | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index f303c6b..0dd570b 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -26,6 +26,7 @@ config ARM_VIRT select ACPI_MEMORY_HOTPLUG select ACPI_HW_REDUCED select ACPI_NVDIMM + select PVPANIC config CHEETAH bool diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index 3185456..5924e70 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -117,7 +117,7 @@ config IOTKIT_SYSINFO config PVPANIC bool - depends on ISA_BUS + depends on ISA_BUS || ARM_VIRT config AUX bool diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c index 136f1d6..a70adb8 100644 --- a/hw/misc/pvpanic.c +++ b/hw/misc/pvpanic.c @@ -105,6 +105,7 @@ static const MemoryRegionOps pvpanic_ops = { }, }; +#ifdef CONFIG_ISA_BUS static void pvpanic_isa_initfn(Object *obj) { PVPanicISAState *s = PVPANIC_ISA_DEVICE(obj); @@ -152,6 +153,7 @@ static TypeInfo pvpanic_isa_info = { .instance_init = pvpanic_isa_initfn, .class_init = pvpanic_isa_class_init, }; +#endif static void pvpanic_mmio_initfn(Object *obj) { @@ -180,7 +182,9 @@ static TypeInfo pvpanic_mmio_info = { static void pvpanic_register_types(void) { +#ifdef CONFIG_ISA_BUS type_register_static(&pvpanic_isa_info); +#endif type_register_static(&pvpanic_mmio_info); } -- 1.8.3.1