The comment still showed MACHINE_VER_TYPE_NAME("virt") and left out
machine_class_set_name(). Show the arm-virt QOM type, keep the -M name
as virt-<version>, and name the latest helper
DEFINE_VIRT_MACHINE_AS_LATEST.Signed-off-by: Yonggang Luo <[email protected]> --- include/hw/core/boards.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/include/hw/core/boards.h b/include/hw/core/boards.h index 851140ad052..8525e1f2288 100644 --- a/include/hw/core/boards.h +++ b/include/hw/core/boards.h @@ -474,21 +474,25 @@ struct MachineState { * For example, a macro that can be used to define versioned * 'virt' machine types would look like: * + * #define TYPE_VIRT_MACHINE MACHINE_TYPE_NAME("arm-virt") + * * #define DEFINE_VIRT_MACHINE_IMPL(latest, ...) \ * static void MACHINE_VER_SYM(class_init, virt, __VA_ARGS__)( \ * ObjectClass *oc, \ - * void *data) \ + * const void *data) \ * { \ * MachineClass *mc = MACHINE_CLASS(oc); \ * MACHINE_VER_SYM(options, virt, __VA_ARGS__)(mc); \ - * mc->desc = "QEMU " MACHINE_VER_STR(__VA_ARGS__) " Virtual Machine"; \ + * 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__), \ + * static const TypeInfo MACHINE_VER_SYM(info, 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__), \ * }; \ @@ -503,7 +507,7 @@ struct MachineState { * whichever scenarios need to be catered for with a machine: * * // Normal 2 digit, marked as latest e.g. 'virt-9.0' - * #define DEFINE_VIRT_MACHINE_LATEST(major, minor) \ + * #define DEFINE_VIRT_MACHINE_AS_LATEST(major, minor) \ * DEFINE_VIRT_MACHINE_IMPL(true, major, minor) * * // Normal 2 digit e.g. 'virt-9.0' -- 2.52.0.windows.1
