[PULL 48/59] accel/tcg: Restrict curr_cflags() declaration to 'internal-common.h'

Philippe Mathieu-Daudé posted 59 patches 3 days, 7 hours ago
[PULL 48/59] accel/tcg: Restrict curr_cflags() declaration to 'internal-common.h'
Posted by Philippe Mathieu-Daudé 3 days, 7 hours ago
curr_cflags() is only used within accel/tcg/,
move its declaration to accel/tcg/internal-common.h.

Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20241216214030.59393-1-philmd@linaro.org>
---
 accel/tcg/internal-common.h | 3 +++
 include/exec/cpu-common.h   | 3 ---
 accel/tcg/watchpoint.c      | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/accel/tcg/internal-common.h b/accel/tcg/internal-common.h
index a8fc3db7742..c8d714256cb 100644
--- a/accel/tcg/internal-common.h
+++ b/accel/tcg/internal-common.h
@@ -56,4 +56,7 @@ void cpu_restore_state_from_tb(CPUState *cpu, TranslationBlock *tb,
 bool tcg_exec_realizefn(CPUState *cpu, Error **errp);
 void tcg_exec_unrealizefn(CPUState *cpu);
 
+/* current cflags for hashing/comparison */
+uint32_t curr_cflags(CPUState *cpu);
+
 #endif
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index 0cf9a3d369c..74e947f3adc 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -191,9 +191,6 @@ void list_cpus(void);
 bool tcg_cflags_has(CPUState *cpu, uint32_t flags);
 void tcg_cflags_set(CPUState *cpu, uint32_t flags);
 
-/* current cflags for hashing/comparison */
-uint32_t curr_cflags(CPUState *cpu);
-
 /**
  * cpu_unwind_state_data:
  * @cpu: the cpu context
diff --git a/accel/tcg/watchpoint.c b/accel/tcg/watchpoint.c
index e24baead562..fbaf45d10f2 100644
--- a/accel/tcg/watchpoint.c
+++ b/accel/tcg/watchpoint.c
@@ -27,6 +27,7 @@
 #include "system/replay.h"
 #include "hw/core/tcg-cpu-ops.h"
 #include "hw/core/cpu.h"
+#include "internal-common.h"
 
 /*
  * Return true if this watchpoint address matches the specified
-- 
2.47.1