This introduces a globally unique QOM typename 'riscv-virt' for the virt machine type.
An alias is added to resolve existing convenience name 'virt'. Signed-off-by: Daniel P. Berrangé <[email protected]> --- hw/riscv/virt.c | 9 ++++++++- include/hw/riscv/virt.h | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 8bc5a7b0728..2901f67d796 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -61,6 +61,7 @@ #include "qapi/qapi-type-infos-common.h" #include "hw/virtio/virtio-iommu.h" #include "hw/uefi/var-service-api.h" +#include "qom/object_interfaces.h" #include "aia.h" @@ -1123,6 +1124,10 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data) { MachineClass *mc = MACHINE_CLASS(oc); HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc); + AliasedClass *alc = ALIASED_CLASS(oc); + static const char *const aliases[] = { + MACHINE_TYPE_NAME("virt"), NULL, + }; mc->desc = "RISC-V VirtIO board"; mc->init = virt_machine_init; @@ -1141,6 +1146,8 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data) assert(!mc->get_hotplug_handler); mc->get_hotplug_handler = virt_machine_get_hotplug_handler; + alc->aliases = aliases; + hc->plug = virt_machine_device_plug_cb; machine_class_allow_dynamic_sysbus_dev(mc, TYPE_RAMFB_DEVICE); @@ -1188,7 +1195,7 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data) } static const TypeInfo virt_machine_typeinfo = { - .name = MACHINE_TYPE_NAME("virt"), + .name = MACHINE_TYPE_NAME("riscv-virt"), .parent = TYPE_MACHINE, .class_init = virt_machine_class_init, .secure = true, diff --git a/include/hw/riscv/virt.h b/include/hw/riscv/virt.h index 6e4fbf4b647..5e7fc8a0c8f 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.56.1
