Commit 4e8ac6857f for qemu.org

commit 4e8ac6857faab29f8d6e149f4d71aeb057884496
Author: Peter Maydell <peter.maydell@linaro.org>
Date:   Thu May 7 20:47:23 2026 +0100

    hw/remote/machine.c: Mark x-remote machine as OK for AArch64 and AArch32

    When we updated Arm and AArch64 board types to mark them for the
    target_machine_typename() filter, we forgot about the "x-remote"
    machine type, which meant that it disappeared from the set of board
    types exposed on the qemu-system-arm and qemu-system-aarch64
    binaries.  We didn't notice this, because although we have a
    functional test for it, it requires the KVM accelerator and we don't
    run the functional tests on an AArch64 host in CI.

    Mark the machine as being OK to expose in qemu-system-arm and
    qemu-system-aarch64, in the same way we do for the "none" machine
    type. This fixes a check-functional failure on aarch64 host, where
    it would otherwise fail with:
       qemu-system-aarch64: unsupported machine type: "x-remote"

    Cc: qemu-stable@nongnu.org
    Fixes: eb796c55513d9d39 ("hw/core: Allow ARM/Aarch64 binaries to use the 'none' machine")
    Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
    Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
    Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
    Message-id: 20260507194728.2034696-2-peter.maydell@linaro.org

diff --git a/hw/remote/machine.c b/hw/remote/machine.c
index ced782f6a9..df08f64019 100644
--- a/hw/remote/machine.c
+++ b/hw/remote/machine.c
@@ -24,6 +24,7 @@
 #include "hw/core/qdev.h"
 #include "hw/remote/vfio-user-obj.h"
 #include "hw/pci/msi.h"
+#include "hw/arm/machines-qom.h"

 static void remote_machine_init(MachineState *machine)
 {
@@ -148,6 +149,8 @@ static const TypeInfo remote_machine = {
     .class_init = remote_machine_class_init,
     .interfaces = (const InterfaceInfo[]) {
         { TYPE_HOTPLUG_HANDLER },
+        { TYPE_TARGET_AARCH64_MACHINE },
+        { TYPE_TARGET_ARM_MACHINE },
         { }
     }
 };