@@ -22,6 +22,7 @@
#include "hw/arm/boot.h"
#include "hw/block/flash.h"
#include "hw/arm/aspeed_coprocessor.h"
+#include "qemu/base-arch-defs.h"
#define TYPE_AST2700FC MACHINE_TYPE_NAME("ast2700fc")
OBJECT_DECLARE_SIMPLE_TYPE(Ast2700FCState, AST2700FC);
@@ -226,6 +227,7 @@ static void ast2700fc_class_init(ObjectClass *oc, const void *data)
mc->no_floppy = 1;
mc->no_cdrom = 1;
mc->min_cpus = mc->max_cpus = mc->default_cpus = 6;
+ mc->targets = QEMU_ARCH_BIT(SYS_EMU_TARGET_AARCH64);
}
static const TypeInfo ast2700fc_types[] = {
@@ -234,7 +236,6 @@ static const TypeInfo ast2700fc_types[] = {
.parent = TYPE_MACHINE,
.class_init = ast2700fc_class_init,
.instance_size = sizeof(Ast2700FCState),
- .is_available = target_aarch64,
},
};
@@ -11,6 +11,7 @@
#include "hw/arm/aspeed.h"
#include "hw/arm/aspeed_soc.h"
#include "hw/sensor/tmp105.h"
+#include "qemu/base-arch-defs.h"
/* AST2700 evb hardware value */
/* SCU HW Strap1 */
@@ -45,6 +46,7 @@ static void aspeed_machine_ast2700a1_evb_class_init(ObjectClass *oc,
amc->i2c_init = ast2700_evb_i2c_init;
amc->vbootrom = true;
mc->default_ram_size = 1 * GiB;
+ mc->targets = QEMU_ARCH_BIT(SYS_EMU_TARGET_AARCH64);
aspeed_machine_class_init_cpus_defaults(mc);
}
@@ -67,6 +69,7 @@ static void aspeed_machine_ast2700a2_evb_class_init(ObjectClass *oc,
amc->i2c_init = ast2700_evb_i2c_init;
amc->vbootrom = true;
mc->default_ram_size = 2 * GiB;
+ mc->targets = QEMU_ARCH_BIT(SYS_EMU_TARGET_AARCH64);
aspeed_machine_class_init_cpus_defaults(mc);
}
@@ -75,13 +78,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,
}
};
@@ -25,6 +25,8 @@
#include "hw/core/boards.h"
#include "hw/core/loader.h"
#include "qom/object.h"
+#include "qemu/base-arch-defs.h"
+
#define TYPE_RASPI_MACHINE MACHINE_TYPE_NAME("raspi-common")
OBJECT_DECLARE_SIMPLE_TYPE(RaspiMachineState, RASPI_MACHINE)
@@ -330,10 +332,15 @@ void raspi_machine_class_common_init(MachineClass *mc,
};
static void raspi_machine_class_init(MachineClass *mc,
- uint32_t board_rev)
+ uint32_t board_rev,
+ bool arch64bitonly)
{
raspi_machine_class_common_init(mc, board_rev);
mc->init = raspi_machine_init;
+ mc->targets = QEMU_ARCH_BIT(SYS_EMU_TARGET_AARCH64);
+ if (!arch64bitonly) {
+ mc->targets |= QEMU_ARCH_BIT(SYS_EMU_TARGET_ARM);
+ }
};
static void raspi0_machine_class_init(ObjectClass *oc, const void *data)
@@ -343,7 +350,7 @@ static void raspi0_machine_class_init(ObjectClass *oc, const void *data)
mc->auto_create_sdcard = true;
rmc->board_rev = 0x920092; /* Revision 1.2 */
- raspi_machine_class_init(mc, rmc->board_rev);
+ raspi_machine_class_init(mc, rmc->board_rev, false);
};
static void raspi1ap_machine_class_init(ObjectClass *oc, const void *data)
@@ -353,7 +360,7 @@ static void raspi1ap_machine_class_init(ObjectClass *oc, const void *data)
mc->auto_create_sdcard = true;
rmc->board_rev = 0x900021; /* Revision 1.1 */
- raspi_machine_class_init(mc, rmc->board_rev);
+ raspi_machine_class_init(mc, rmc->board_rev, false);
};
static void raspi2b_machine_class_init(ObjectClass *oc, const void *data)
@@ -363,7 +370,7 @@ static void raspi2b_machine_class_init(ObjectClass *oc, const void *data)
mc->auto_create_sdcard = true;
rmc->board_rev = 0xa21041;
- raspi_machine_class_init(mc, rmc->board_rev);
+ raspi_machine_class_init(mc, rmc->board_rev, false);
};
static void raspi3ap_machine_class_init(ObjectClass *oc, const void *data)
@@ -373,7 +380,7 @@ static void raspi3ap_machine_class_init(ObjectClass *oc, const void *data)
mc->auto_create_sdcard = true;
rmc->board_rev = 0x9020e0; /* Revision 1.0 */
- raspi_machine_class_init(mc, rmc->board_rev);
+ raspi_machine_class_init(mc, rmc->board_rev, true);
};
static void raspi3b_machine_class_init(ObjectClass *oc, const void *data)
@@ -383,7 +390,7 @@ static void raspi3b_machine_class_init(ObjectClass *oc, const void *data)
mc->auto_create_sdcard = true;
rmc->board_rev = 0xa02082;
- raspi_machine_class_init(mc, rmc->board_rev);
+ raspi_machine_class_init(mc, rmc->board_rev, true);
};
static const TypeInfo raspi_machine_types[] = {
@@ -403,12 +410,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,
@@ -21,6 +21,7 @@
#include "hw/arm/boot.h"
#include "qom/object.h"
#include "hw/arm/bcm2838.h"
+#include "qemu/base-arch-defs.h"
#include <libfdt.h>
#define TYPE_RASPI4B_MACHINE MACHINE_TYPE_NAME("raspi4b")
@@ -93,6 +94,7 @@ static void raspi4b_machine_class_init(ObjectClass *oc, const void *data)
raspi_machine_class_common_init(mc, rmc->board_rev);
mc->auto_create_sdcard = true;
mc->init = raspi4b_machine_init;
+ mc->targets = QEMU_ARCH_BIT(SYS_EMU_TARGET_AARCH64);
}
static const TypeInfo raspi4b_machine_type = {
@@ -100,7 +102,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)
@@ -94,6 +94,7 @@
#include "hw/cxl/cxl_host.h"
#include "qemu/guest-random.h"
#include "hw/watchdog/sbsa_gwdt.h"
+#include "qemu/base-arch-defs.h"
static GlobalProperty arm_virt_compat_defaults[] = {
{ TYPE_VIRTIO_IOMMU_PCI, "aw-bits", "48" },
@@ -131,7 +132,6 @@ static void arm_virt_compat_default_set(MachineClass *mc)
.name = MACHINE_VER_TYPE_NAME("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) \
@@ -4204,6 +4204,8 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data)
hc->unplug = virt_machine_device_unplug_cb;
mc->nvdimm_supported = true;
mc->smp_props.clusters_supported = true;
+ mc->targets = QEMU_ARCH_BIT(SYS_EMU_TARGET_AARCH64) |
+ QEMU_ARCH_BIT(SYS_EMU_TARGET_ARM);
/* Supported caches */
mc->smp_props.cache_supported[CACHE_LEVEL_AND_TYPE_L1D] = true;
@@ -4444,7 +4446,6 @@ static const TypeInfo virt_machine_info = {
{ TYPE_HOTPLUG_HANDLER },
{ }
},
- .is_available = target_base_arm,
};
static void machvirt_machine_init(void)
@@ -17,6 +17,7 @@
#include "qemu/units.h"
#include "machine_cfg_v68n_1024.h.inc"
#include "system/device_tree.h"
+#include "qemu/base-arch-defs.h"
enum {
VIRT_UART0,
@@ -115,6 +116,7 @@ static void virt_class_init(ObjectClass *oc, const void *data)
mc->no_cdrom = 1;
mc->numa_mem_supported = false;
mc->default_nic = "virtio-mmio-bus";
+ mc->targets = QEMU_ARCH_BIT(SYS_EMU_TARGET_HEXAGON);
}
@@ -123,7 +125,6 @@ static const TypeInfo virt_machine_types[] = { {
.parent = TYPE_HEXAGON_COMMON_MACHINE,
.instance_size = sizeof(HexagonVirtMachineState),
.class_init = virt_class_init,
- .is_available = target_hexagon,
} };
DEFINE_TYPES(virt_machine_types)
@@ -36,6 +36,7 @@
#include "hw/intc/goldfish_pic.h"
#include "hw/virtio/virtio-mmio.h"
#include "hw/virtio/virtio-blk.h"
+#include "qemu/base-arch-defs.h"
/*
* 6 goldfish-pic for CPU IRQ #1 to IRQ #6
@@ -320,6 +321,7 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data)
mc->no_floppy = 1;
mc->no_parallel = 1;
mc->default_ram_id = "m68k_virt.ram";
+ mc->targets = QEMU_ARCH_BIT(SYS_EMU_TARGET_M68K);
}
static const TypeInfo virt_machine_info = {
@@ -327,7 +329,6 @@ static const TypeInfo virt_machine_info = {
.parent = TYPE_MACHINE,
.abstract = true,
.class_init = virt_machine_class_init,
- .is_available = target_m68k,
};
static void virt_machine_register_types(void)
@@ -355,7 +356,6 @@ type_init(virt_machine_register_types)
.name = MACHINE_VER_TYPE_NAME("virt", __VA_ARGS__), \
.parent = MACHINE_TYPE_NAME("virt"), \
.class_init = MACHINE_VER_SYM(class_init, virt, __VA_ARGS__), \
- .is_available = target_m68k, \
}; \
static void MACHINE_VER_SYM(register, virt, __VA_ARGS__)(void) \
{ \
@@ -28,6 +28,7 @@
#include "system/system.h"
#include "system/qtest.h"
#include "system/reset.h"
+#include "qemu/base-arch-defs.h"
#include <libfdt.h>
@@ -552,6 +553,7 @@ static void openrisc_virt_machine_init(ObjectClass *oc, const void *data)
mc->max_cpus = VIRT_CPUS_MAX;
mc->is_default = false;
mc->default_cpu_type = OPENRISC_CPU_TYPE_NAME("or1200");
+ mc->targets = QEMU_ARCH_BIT(SYS_EMU_TARGET_OR1K);
}
static const TypeInfo or1ksim_machine_typeinfo = {
@@ -559,7 +561,6 @@ static const TypeInfo or1ksim_machine_typeinfo = {
.parent = TYPE_MACHINE,
.class_init = openrisc_virt_machine_init,
.instance_size = sizeof(OR1KVirtState),
- .is_available = target_or1k,
};
static void or1ksim_machine_init_register_types(void)
@@ -61,6 +61,7 @@
#include "qapi/qapi-type-infos-common.h"
#include "hw/virtio/virtio-iommu.h"
#include "hw/uefi/var-service-api.h"
+#include "qemu/base-arch-defs.h"
#include "aia.h"
@@ -1140,6 +1141,8 @@ static void virt_machine_class_init(ObjectClass *oc, const void *data)
mc->default_ram_id = "riscv_virt_board.ram";
assert(!mc->get_hotplug_handler);
mc->get_hotplug_handler = virt_machine_get_hotplug_handler;
+ mc->targets = QEMU_ARCH_BIT(SYS_EMU_TARGET_RISCV64) |
+ QEMU_ARCH_BIT(SYS_EMU_TARGET_RISCV32);
hc->plug = virt_machine_device_plug_cb;
@@ -1195,7 +1198,6 @@ static const TypeInfo virt_machine_typeinfo = {
.instance_init = virt_machine_instance_init,
.instance_finalize = virt_machine_instance_finalize,
.instance_size = sizeof(RISCVVirtState),
- .is_available = target_base_riscv,
.interfaces = (const InterfaceInfo[]) {
{ TYPE_HOTPLUG_HANDLER },
{ }
For every machine which currently has an 'is_available' callback set on the TypeInfo, set the 'targets' field on the MachineClass to the equivalent arch list, and remove 'is_available'. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- hw/arm/aspeed_ast27x0-fc.c | 3 ++- hw/arm/aspeed_ast27x0_evb.c | 5 +++-- hw/arm/raspi.c | 21 +++++++++++++-------- hw/arm/raspi4b.c | 3 ++- hw/arm/virt.c | 5 +++-- hw/hexagon/virt.c | 3 ++- hw/m68k/virt.c | 4 ++-- hw/or1k/virt.c | 3 ++- hw/riscv/virt.c | 4 +++- 9 files changed, 32 insertions(+), 19 deletions(-)