Implement a gicv5_class_name() function that does the same job as gicv3_class_name(): allows board code to get the correct QOM type for the GIC at runtime depending on whether KVM is enabled or not.
For the GICv5, we don't yet implement KVM support, so the KVM-enabled codepath is always an error. Signed-off-by: Peter Maydell <[email protected]> --- hw/intc/arm_gicv5_common.c | 12 ++++++++++++ include/hw/intc/arm_gicv5_common.h | 10 ++++++++++ 2 files changed, 22 insertions(+) diff --git a/hw/intc/arm_gicv5_common.c b/hw/intc/arm_gicv5_common.c index 274d8cd255..620ae3b88f 100644 --- a/hw/intc/arm_gicv5_common.c +++ b/hw/intc/arm_gicv5_common.c @@ -11,6 +11,8 @@ #include "hw/core/qdev-properties.h" #include "qapi/error.h" #include "trace.h" +#include "qemu/error-report.h" +#include "system/kvm.h" OBJECT_DEFINE_ABSTRACT_TYPE(GICv5Common, gicv5_common, ARM_GICV5_COMMON, SYS_BUS_DEVICE) @@ -157,3 +159,13 @@ static void gicv5_common_class_init(ObjectClass *oc, const void *data) dc->realize = gicv5_common_realize; device_class_set_props(dc, arm_gicv5_common_properties); } + +const char *gicv5_class_name(void) +{ + /* When we implement KVM GICv5 we might return "kvm-arm-gicv5" here. */ + if (kvm_enabled()) { + error_report("Userspace GICv5 is not supported with KVM"); + exit(1); + } + return "arm-gicv5"; +} diff --git a/include/hw/intc/arm_gicv5_common.h b/include/hw/intc/arm_gicv5_common.h index 3bffa2cb1d..7db2c87ddc 100644 --- a/include/hw/intc/arm_gicv5_common.h +++ b/include/hw/intc/arm_gicv5_common.h @@ -150,4 +150,14 @@ static inline bool gicv5_domain_implemented(GICv5Common *cs, GICv5Domain domain) return cs->implemented_domains & (1 << domain); } +/** + * gicv5_class_name + * + * Return name of GICv5 class to use depending on whether KVM acceleration is + * in use. May throw an error if the chosen implementation is not available. + * + * Returns: class name to use + */ +const char *gicv5_class_name(void); + #endif -- 2.43.0
