[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v14 54/80] Revert "target/arm: Restrict v8M IDAU to TCG"
From: |
Claudio Fontana |
Subject: |
[RFC v14 54/80] Revert "target/arm: Restrict v8M IDAU to TCG" |
Date: |
Fri, 16 Apr 2021 18:27:58 +0200 |
This reverts commit 6e937ba7f8fb90d66cb3781f7fed32fb4239556a
This change breaks quickly at startup, as all interfaces in boards
are checked in vl.c in select_machine():
{
GSList *machines = object_class_get_list(TYPE_MACHINE, false);
}
In order to restrict v8M IDAU to TCG,
we need to first disable all incompatible boards when building
only KVM.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
target/arm/cpu.c | 7 +++++++
target/arm/tcg/tcg-cpu-models.c | 8 --------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index ae28779edd..7a013eb613 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -1509,9 +1509,16 @@ static const TypeInfo arm_cpu_type_info = {
.class_init = arm_cpu_class_init,
};
+static const TypeInfo idau_interface_type_info = {
+ .name = TYPE_IDAU_INTERFACE,
+ .parent = TYPE_INTERFACE,
+ .class_size = sizeof(IDAUInterfaceClass),
+};
+
static void arm_cpu_register_types(void)
{
type_register_static(&arm_cpu_type_info);
+ type_register_static(&idau_interface_type_info);
#ifdef CONFIG_KVM
type_register_static(&host_arm_cpu_type_info);
diff --git a/target/arm/tcg/tcg-cpu-models.c b/target/arm/tcg/tcg-cpu-models.c
index 5dc8e2c93f..840e284f47 100644
--- a/target/arm/tcg/tcg-cpu-models.c
+++ b/target/arm/tcg/tcg-cpu-models.c
@@ -11,7 +11,6 @@
#include "qemu/osdep.h"
#include "tcg/tcg-cpu.h"
#include "internals.h"
-#include "target/arm/idau.h"
#if !defined(CONFIG_USER_ONLY)
#include "hw/boards.h"
#endif
@@ -986,17 +985,10 @@ static const ARMCPUInfo arm_tcg_cpus[] = {
#endif
};
-static const TypeInfo idau_interface_type_info = {
- .name = TYPE_IDAU_INTERFACE,
- .parent = TYPE_INTERFACE,
- .class_size = sizeof(IDAUInterfaceClass),
-};
-
static void arm_tcg_cpu_register_types(void)
{
size_t i;
- type_register_static(&idau_interface_type_info);
for (i = 0; i < ARRAY_SIZE(arm_tcg_cpus); ++i) {
arm32_cpu_register(&arm_tcg_cpus[i]);
}
--
2.26.2
- [RFC v14 43/80] target/arm: remove kvm include file for PSCI and arm-powerctl, (continued)
- [RFC v14 43/80] target/arm: remove kvm include file for PSCI and arm-powerctl, Claudio Fontana, 2021/04/16
- [RFC v14 40/80] target/arm: move TCGCPUOps to tcg/tcg-cpu.c, Claudio Fontana, 2021/04/16
- [RFC v14 47/80] target/arm: remove broad "else" statements when checking accels, Claudio Fontana, 2021/04/16
- [RFC v14 53/80] tests: do not run qom-test on all machines for ARM KVM-only, Claudio Fontana, 2021/04/16
- [RFC v14 49/80] tests/qtest: skip bios-tables-test test_acpi_oem_fields_virt for KVM, Claudio Fontana, 2021/04/16
- [RFC v14 37/80] target/arm: move exception code out of tcg/helper.c, Claudio Fontana, 2021/04/16
- [RFC v14 41/80] target/arm: move cpu_tcg to tcg/tcg-cpu-models.c, Claudio Fontana, 2021/04/16
- [RFC v14 46/80] target/arm: cleanup cpu includes, Claudio Fontana, 2021/04/16
- [RFC v14 44/80] target/arm: move kvm-const.h, kvm.c, kvm64.c, kvm_arm.h to kvm/, Claudio Fontana, 2021/04/16
- [RFC v14 50/80] tests: restrict TCG-only arm-cpu-features tests to TCG builds, Claudio Fontana, 2021/04/16
- [RFC v14 54/80] Revert "target/arm: Restrict v8M IDAU to TCG",
Claudio Fontana <=
- [RFC v14 52/80] tests: device-introspect-test: cope with ARM TCG-only devices, Claudio Fontana, 2021/04/16
- Re: [RFC v14 52/80] tests: device-introspect-test: cope with ARM TCG-only devices, Thomas Huth, 2021/04/19
- Re: [RFC v14 52/80] tests: device-introspect-test: cope with ARM TCG-only devices, Claudio Fontana, 2021/04/19
- Re: [RFC v14 52/80] tests: device-introspect-test: cope with ARM TCG-only devices, Thomas Huth, 2021/04/19
- Re: [RFC v14 52/80] tests: device-introspect-test: cope with ARM TCG-only devices, Claudio Fontana, 2021/04/19
- Re: [RFC v14 52/80] tests: device-introspect-test: cope with ARM TCG-only devices, Alex Bennée, 2021/04/20
- Re: [RFC v14 52/80] tests: device-introspect-test: cope with ARM TCG-only devices, Claudio Fontana, 2021/04/20
[RFC v14 55/80] target/arm: create kvm cpu accel class, Claudio Fontana, 2021/04/16
[RFC v14 51/80] tests: do not run test-hmp on all machines for ARM KVM-only, Claudio Fontana, 2021/04/16
[RFC v14 57/80] target/arm: add tcg cpu accel class, Claudio Fontana, 2021/04/16