Set TYPE_VIRT_MACHINE to MACHINE_TYPE_NAME("arm-virt") so ARM virt
no longer collides with other virt-machine types in one process.
Keep the -M / help / migration name as virt-* via
machine_class_set_name().Signed-off-by: Yonggang Luo <[email protected]> --- hw/arm/virt.c | 3 ++- include/hw/arm/virt.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index c2ace7706f1..ee71974e67a 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -124,13 +124,14 @@ static void arm_virt_compat_default_set(MachineClass *mc) MACHINE_VER_SYM(options, virt, __VA_ARGS__)(mc); \ mc->desc = "QEMU " MACHINE_VER_STR(__VA_ARGS__) " ARM Virtual Machine"; \ MACHINE_VER_DEPRECATION(__VA_ARGS__); \ + machine_class_set_name(mc, "virt-" MACHINE_VER_STR(__VA_ARGS__)); \ if (latest) { \ mc->alias = "virt"; \ } \ } \ 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__), \ .interfaces = type_target_specific, \ 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.52.0.windows.1
