This prevents creation of arm machines unless the current selected target is arm and enables removal of the 'is_available' callback.
Signed-off-by: Daniel P. Berrangé <[email protected]> --- hw/arm/aspeed_ast27x0-fc.c | 5 ++++- hw/arm/aspeed_ast27x0_evb.c | 7 +++++-- hw/arm/raspi.c | 9 ++++++--- hw/arm/raspi4b.c | 6 ++++-- hw/arm/virt.c | 6 ++++-- 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/hw/arm/aspeed_ast27x0-fc.c b/hw/arm/aspeed_ast27x0-fc.c index 73362b60d2a..b0d2fc091d0 100644 --- a/hw/arm/aspeed_ast27x0-fc.c +++ b/hw/arm/aspeed_ast27x0-fc.c @@ -22,6 +22,8 @@ #include "hw/arm/boot.h" #include "hw/block/flash.h" #include "hw/arm/aspeed_coprocessor.h" +#include "qom/object_interfaces.h" +#include "qemu/base-arch-defs.h" #define TYPE_AST2700FC MACHINE_TYPE_NAME("ast2700fc") OBJECT_DECLARE_SIMPLE_TYPE(Ast2700FCState, AST2700FC); @@ -220,12 +222,14 @@ static void ast2700fc_init(MachineState *machine) static void ast2700fc_class_init(ObjectClass *oc, const void *data) { MachineClass *mc = MACHINE_CLASS(oc); + TargetSpecificClass *tsc = TARGET_SPECIFIC_CLASS(oc); mc->desc = "ast2700 full core support"; mc->init = ast2700fc_init; mc->no_floppy = 1; mc->no_cdrom = 1; mc->min_cpus = mc->max_cpus = mc->default_cpus = 6; + tsc->targets = QEMU_ARCH_BIT(SYS_EMU_TARGET_AARCH64); } static const TypeInfo ast2700fc_types[] = { @@ -234,7 +238,6 @@ static const TypeInfo ast2700fc_types[] = { .parent = TYPE_MACHINE, .class_init = ast2700fc_class_init, .instance_size = sizeof(Ast2700FCState), - .is_available = target_aarch64, }, }; diff --git a/hw/arm/aspeed_ast27x0_evb.c b/hw/arm/aspeed_ast27x0_evb.c index 9f7d4395114..d698bb25833 100644 --- a/hw/arm/aspeed_ast27x0_evb.c +++ b/hw/arm/aspeed_ast27x0_evb.c @@ -12,6 +12,7 @@ #include "hw/arm/aspeed_soc.h" #include "hw/sensor/tmp105.h" #include "qom/object_interfaces.h" +#include "qemu/base-arch-defs.h" /* AST2700 evb hardware value */ /* SCU HW Strap1 */ @@ -33,7 +34,9 @@ static void aspeed_machine_ast2700a1_evb_class_init(ObjectClass *oc, { MachineClass *mc = MACHINE_CLASS(oc); AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc); + TargetSpecificClass *tsc = TARGET_SPECIFIC_CLASS(oc); + tsc->targets = QEMU_ARCH_BIT(SYS_EMU_TARGET_AARCH64); mc->desc = "Aspeed AST2700 A1 EVB (Cortex-A35)"; amc->soc_name = "ast2700-a1"; amc->hw_strap1 = AST2700_EVB_HW_STRAP1; @@ -55,11 +58,13 @@ static void aspeed_machine_ast2700a2_evb_class_init(ObjectClass *oc, MachineClass *mc = MACHINE_CLASS(oc); AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc); AliasedClass *alc = ALIASED_CLASS(oc); + TargetSpecificClass *tsc = TARGET_SPECIFIC_CLASS(oc); static const char *const aliases[] = { MACHINE_TYPE_NAME("ast2700-evb"), NULL, }; alc->aliases = aliases; + tsc->targets = QEMU_ARCH_BIT(SYS_EMU_TARGET_AARCH64); mc->desc = "Aspeed AST2700 A2 EVB (Cortex-A35)"; amc->soc_name = "ast2700-a2"; amc->hw_strap1 = AST2700_EVB_HW_STRAP1; @@ -80,13 +85,11 @@ static const TypeInfo aspeed_ast27x0_evb_types[] = { .name = MACHINE_TYPE_NAME("ast2700a1-evb"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_ast2700a1_evb_class_init, - .is_available = target_aarch64, }, { .name = MACHINE_TYPE_NAME("ast2700a2-evb"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_ast2700a2_evb_class_init, - .is_available = target_aarch64, } }; diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index fadbacb2534..b9b79942d29 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -24,7 +24,8 @@ #include "qemu/error-report.h" #include "hw/core/boards.h" #include "hw/core/loader.h" -#include "qom/object.h" +#include "qom/object_interfaces.h" +#include "qemu/base-arch-defs.h" #define TYPE_RASPI_MACHINE MACHINE_TYPE_NAME("raspi-common") OBJECT_DECLARE_SIMPLE_TYPE(RaspiMachineState, RASPI_MACHINE) @@ -370,9 +371,11 @@ static void raspi3ap_machine_class_init(ObjectClass *oc, const void *data) { MachineClass *mc = MACHINE_CLASS(oc); RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc); + TargetSpecificClass *tsc = TARGET_SPECIFIC_CLASS(oc); mc->auto_create_sdcard = true; rmc->board_rev = 0x9020e0; /* Revision 1.0 */ + tsc->targets = QEMU_ARCH_BIT(SYS_EMU_TARGET_AARCH64); raspi_machine_class_init(mc, rmc->board_rev); }; @@ -380,9 +383,11 @@ static void raspi3b_machine_class_init(ObjectClass *oc, const void *data) { MachineClass *mc = MACHINE_CLASS(oc); RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc); + TargetSpecificClass *tsc = TARGET_SPECIFIC_CLASS(oc); mc->auto_create_sdcard = true; rmc->board_rev = 0xa02082; + tsc->targets = QEMU_ARCH_BIT(SYS_EMU_TARGET_AARCH64); raspi_machine_class_init(mc, rmc->board_rev); }; @@ -403,12 +408,10 @@ static const TypeInfo raspi_machine_types[] = { .name = MACHINE_TYPE_NAME("raspi3ap"), .parent = TYPE_RASPI_MACHINE, .class_init = raspi3ap_machine_class_init, - .is_available = target_aarch64, }, { .name = MACHINE_TYPE_NAME("raspi3b"), .parent = TYPE_RASPI_MACHINE, .class_init = raspi3b_machine_class_init, - .is_available = target_aarch64, }, { .name = TYPE_RASPI_MACHINE, .parent = TYPE_RASPI_BASE_MACHINE, diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 600dfe686f2..69048f8b4a3 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -19,8 +19,9 @@ #include "hw/core/boards.h" #include "hw/core/loader.h" #include "hw/arm/boot.h" -#include "qom/object.h" +#include "qom/object_interfaces.h" #include "hw/arm/bcm2838.h" +#include "qemu/base-arch-defs.h" #include <libfdt.h> #define TYPE_RASPI4B_MACHINE MACHINE_TYPE_NAME("raspi4b") @@ -88,11 +89,13 @@ static void raspi4b_machine_class_init(ObjectClass *oc, const void *data) { MachineClass *mc = MACHINE_CLASS(oc); RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc); + TargetSpecificClass *tsc = TARGET_SPECIFIC_CLASS(oc); rmc->board_rev = 0xb03115; /* Revision 1.5, 2 Gb RAM */ raspi_machine_class_common_init(mc, rmc->board_rev); mc->auto_create_sdcard = true; mc->init = raspi4b_machine_init; + tsc->targets = QEMU_ARCH_BIT(SYS_EMU_TARGET_AARCH64); } static const TypeInfo raspi4b_machine_type = { @@ -100,7 +103,6 @@ static const TypeInfo raspi4b_machine_type = { .parent = TYPE_RASPI_BASE_MACHINE, .instance_size = sizeof(Raspi4bMachineState), .class_init = raspi4b_machine_class_init, - .is_available = target_aarch64, }; static void raspi4b_machine_register_type(void) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 6217771032e..ca5cd3c16b8 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -95,6 +95,7 @@ #include "qemu/guest-random.h" #include "hw/watchdog/sbsa_gwdt.h" #include "qom/object_interfaces.h" +#include "qemu/base-arch-defs.h" static GlobalProperty arm_virt_compat_defaults[] = { { TYPE_VIRTIO_IOMMU_PCI, "aw-bits", "48" }, @@ -119,10 +120,13 @@ static void arm_virt_compat_default_set(MachineClass *mc) const void *data) \ { \ MachineClass *mc = MACHINE_CLASS(oc); \ + TargetSpecificClass *tsc = TARGET_SPECIFIC_CLASS(oc); \ arm_virt_compat_default_set(mc); \ MACHINE_VER_SYM(options, virt, __VA_ARGS__)(mc); \ mc->desc = "QEMU " MACHINE_VER_STR(__VA_ARGS__) " ARM Virtual Machine"; \ MACHINE_VER_DEPRECATION(__VA_ARGS__); \ + tsc->targets = QEMU_ARCH_BIT(SYS_EMU_TARGET_ARM) | \ + QEMU_ARCH_BIT(SYS_EMU_TARGET_AARCH64); \ classinitextra \ } \ static const TypeInfo MACHINE_VER_SYM(info, virt, __VA_ARGS__) = \ @@ -130,7 +134,6 @@ static void arm_virt_compat_default_set(MachineClass *mc) .name = MACHINE_VER_TYPE_NAME("arm-virt", __VA_ARGS__), \ .parent = TYPE_VIRT_MACHINE, \ .class_init = MACHINE_VER_SYM(class_init, virt, __VA_ARGS__), \ - .is_available = target_base_arm, \ .secure = true, \ }; \ static void MACHINE_VER_SYM(register, virt, __VA_ARGS__)(void) \ @@ -4467,7 +4470,6 @@ static const TypeInfo virt_machine_info = { { TYPE_HOTPLUG_HANDLER }, { } }, - .is_available = target_base_arm, }; static void machvirt_machine_init(void) -- 2.56.1
