Re: [PATCH-for-10.1 17/43] target/ppc: Restrict SoftMMU mmu_index() to TCG

[Philippe Mathieu-Daudé]

On 2/4/25 23:03, Philippe Mathieu-Daudé wrote:

Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
Reviewed-by: Richard Henderson <richard.hender...@linaro.org>
---
  target/ppc/cpu_init.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
index 3686bbc9380..30238e9a223 100644
--- a/target/ppc/cpu_init.c
+++ b/target/ppc/cpu_init.c
@@ -7481,6 +7481,7 @@ static const TCGCPUOps ppc_tcg_ops = {
    .initialize = ppc_translate_init,
    .translate_code = ppc_translate_code,
    .restore_state_to_opc = ppc_restore_state_to_opc,
+  .mmu_index = ppc_cpu_mmu_index,

#ifdef CONFIG_USER_ONLY

    .record_sigsegv = ppc_cpu_record_sigsegv,
@@ -7517,7 +7518,6 @@ static void ppc_cpu_class_init(ObjectClass *oc, void 
*data)
                                         &pcc->parent_phases);

cc->class_by_name = ppc_cpu_class_by_name;

-    cc->mmu_index = ppc_cpu_mmu_index;
      cc->dump_state = ppc_cpu_dump_state;
      cc->set_pc = ppc_cpu_set_pc;
      cc->get_pc = ppc_cpu_get_pc;

Missing:

-- >8 --
diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
index 4963816e1f..ae5d034bd4 100644
--- a/target/ppc/cpu_init.c
+++ b/target/ppc/cpu_init.c
@@ -7217,2 +7217,7 @@ static void ppc_restore_state_to_opc(CPUState *cs,
 }
+
+static int ppc_cpu_mmu_index(CPUState *cs, bool ifetch)
+{
+    return ppc_env_mmu_index(cpu_env(cs), ifetch);
+}
 #endif /* CONFIG_TCG */
@@ -7226,7 +7231,2 @@ static bool ppc_cpu_has_work(CPUState *cs)

-static int ppc_cpu_mmu_index(CPUState *cs, bool ifetch)
-{
-    return ppc_env_mmu_index(cpu_env(cs), ifetch);
-}
-
 static void ppc_cpu_reset_hold(Object *obj, ResetType type)
---

With following description:

---
Convert CPUClass::mmu_index() to TCGCPUOps::mmu_index(),
restricting ppc_cpu_mmu_index() to TCG #ifdef.
---