On 21/10/25 07:41, Jan Kiszka wrote:
On 21.10.25 00:09, Philippe Mathieu-Daudé wrote:
Register machines to be able to run with the qemu-system-arm
and qemu-system-aarch64 binaries, except few machines which
are only available on the qemu-system-aarch64 binary:
...
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 329b162eb20..548c218a039 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -15,6 +15,7 @@
#include "hw/sysbus.h"
#include "migration/vmstate.h"
#include "hw/arm/boot.h"
+#include "hw/arm/machines-qom.h"
#include "net/net.h"
#include "system/system.h"
#include "hw/boards.h"
@@ -1346,7 +1347,7 @@ static void musicpal_machine_init(MachineClass *mc)
machine_add_audiodev_property(mc);
}
-DEFINE_MACHINE("musicpal", musicpal_machine_init)
+DEFINE_MACHINE_ARM_AARCH64("musicpal", musicpal_machine_init)
This is modelling a real, ancient device which only had a single CPU
type and runs the original firmware - makes no sense.
The goal of this effort is to have a single qemu-system-aarch64 binary
absorbing the qemu-system-arm one. At this point we are trying to do
preparatory work with no single change for the users.
Are you suggesting to directly add a DEFINE_MACHINE_ARM() macro for
these 32-bit only machines? This was planned to be done on top, but
maybe you are right, since we have to review this change, better
start with it now...
Wouldn't be surprised if there are more of this kind in the list.
Jan
