Use TYPE_RISCV_VIRT_MACHINE so the RISC-V virt QOM type does not collide with ARM virt in a combined qemu-system binary. Keep the -M / help / migration name as virt via machine_class_set_name().
Signed-off-by: Yonggang Luo <[email protected]> --- hw/riscv/virt.c | 3 ++- include/hw/riscv/virt.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index d4b501802f6..b29182cb39b 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1134,6 +1134,7 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data) HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc); mc->desc = "RISC-V VirtIO board"; + machine_class_set_name(mc, "virt"); mc->init = virt_machine_init; mc->max_cpus = VIRT_CPUS_MAX; mc->default_cpu_type = TYPE_RISCV_CPU_BASE; @@ -1197,7 +1198,7 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data) } static const TypeInfo virt_machine_typeinfo = { - .name = MACHINE_TYPE_NAME("virt"), + .name = TYPE_RISCV_VIRT_MACHINE, .parent = TYPE_MACHINE, .class_init = virt_machine_class_init, .instance_init = virt_machine_instance_init, diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index e516898f9ad..969aa5866ee 100644 --- a/include/hw/riscv/virt.h +++ b/include/hw/riscv/virt.h @@ -30,7 +30,7 @@ #define VIRT_SOCKETS_MAX_BITS 2 #define VIRT_SOCKETS_MAX (1 << VIRT_SOCKETS_MAX_BITS) -#define TYPE_RISCV_VIRT_MACHINE MACHINE_TYPE_NAME("virt") +#define TYPE_RISCV_VIRT_MACHINE MACHINE_TYPE_NAME("riscv-virt") typedef struct RISCVVirtState RISCVVirtState; DECLARE_INSTANCE_CHECKER(RISCVVirtState, RISCV_VIRT_MACHINE, TYPE_RISCV_VIRT_MACHINE) -- 2.52.0.windows.1
