Pass each DEFINE_MACHINE its architecture mask instead of QEMU_ARCH_ALL. ARM, Alpha, M68K, MicroBlaze, RISC-V, and TriCore boards use the matching QEMU_ARCH_* value. boston-aia uses QEMU_ARCH_BIT(SYS_EMU_TARGET_RISCV64).
Signed-off-by: Yonggang Luo <[email protected]> --- hw/alpha/dp264.c | 2 +- hw/arm/digic_boards.c | 2 +- hw/arm/imx25_pdk.c | 2 +- hw/arm/kzm.c | 2 +- hw/arm/max78000fthr.c | 2 +- hw/arm/mcimx6ul-evk.c | 2 +- hw/arm/msf2-som.c | 2 +- hw/arm/netduino2.c | 2 +- hw/arm/netduinoplus2.c | 2 +- hw/arm/olimex-stm32-h405.c | 2 +- hw/arm/stm32vldiscovery.c | 2 +- hw/m68k/an5206.c | 2 +- hw/m68k/mcf5208.c | 2 +- hw/microblaze/petalogix_ml605_mmu.c | 3 ++- hw/microblaze/xlnx-zynqmp-pmu.c | 3 ++- hw/riscv/microblaze-v-generic.c | 2 +- hw/tricore/tricore_testboard.c | 2 +- 17 files changed, 19 insertions(+), 17 deletions(-) diff --git a/hw/alpha/dp264.c b/hw/alpha/dp264.c index b0b1ad5cd1..098a457a7e 100644 --- a/hw/alpha/dp264.c +++ b/hw/alpha/dp264.c @@ -213,4 +213,4 @@ static void clipper_machine_init(MachineClass *mc) mc->default_nic = "e1000"; } -DEFINE_MACHINE("clipper", clipper_machine_init, QEMU_ARCH_ALL) +DEFINE_MACHINE("clipper", clipper_machine_init, QEMU_ARCH_ALPHA) diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c index 018f2e8070..59bbcc4826 100644 --- a/hw/arm/digic_boards.c +++ b/hw/arm/digic_boards.c @@ -145,4 +145,4 @@ static void canon_a1100_machine_init(MachineClass *mc) mc->default_ram_id = "ram"; } -DEFINE_MACHINE("canon-a1100", canon_a1100_machine_init, QEMU_ARCH_ALL) +DEFINE_MACHINE("canon-a1100", canon_a1100_machine_init, QEMU_ARCH_ARM) diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c index 1a117e7806..6eb42cce3b 100644 --- a/hw/arm/imx25_pdk.c +++ b/hw/arm/imx25_pdk.c @@ -149,4 +149,4 @@ static void imx25_pdk_machine_init(MachineClass *mc) mc->auto_create_sdcard = true; } -DEFINE_MACHINE("imx25-pdk", imx25_pdk_machine_init, QEMU_ARCH_ALL) +DEFINE_MACHINE("imx25-pdk", imx25_pdk_machine_init, QEMU_ARCH_ARM) diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index d0090658a5..746e475888 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -137,4 +137,4 @@ static void kzm_machine_init(MachineClass *mc) mc->default_ram_id = "kzm.ram"; } -DEFINE_MACHINE("kzm", kzm_machine_init, QEMU_ARCH_ALL) +DEFINE_MACHINE("kzm", kzm_machine_init, QEMU_ARCH_ARM) diff --git a/hw/arm/max78000fthr.c b/hw/arm/max78000fthr.c index e3f48891de..11bb1028e8 100644 --- a/hw/arm/max78000fthr.c +++ b/hw/arm/max78000fthr.c @@ -47,4 +47,4 @@ static void max78000_machine_init(MachineClass *mc) mc->valid_cpu_types = valid_cpu_types; } -DEFINE_MACHINE("max78000fthr", max78000_machine_init, QEMU_ARCH_ALL) +DEFINE_MACHINE("max78000fthr", max78000_machine_init, QEMU_ARCH_ARM) diff --git a/hw/arm/mcimx6ul-evk.c b/hw/arm/mcimx6ul-evk.c index 786c4f1b53..901edaedc2 100644 --- a/hw/arm/mcimx6ul-evk.c +++ b/hw/arm/mcimx6ul-evk.c @@ -78,4 +78,4 @@ static void mcimx6ul_evk_machine_init(MachineClass *mc) mc->auto_create_sdcard = true; } -DEFINE_MACHINE("mcimx6ul-evk", mcimx6ul_evk_machine_init, QEMU_ARCH_ALL) +DEFINE_MACHINE("mcimx6ul-evk", mcimx6ul_evk_machine_init, QEMU_ARCH_ARM) diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c index 219d66381a..1cd9de2bcc 100644 --- a/hw/arm/msf2-som.c +++ b/hw/arm/msf2-som.c @@ -108,4 +108,4 @@ static void emcraft_sf2_machine_init(MachineClass *mc) mc->valid_cpu_types = valid_cpu_types; } -DEFINE_MACHINE("emcraft-sf2", emcraft_sf2_machine_init, QEMU_ARCH_ALL) +DEFINE_MACHINE("emcraft-sf2", emcraft_sf2_machine_init, QEMU_ARCH_ARM) diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c index 1a2352c038..4e38cce808 100644 --- a/hw/arm/netduino2.c +++ b/hw/arm/netduino2.c @@ -65,4 +65,4 @@ static void netduino2_machine_init(MachineClass *mc) mc->ignore_memory_transaction_failures = true; } -DEFINE_MACHINE("netduino2", netduino2_machine_init, QEMU_ARCH_ALL) +DEFINE_MACHINE("netduino2", netduino2_machine_init, QEMU_ARCH_ARM) diff --git a/hw/arm/netduinoplus2.c b/hw/arm/netduinoplus2.c index 627178d300..0b048e8be1 100644 --- a/hw/arm/netduinoplus2.c +++ b/hw/arm/netduinoplus2.c @@ -65,4 +65,4 @@ static void netduinoplus2_machine_init(MachineClass *mc) mc->valid_cpu_types = valid_cpu_types; } -DEFINE_MACHINE("netduinoplus2", netduinoplus2_machine_init, QEMU_ARCH_ALL) +DEFINE_MACHINE("netduinoplus2", netduinoplus2_machine_init, QEMU_ARCH_ARM) diff --git a/hw/arm/olimex-stm32-h405.c b/hw/arm/olimex-stm32-h405.c index 44f27b84ec..40695fa50d 100644 --- a/hw/arm/olimex-stm32-h405.c +++ b/hw/arm/olimex-stm32-h405.c @@ -72,4 +72,4 @@ static void olimex_stm32_h405_machine_init(MachineClass *mc) } DEFINE_MACHINE("olimex-stm32-h405", olimex_stm32_h405_machine_init, - QEMU_ARCH_ALL) + QEMU_ARCH_ARM) diff --git a/hw/arm/stm32vldiscovery.c b/hw/arm/stm32vldiscovery.c index b61a11a5f4..1130d2d166 100644 --- a/hw/arm/stm32vldiscovery.c +++ b/hw/arm/stm32vldiscovery.c @@ -68,4 +68,4 @@ static void stm32vldiscovery_machine_init(MachineClass *mc) mc->valid_cpu_types = valid_cpu_types; } -DEFINE_MACHINE("stm32vldiscovery", stm32vldiscovery_machine_init, QEMU_ARCH_ALL) +DEFINE_MACHINE("stm32vldiscovery", stm32vldiscovery_machine_init, QEMU_ARCH_ARM) diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c index 50719e0b75..9d95c2a3e4 100644 --- a/hw/m68k/an5206.c +++ b/hw/m68k/an5206.c @@ -101,4 +101,4 @@ static void an5206_machine_init(MachineClass *mc) mc->default_ram_id = "an5206.ram"; } -DEFINE_MACHINE("an5206", an5206_machine_init, QEMU_ARCH_ALL) +DEFINE_MACHINE("an5206", an5206_machine_init, QEMU_ARCH_M68K) diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c index 5fa54da7af..48a80c1922 100644 --- a/hw/m68k/mcf5208.c +++ b/hw/m68k/mcf5208.c @@ -398,4 +398,4 @@ static void mcf5208evb_machine_init(MachineClass *mc) mc->default_ram_id = "mcf5208.ram"; } -DEFINE_MACHINE("mcf5208evb", mcf5208evb_machine_init, QEMU_ARCH_ALL) +DEFINE_MACHINE("mcf5208evb", mcf5208evb_machine_init, QEMU_ARCH_M68K) diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index c40ba899e5..2f6b92d30f 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -220,4 +220,5 @@ static void petalogix_ml605_machine_init(MachineClass *mc) mc->init = petalogix_ml605_init; } -DEFINE_MACHINE("petalogix-ml605", petalogix_ml605_machine_init, QEMU_ARCH_ALL) +DEFINE_MACHINE("petalogix-ml605", petalogix_ml605_machine_init, + QEMU_ARCH_MICROBLAZE) diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c index 2f38311b36..34161664c8 100644 --- a/hw/microblaze/xlnx-zynqmp-pmu.c +++ b/hw/microblaze/xlnx-zynqmp-pmu.c @@ -185,4 +185,5 @@ static void xlnx_zynqmp_pmu_machine_init(MachineClass *mc) mc->init = xlnx_zynqmp_pmu_init; } -DEFINE_MACHINE("xlnx-zynqmp-pmu", xlnx_zynqmp_pmu_machine_init, QEMU_ARCH_ALL) +DEFINE_MACHINE("xlnx-zynqmp-pmu", xlnx_zynqmp_pmu_machine_init, + QEMU_ARCH_MICROBLAZE) diff --git a/hw/riscv/microblaze-v-generic.c b/hw/riscv/microblaze-v-generic.c index 3caa93dd3e..3409e5323d 100644 --- a/hw/riscv/microblaze-v-generic.c +++ b/hw/riscv/microblaze-v-generic.c @@ -187,4 +187,4 @@ static void mb_v_generic_machine_init(MachineClass *mc) } DEFINE_MACHINE("amd-microblaze-v-generic", mb_v_generic_machine_init, - QEMU_ARCH_ALL) + QEMU_ARCH_RISCV) diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c index 196ff25c88..1042e2f258 100644 --- a/hw/tricore/tricore_testboard.c +++ b/hw/tricore/tricore_testboard.c @@ -113,4 +113,4 @@ static void ttb_machine_init(MachineClass *mc) mc->default_cpu_type = TRICORE_CPU_TYPE_NAME("tc1796"); } -DEFINE_MACHINE("tricore_testboard", ttb_machine_init, QEMU_ARCH_ALL) +DEFINE_MACHINE("tricore_testboard", ttb_machine_init, QEMU_ARCH_TRICORE) -- 2.55.0.windows.3
