[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v5 36/36] revert commit 6e937ba7f8fb90d66cb3781f7fed32fb4239556a
From: |
Claudio Fontana |
Subject: |
[RFC v5 36/36] revert commit 6e937ba7f8fb90d66cb3781f7fed32fb4239556a |
Date: |
Tue, 9 Mar 2021 15:25:44 +0100 |
this change breaks all tests, need to revert for now.
Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: Sun Feb 21 23:26:15 2021 +0100
target/arm: Restrict v8M IDAU to TCG
Signed-off-by: Claudio Fontana <cfontana@suse.de>
---
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 2513c11bd3..a173c6c0a1 100644
--- a/target/arm/tcg/tcg-cpu-models.c
+++ b/target/arm/tcg/tcg-cpu-models.c
@@ -12,7 +12,6 @@
#include "tcg-cpu.h"
#include "internals.h"
-#include "target/arm/idau.h"
#include "cpregs.h"
#include "cpu32.h"
@@ -736,17 +735,10 @@ static const ARMCPUInfo arm_tcg_cpus[] = {
{ .name = "pxa270-c5", .initfn = pxa270c5_initfn },
};
-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 v5 22/36] target/arm: split 32bit cpu models from cpu.c to cpu32.c, (continued)
- [RFC v5 22/36] target/arm: split 32bit cpu models from cpu.c to cpu32.c, Claudio Fontana, 2021/03/09
- [RFC v5 24/36] target/arm: move TCG cpu and models inside tcg/, Claudio Fontana, 2021/03/09
- [RFC v5 27/36] target/arm: remove kvm include file for PSCI and arm-powerctl, Claudio Fontana, 2021/03/09
- [RFC v5 28/36] target/arm: move kvm-const.h, kvm.c, kvm64.c, kvm_arm.h to kvm/, Claudio Fontana, 2021/03/09
- [RFC v5 25/36] target/arm: cpu: fix style, Claudio Fontana, 2021/03/09
- [RFC v5 32/36] tests: restrict TCG-only arm-cpu-features tests to TCG builds, Claudio Fontana, 2021/03/09
- [RFC v5 31/36] tests/qtest: skip bios-tables-test test_acpi_oem_fields_virt for KVM, Claudio Fontana, 2021/03/09
- [RFC v5 35/36] tests: do not run qom-test on all machines for ARM KVM-only, Claudio Fontana, 2021/03/09
- [RFC v5 30/36] target/arm: remove broad "else" statements when checking accels, Claudio Fontana, 2021/03/09
- [RFC v5 34/36] tests: device-introspect-test: cope with ARM TCG-only devices, Claudio Fontana, 2021/03/09
- [RFC v5 36/36] revert commit 6e937ba7f8fb90d66cb3781f7fed32fb4239556a,
Claudio Fontana <=
- [RFC v5 33/36] tests: do not run test-hmp on all machines for ARM KVM-only, Claudio Fontana, 2021/03/09