This introduces a globally unique QOM typename 'arm-virt' for the virt machine types.
Aliases are added to resolve existing convenience names 'virt-$VER' and 'virt'. Signed-off-by: Daniel P. Berrangé <[email protected]> --- hw/arm/virt.c | 17 +++++++++++++++-- include/hw/arm/virt.h | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 60385971b6a..6217771032e 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -127,7 +127,7 @@ static void arm_virt_compat_default_set(MachineClass *mc) } \ static const TypeInfo MACHINE_VER_SYM(info, virt, __VA_ARGS__) = \ { \ - .name = MACHINE_VER_TYPE_NAME("virt", __VA_ARGS__), \ + .name = MACHINE_VER_TYPE_NAME("arm-virt", __VA_ARGS__), \ .parent = TYPE_VIRT_MACHINE, \ .class_init = MACHINE_VER_SYM(class_init, virt, __VA_ARGS__), \ .is_available = target_base_arm, \ @@ -145,6 +145,17 @@ static void arm_virt_compat_default_set(MachineClass *mc) static const char *const MACHINE_VER_SYM(aliases, virt, __VA_ARGS__)[] = \ { \ MACHINE_TYPE_NAME("virt"), \ + MACHINE_VER_TYPE_NAME("virt", __VA_ARGS__), \ + MACHINE_TYPE_NAME("arm-virt"), \ + NULL, \ + }; \ + alc->aliases = MACHINE_VER_SYM(aliases, virt, __VA_ARGS__) + +#define DEFINE_VIRT_MACHINE_ALIASES(...) \ + AliasedClass *alc = ALIASED_CLASS(oc); \ + static const char *const MACHINE_VER_SYM(aliases, virt, __VA_ARGS__)[] = \ + { \ + MACHINE_VER_TYPE_NAME("virt", __VA_ARGS__), \ NULL, \ }; \ alc->aliases = MACHINE_VER_SYM(aliases, virt, __VA_ARGS__) @@ -154,7 +165,9 @@ static void arm_virt_compat_default_set(MachineClass *mc) DEFINE_VIRT_MACHINE_ALIASES_LATEST(major, minor); \ }, major, minor) #define DEFINE_VIRT_MACHINE(major, minor) \ - DEFINE_VIRT_MACHINE_IMPL({}, major, minor) + DEFINE_VIRT_MACHINE_IMPL({ \ + DEFINE_VIRT_MACHINE_ALIASES(major, minor); \ + }, major, minor) /* Number of external interrupt lines to configure the GIC with */ diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 22e66d1a113..383ee320948 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -215,7 +215,7 @@ struct VirtMachineState { #define VIRT_ECAM_ID(high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM) -#define TYPE_VIRT_MACHINE MACHINE_TYPE_NAME("virt") +#define TYPE_VIRT_MACHINE MACHINE_TYPE_NAME("arm-virt") OBJECT_DECLARE_TYPE(VirtMachineState, VirtMachineClass, VIRT_MACHINE) void virt_acpi_setup(VirtMachineState *vms); -- 2.56.1
