From: Pierrick Bouvier <[email protected]> We don't need those types anymore.
Signed-off-by: Pierrick Bouvier <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Message-ID: <[email protected]> Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- include/hw/arm/machines-qom.h | 6 ------ hw/core/null-machine.c | 2 -- hw/nitro/machine.c | 5 ----- hw/remote/machine.c | 2 -- target-info-qom.c | 8 -------- target/arm/machine.c | 5 ----- 6 files changed, 28 deletions(-) diff --git a/include/hw/arm/machines-qom.h b/include/hw/arm/machines-qom.h index 3ed39384e59..81ffa434303 100644 --- a/include/hw/arm/machines-qom.h +++ b/include/hw/arm/machines-qom.h @@ -11,12 +11,6 @@ #include "hw/core/boards.h" -#define TYPE_TARGET_ARM_MACHINE \ - "target-info-arm-machine" - -#define TYPE_TARGET_AARCH64_MACHINE \ - "target-info-aarch64-machine" - /* * A machine filtered with arm_machine_interfaces[] or * arm_aarch64_machine_interfaces[] will be available diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c index f132a7b89b4..c1ecf3214fd 100644 --- a/hw/core/null-machine.c +++ b/hw/core/null-machine.c @@ -58,8 +58,6 @@ static void machine_none_machine_init(MachineClass *mc) } DEFINE_MACHINE_WITH_INTERFACES("none", machine_none_machine_init, - { TYPE_TARGET_AARCH64_MACHINE }, - { TYPE_TARGET_ARM_MACHINE }, { TYPE_TARGET_RISCV32_MACHINE }, { TYPE_TARGET_RISCV64_MACHINE }, { }) diff --git a/hw/nitro/machine.c b/hw/nitro/machine.c index 8849959359c..bb8878299bc 100644 --- a/hw/nitro/machine.c +++ b/hw/nitro/machine.c @@ -262,11 +262,6 @@ static const TypeInfo nitro_machine_info = { .parent = TYPE_MACHINE, .instance_size = sizeof(NitroMachineState), .class_init = nitro_machine_class_init, - .interfaces = (const InterfaceInfo[]) { - /* x86_64 and aarch64 only */ - { TYPE_TARGET_AARCH64_MACHINE }, - { } - }, }; static void nitro_machine_register(void) diff --git a/hw/remote/machine.c b/hw/remote/machine.c index df08f640199..6580e0d9683 100644 --- a/hw/remote/machine.c +++ b/hw/remote/machine.c @@ -149,8 +149,6 @@ static const TypeInfo remote_machine = { .class_init = remote_machine_class_init, .interfaces = (const InterfaceInfo[]) { { TYPE_HOTPLUG_HANDLER }, - { TYPE_TARGET_AARCH64_MACHINE }, - { TYPE_TARGET_ARM_MACHINE }, { } } }; diff --git a/target-info-qom.c b/target-info-qom.c index 7958a5cc685..eb9491338ca 100644 --- a/target-info-qom.c +++ b/target-info-qom.c @@ -16,14 +16,6 @@ #include "hw/riscv/machines-qom.h" static const TypeInfo target_info_types[] = { - { - .name = TYPE_TARGET_ARM_MACHINE, - .parent = TYPE_INTERFACE, - }, - { - .name = TYPE_TARGET_AARCH64_MACHINE, - .parent = TYPE_INTERFACE, - }, { .name = TYPE_TARGET_RISCV32_MACHINE, .parent = TYPE_INTERFACE, diff --git a/target/arm/machine.c b/target/arm/machine.c index 89127e5d83c..42a1427fa16 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -1348,18 +1348,13 @@ const VMStateDescription vmstate_arm_cpu = { }; const InterfaceInfo arm_machine_interfaces[] = { - { TYPE_TARGET_ARM_MACHINE }, - { TYPE_TARGET_AARCH64_MACHINE }, { } }; const InterfaceInfo arm_aarch64_machine_interfaces[] = { - { TYPE_TARGET_ARM_MACHINE }, - { TYPE_TARGET_AARCH64_MACHINE }, { } }; const InterfaceInfo aarch64_machine_interfaces[] = { - { TYPE_TARGET_AARCH64_MACHINE }, { } }; -- 2.53.0
