From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Thu, 17 Apr 2025 22:44:24 +0000 (+0200)
Subject: hw/core: Allow ARM/Aarch64 binaries to use the 'none' machine
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb796c55513d9d39bf7ef40eec367098b16edd7f;p=thirdparty%2Fqemu.git

hw/core: Allow ARM/Aarch64 binaries to use the 'none' machine

When we'll start to use target_machine_typename() to filter
machines for the ARM/Aarch64 binaries, the 'none' machine
would be filtered. Register the proper interfaces to keep
it available.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20251021205741.57109-3-philmd@linaro.org>
---

diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c
index a6e477a2d8..67b769bd3e 100644
--- a/hw/core/null-machine.c
+++ b/hw/core/null-machine.c
@@ -16,6 +16,7 @@
 #include "hw/boards.h"
 #include "system/address-spaces.h"
 #include "hw/core/cpu.h"
+#include "hw/arm/machines-qom.h"
 
 static void machine_none_init(MachineState *mch)
 {
@@ -55,4 +56,7 @@ static void machine_none_machine_init(MachineClass *mc)
     mc->no_cdrom = 1;
 }
 
-DEFINE_MACHINE("none", machine_none_machine_init)
+DEFINE_MACHINE_WITH_INTERFACES("none", machine_none_machine_init,
+                               { TYPE_TARGET_AARCH64_MACHINE },
+                               { TYPE_TARGET_ARM_MACHINE },
+                               { })