[RFC,v14,54/80] Revert "target/arm: Restrict v8M IDAU to TCG"

Commit Message

Claudio Fontana April 16, 2021, 4:27 p.m. UTC

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 <[e-mail]>
Cc: Philippe Mathieu-Daudé <[e-mail]>
Reviewed-by: Richard Henderson <[e-mail]>
---
 target/arm/cpu.c                | 7 +++++++
 target/arm/tcg/tcg-cpu-models.c | 8 --------
 2 files changed, 7 insertions(+), 8 deletions(-)

Comments

Philippe Mathieu-Daudé May 5, 2021, 12:27 p.m. UTC | #1

On 4/16/21 6:27 PM, Claudio Fontana wrote:
> 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.

Possible way to disable all incompatible boards:
https://www.mail-archive.com/[e-mail]/msg777719.html

> Signed-off-by: Claudio Fontana <[e-mail]>
> Cc: Philippe Mathieu-Daudé <[e-mail]>
> Reviewed-by: Richard Henderson <[e-mail]>
> ---
>  target/arm/cpu.c                | 7 +++++++
>  target/arm/tcg/tcg-cpu-models.c | 8 --------
>  2 files changed, 7 insertions(+), 8 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>

Patch

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]);
     }