Renaming arm_virtio_compat into arm_virt_compat_defaults makes more obvious that those compats apply to all machine types by default, if not overriden for specific ones. This also matches the terminology used for pc-q35.
Suggested-by: Igor Mammedov <[email protected]> Signed-off-by: Eric Auger <[email protected]> --- hw/arm/virt.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 25fb2bab56..ec0af8e6e7 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -94,20 +94,21 @@ #include "hw/cxl/cxl_host.h" #include "qemu/guest-random.h" -static GlobalProperty arm_virt_compat[] = { +static GlobalProperty arm_virt_compat_defaults[] = { { TYPE_VIRTIO_IOMMU_PCI, "aw-bits", "48" }, }; -static const size_t arm_virt_compat_len = G_N_ELEMENTS(arm_virt_compat); +static const size_t arm_virt_compat_defaults_len = + G_N_ELEMENTS(arm_virt_compat_defaults); /* * This cannot be called from the virt_machine_class_init() because * TYPE_VIRT_MACHINE is abstract and mc->compat_props g_ptr_array_new() * only is called on virt non abstract class init. */ -static void arm_virt_compat_set(MachineClass *mc) +static void arm_virt_compat_default_set(MachineClass *mc) { - compat_props_add(mc->compat_props, arm_virt_compat, - arm_virt_compat_len); + compat_props_add(mc->compat_props, arm_virt_compat_defaults, + arm_virt_compat_defaults_len); } #define DEFINE_VIRT_MACHINE_IMPL(latest, ...) \ @@ -116,7 +117,7 @@ static void arm_virt_compat_set(MachineClass *mc) const void *data) \ { \ MachineClass *mc = MACHINE_CLASS(oc); \ - arm_virt_compat_set(mc); \ + arm_virt_compat_default_set(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__); \ -- 2.52.0
