Commit 5484e94cd4 for qemu.org

commit 5484e94cd473a1ca3b799503a83911a1b9b0ff54
Author: Eric Auger <eric.auger@redhat.com>
Date:   Tue Feb 10 11:34:49 2026 +0000

    hw/arm/virt: Rename arm_virt_compat into arm_virt_compat_defaults

    Renaming arm_virt_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 <imammedo@redhat.com>
    Signed-off-by: Eric Auger <eric.auger@redhat.com>
    Reviewed-by: Sebastian Ott <sebott@redhat.com>
    Reviewed-by: Cornelia Huck <cohuck@redhat.com>
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 5c31695d37..02db6d8579 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -96,20 +96,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, ...) \
@@ -118,7 +119,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__); \