From d9dd5dad3116bd5335bbd0be70aff70399d2ade4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 15 Jan 2026 15:26:29 +0000 Subject: [PATCH] hw/arm: Re-enable the MAX78000FTHR machine in qemu-system-arm/aarch64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unfortunately while rebasing the series registering the ARM/Aarch64 machine interfaces and getting it merged as commit 38c5ab40031 ("hw/arm: Filter machine types for qemu-system-arm/aarch64 binaries") we missed the recent addition of the MAX78000FTHR machine in commit 51eb283dd0e. Correct that. The effect is that the machine was accidentally disabled. Cc: qemu-stable@nongnu.org Reported-by: Thomas Huth Tested-by: Thomas Huth Tested-by: Markus Armbruster Signed-off-by: Philippe Mathieu-Daudé Message-id: 20251218214306.63667-1-philmd@linaro.org Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3248 Fixes: 38c5ab40031 ("hw/arm: Filter machine types for single binary") Signed-off-by: Peter Maydell (cherry picked from commit c5712ad83fa4bf2f2a4e8fc9431ad9548bac2b06) Signed-off-by: Michael Tokarev --- hw/arm/max78000fthr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/arm/max78000fthr.c b/hw/arm/max78000fthr.c index c4f6b5b1b0..ccef85e456 100644 --- a/hw/arm/max78000fthr.c +++ b/hw/arm/max78000fthr.c @@ -12,6 +12,7 @@ #include "hw/qdev-properties.h" #include "hw/qdev-clock.h" #include "qemu/error-report.h" +#include "hw/arm/machines-qom.h" #include "hw/arm/max78000_soc.h" #include "hw/arm/boot.h" @@ -47,4 +48,4 @@ static void max78000_machine_init(MachineClass *mc) mc->valid_cpu_types = valid_cpu_types; } -DEFINE_MACHINE("max78000fthr", max78000_machine_init) +DEFINE_MACHINE_ARM("max78000fthr", max78000_machine_init)