[PATCH] hw/arm: Re-enable the MAX78000FTHR machine in qemu-system-arm/aarch64

[PATCH] hw/arm: Re-enable the MAX78000FTHR machine in qemu-system-arm/aarch64

[Philippe Mathieu-Daudé]

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.

Reported-by: Thomas Huth <thuth@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3248
Fixes: 38c5ab40031 ("hw/arm: Filter machine types for single binary")
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 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 c4f6b5b1b04..ccef85e456f 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)
-- 
2.52.0

Re: [PATCH] hw/arm: Re-enable the MAX78000FTHR machine in qemu-system-arm/aarch64

[Philippe Mathieu-Daudé]

On 18/12/25 22:43, Philippe Mathieu-Daudé wrote:
> 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.
> 
> Reported-by: Thomas Huth <thuth@redhat.com>
> Tested-by: Thomas Huth <thuth@redhat.com>
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3248

We have a functional test for this machine
(tests/functional/arm/test_max78000fthr.py)
so I don't understand how we missed this.

> Fixes: 38c5ab40031 ("hw/arm: Filter machine types for single binary")
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/arm/max78000fthr.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)

Re: [PATCH] hw/arm: Re-enable the MAX78000FTHR machine in qemu-system-arm/aarch64

[Thomas Huth]

On 19/12/2025 10.02, Philippe Mathieu-Daudé wrote:
> On 18/12/25 22:43, Philippe Mathieu-Daudé wrote:
>> 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.
>>
>> Reported-by: Thomas Huth <thuth@redhat.com>
>> Tested-by: Thomas Huth <thuth@redhat.com>
>> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3248
> 
> We have a functional test for this machine
> (tests/functional/arm/test_max78000fthr.py)
> so I don't understand how we missed this.

The functional tests are skipped if a machine is not available in the 
binary, otherwise the test would fail if you'd configure your QEMU with less 
machines.

  Thomas

Re: [PATCH] hw/arm: Re-enable the MAX78000FTHR machine in qemu-system-arm/aarch64

[Philippe Mathieu-Daudé]

On 18/12/25 22:43, Philippe Mathieu-Daudé wrote:
> 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.
> 
> Reported-by: Thomas Huth <thuth@redhat.com>
> Tested-by: Thomas Huth <thuth@redhat.com>
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3248
> Fixes: 38c5ab40031 ("hw/arm: Filter machine types for single binary")
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/arm/max78000fthr.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)

Per https://lore.kernel.org/qemu-devel/87ms3e6a79.fsf@pond.sub.org/:
Tested-by: Markus Armbruster <armbru@redhat.com>

Re: [PATCH] hw/arm: Re-enable the MAX78000FTHR machine in qemu-system-arm/aarch64

[Markus Armbruster]

Philippe Mathieu-Daudé <philmd@linaro.org> writes:

> On 18/12/25 22:43, Philippe Mathieu-Daudé wrote:
>> 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.
>> 
>> Reported-by: Thomas Huth <thuth@redhat.com>
>> Tested-by: Thomas Huth <thuth@redhat.com>
>> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3248
>> Fixes: 38c5ab40031 ("hw/arm: Filter machine types for single binary")
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>> ---
>>   hw/arm/max78000fthr.c | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> Per https://lore.kernel.org/qemu-devel/87ms3e6a79.fsf@pond.sub.org/:
> Tested-by: Markus Armbruster <armbru@redhat.com>

Fair :)

Re: [PATCH] hw/arm: Re-enable the MAX78000FTHR machine in qemu-system-arm/aarch64

[Peter Maydell]

On Thu, 18 Dec 2025 at 21:43, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>
> 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.
>
> Reported-by: Thomas Huth <thuth@redhat.com>
> Tested-by: Thomas Huth <thuth@redhat.com>
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3248
> Fixes: 38c5ab40031 ("hw/arm: Filter machine types for single binary")
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>  hw/arm/max78000fthr.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Applied to target-arm.next, thanks.

Should we cc stable? (My feeling is 'yes'.)

-- PMM

Re: [PATCH] hw/arm: Re-enable the MAX78000FTHR machine in qemu-system-arm/aarch64

[Thomas Huth]

On 12/01/2026 15.42, Peter Maydell wrote:
> On Thu, 18 Dec 2025 at 21:43, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>>
>> 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.
>>
>> Reported-by: Thomas Huth <thuth@redhat.com>
>> Tested-by: Thomas Huth <thuth@redhat.com>
>> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3248
>> Fixes: 38c5ab40031 ("hw/arm: Filter machine types for single binary")
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>> ---
>>   hw/arm/max78000fthr.c | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> Applied to target-arm.next, thanks.
> 
> Should we cc stable? (My feeling is 'yes'.)

The bug went into 10.2, so I'd say "yes".

  Thomas