[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/6] accel/tcg: Include missing "tcg/tcg.h" header
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 4/6] accel/tcg: Include missing "tcg/tcg.h" header |
Date: |
Sun, 7 Feb 2021 23:57:36 +0100 |
Commit 3468b59e18b ("tcg: enable multiple TCG contexts in softmmu")
introduced use of typedef/prototypes declared in "tcg/tcg.h" without
including it. This was not a problem because "tcg/tcg.h" is pulled
in by "exec/cpu_ldst.h". To be able to remove this header there, we
first need to include it here in op_helper.c, else we get:
accel/tcg/tcg-accel-ops-mttcg.c: In function ‘mttcg_cpu_thread_fn’:
accel/tcg/tcg-accel-ops-mttcg.c:52:5: error: implicit declaration of function
‘tcg_register_thread’; did you mean ‘rcu_register_thread’?
[-Werror=implicit-function-declaration]
52 | tcg_register_thread();
| ^~~~~~~~~~~~~~~~~~~
| rcu_register_thread
accel/tcg/tcg-accel-ops-mttcg.c:52:5: error: nested extern declaration of
‘tcg_register_thread’ [-Werror=nested-externs]
cc1: all warnings being treated as errors
accel/tcg/tcg-accel-ops-rr.c: In function ‘rr_cpu_thread_fn’:
accel/tcg/tcg-accel-ops-rr.c:153:5: error: implicit declaration of function
‘tcg_register_thread’; did you mean ‘rcu_register_thread’?
[-Werror=implicit-function-declaration]
153 | tcg_register_thread();
| ^~~~~~~~~~~~~~~~~~~
| rcu_register_thread
accel/tcg/tcg-accel-ops-rr.c:153:5: error: nested extern declaration of
‘tcg_register_thread’ [-Werror=nested-externs]
cc1: all warnings being treated as errors
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
accel/tcg/tcg-accel-ops-mttcg.c | 1 +
accel/tcg/tcg-accel-ops-rr.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/accel/tcg/tcg-accel-ops-mttcg.c b/accel/tcg/tcg-accel-ops-mttcg.c
index 42973fb062b..ddbca6c5b8c 100644
--- a/accel/tcg/tcg-accel-ops-mttcg.c
+++ b/accel/tcg/tcg-accel-ops-mttcg.c
@@ -32,6 +32,7 @@
#include "exec/exec-all.h"
#include "hw/boards.h"
+#include "tcg/tcg.h"
#include "tcg-accel-ops.h"
#include "tcg-accel-ops-mttcg.h"
diff --git a/accel/tcg/tcg-accel-ops-rr.c b/accel/tcg/tcg-accel-ops-rr.c
index 4a66055e0d7..1bb1d0f8f1c 100644
--- a/accel/tcg/tcg-accel-ops-rr.c
+++ b/accel/tcg/tcg-accel-ops-rr.c
@@ -32,6 +32,7 @@
#include "exec/exec-all.h"
#include "hw/boards.h"
+#include "tcg/tcg.h"
#include "tcg-accel-ops.h"
#include "tcg-accel-ops-rr.h"
#include "tcg-accel-ops-icount.h"
--
2.26.2
- [RFC PATCH 0/6] exec: Remove "tcg/tcg.h" from "exec/cpu_ldst.h", Philippe Mathieu-Daudé, 2021/02/07
- [RFC PATCH 1/6] target: Replace tcg_debug_assert() by assert(), Philippe Mathieu-Daudé, 2021/02/07
- [PATCH 2/6] target/m68k: Include missing "tcg/tcg.h" header, Philippe Mathieu-Daudé, 2021/02/07
- [PATCH 3/6] target/mips: Include missing "tcg/tcg.h" header, Philippe Mathieu-Daudé, 2021/02/07
- [PATCH 4/6] accel/tcg: Include missing "tcg/tcg.h" header,
Philippe Mathieu-Daudé <=
- [RFC PATCH 5/6] accel/tcg: Refactor debugging tlb_assert_iotlb_entry_for_ptr_present(), Philippe Mathieu-Daudé, 2021/02/07
- [PATCH 6/6] exec/cpu_ldst: Move tlb* declarations to "exec/exec-all.h", Philippe Mathieu-Daudé, 2021/02/07