[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v12 45/65] Revert "target/arm: Restrict v8M IDAU to TCG"
From: |
Claudio Fontana |
Subject: |
[RFC v12 45/65] Revert "target/arm: Restrict v8M IDAU to TCG" |
Date: |
Fri, 26 Mar 2021 20:36:41 +0100 |
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>
---
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 31f1b3df09..353cd652bc 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -1510,9 +1510,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 v12 42/65] tests: do not run test-hmp on all machines for ARM KVM-only, (continued)
- [RFC v12 42/65] tests: do not run test-hmp on all machines for ARM KVM-only, Claudio Fontana, 2021/03/26
- [RFC v12 44/65] tests: do not run qom-test on all machines for ARM KVM-only, Claudio Fontana, 2021/03/26
- [RFC v12 47/65] target/arm: move kvm post init initialization to kvm cpu accel, Claudio Fontana, 2021/03/26
- [RFC v12 43/65] tests: device-introspect-test: cope with ARM TCG-only devices, Claudio Fontana, 2021/03/26
- [RFC v12 48/65] target/arm: add tcg cpu accel class, Claudio Fontana, 2021/03/26
- [RFC v12 45/65] Revert "target/arm: Restrict v8M IDAU to TCG",
Claudio Fontana <=
- [RFC v12 49/65] target/arm: move TCG gt timer creation code in tcg/, Claudio Fontana, 2021/03/26
- [RFC v12 50/65] target/arm: cpu-sve: new module, Claudio Fontana, 2021/03/26
- [RFC v12 46/65] target/arm: create kvm cpu accel class, Claudio Fontana, 2021/03/26
- [RFC v12 52/65] target/arm: make is_aa64 and arm_el_is_aa64 a macro for !TARGET_AARCH64, Claudio Fontana, 2021/03/26
- [RFC v12 51/65] target/arm: cpu-sve: split TCG and KVM functionality, Claudio Fontana, 2021/03/26