* [PATCH 01/37] accel/tcg: Build user-exec-stub.c once
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
@ 2025-03-13 3:44 ` Richard Henderson
2025-03-13 9:43 ` Philippe Mathieu-Daudé
` (2 more replies)
2025-03-13 3:44 ` [PATCH 02/37] accel/tcg: Build plugin-gen.c once Richard Henderson
` (37 subsequent siblings)
38 siblings, 3 replies; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
CONFIG_USER_ONLY == !CONFIG_SYSTEM_ONLY.
Therefore it's cleaner to just add to user_ss.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/meson.build | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build
index 38ff227eb0..14bf797fda 100644
--- a/accel/tcg/meson.build
+++ b/accel/tcg/meson.build
@@ -12,7 +12,6 @@ tcg_specific_ss.add(files(
'translator.c',
))
tcg_specific_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c'))
-tcg_specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_false: files('user-exec-stub.c'))
if get_option('plugins')
tcg_specific_ss.add(files('plugin-gen.c'))
endif
@@ -22,6 +21,10 @@ specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files(
'cputlb.c',
))
+user_ss.add(when: ['CONFIG_TCG'], if_true: files(
+ 'user-exec-stub.c',
+))
+
system_ss.add(when: ['CONFIG_TCG'], if_true: files(
'icount-common.c',
'monitor.c',
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 01/37] accel/tcg: Build user-exec-stub.c once
2025-03-13 3:44 ` [PATCH 01/37] accel/tcg: Build user-exec-stub.c once Richard Henderson
@ 2025-03-13 9:43 ` Philippe Mathieu-Daudé
2025-03-13 16:37 ` Pierrick Bouvier
2025-03-13 22:56 ` Alex Bennée
2 siblings, 0 replies; 115+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-03-13 9:43 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pierrick.bouvier, pbonzini
On 13/3/25 04:44, Richard Henderson wrote:
> CONFIG_USER_ONLY == !CONFIG_SYSTEM_ONLY.
> Therefore it's cleaner to just add to user_ss.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> accel/tcg/meson.build | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* Re: [PATCH 01/37] accel/tcg: Build user-exec-stub.c once
2025-03-13 3:44 ` [PATCH 01/37] accel/tcg: Build user-exec-stub.c once Richard Henderson
2025-03-13 9:43 ` Philippe Mathieu-Daudé
@ 2025-03-13 16:37 ` Pierrick Bouvier
2025-03-13 22:56 ` Alex Bennée
2 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 16:37 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> CONFIG_USER_ONLY == !CONFIG_SYSTEM_ONLY.
> Therefore it's cleaner to just add to user_ss.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> accel/tcg/meson.build | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build
> index 38ff227eb0..14bf797fda 100644
> --- a/accel/tcg/meson.build
> +++ b/accel/tcg/meson.build
> @@ -12,7 +12,6 @@ tcg_specific_ss.add(files(
> 'translator.c',
> ))
> tcg_specific_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c'))
> -tcg_specific_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_false: files('user-exec-stub.c'))
> if get_option('plugins')
> tcg_specific_ss.add(files('plugin-gen.c'))
> endif
> @@ -22,6 +21,10 @@ specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files(
> 'cputlb.c',
> ))
>
> +user_ss.add(when: ['CONFIG_TCG'], if_true: files(
> + 'user-exec-stub.c',
> +))
> +
> system_ss.add(when: ['CONFIG_TCG'], if_true: files(
> 'icount-common.c',
> 'monitor.c',
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 01/37] accel/tcg: Build user-exec-stub.c once
2025-03-13 3:44 ` [PATCH 01/37] accel/tcg: Build user-exec-stub.c once Richard Henderson
2025-03-13 9:43 ` Philippe Mathieu-Daudé
2025-03-13 16:37 ` Pierrick Bouvier
@ 2025-03-13 22:56 ` Alex Bennée
2 siblings, 0 replies; 115+ messages in thread
From: Alex Bennée @ 2025-03-13 22:56 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, pierrick.bouvier, pbonzini, philmd
Richard Henderson <richard.henderson@linaro.org> writes:
> CONFIG_USER_ONLY == !CONFIG_SYSTEM_ONLY.
> Therefore it's cleaner to just add to user_ss.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 02/37] accel/tcg: Build plugin-gen.c once
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
2025-03-13 3:44 ` [PATCH 01/37] accel/tcg: Build user-exec-stub.c once Richard Henderson
@ 2025-03-13 3:44 ` Richard Henderson
2025-03-13 16:46 ` Pierrick Bouvier
2025-03-13 22:57 ` Alex Bennée
2025-03-13 3:44 ` [PATCH 03/37] include/exec: Use vaddr for *_mmu guest memory access routines Richard Henderson
` (36 subsequent siblings)
38 siblings, 2 replies; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
We assert that env immediately follows CPUState in cpu-all.h.
Change the offsetof expressions to be based on CPUState instead
of ArchCPU.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/plugin-gen.c | 13 +++++--------
accel/tcg/meson.build | 7 ++++---
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c
index 7e5f040bf7..c1da753894 100644
--- a/accel/tcg/plugin-gen.c
+++ b/accel/tcg/plugin-gen.c
@@ -22,13 +22,12 @@
#include "qemu/osdep.h"
#include "qemu/plugin.h"
#include "qemu/log.h"
-#include "cpu.h"
#include "tcg/tcg.h"
#include "tcg/tcg-temp-internal.h"
-#include "tcg/tcg-op.h"
-#include "exec/exec-all.h"
+#include "tcg/tcg-op-common.h"
#include "exec/plugin-gen.h"
#include "exec/translator.h"
+#include "exec/translation-block.h"
enum plugin_gen_from {
PLUGIN_GEN_FROM_TB,
@@ -89,15 +88,13 @@ static void gen_enable_mem_helper(struct qemu_plugin_tb *ptb,
qemu_plugin_add_dyn_cb_arr(arr);
tcg_gen_st_ptr(tcg_constant_ptr((intptr_t)arr), tcg_env,
- offsetof(CPUState, neg.plugin_mem_cbs) -
- offsetof(ArchCPU, env));
+ offsetof(CPUState, neg.plugin_mem_cbs) - sizeof(CPUState));
}
static void gen_disable_mem_helper(void)
{
tcg_gen_st_ptr(tcg_constant_ptr(0), tcg_env,
- offsetof(CPUState, neg.plugin_mem_cbs) -
- offsetof(ArchCPU, env));
+ offsetof(CPUState, neg.plugin_mem_cbs) - sizeof(CPUState));
}
static TCGv_i32 gen_cpu_index(void)
@@ -113,7 +110,7 @@ static TCGv_i32 gen_cpu_index(void)
}
TCGv_i32 cpu_index = tcg_temp_ebb_new_i32();
tcg_gen_ld_i32(cpu_index, tcg_env,
- -offsetof(ArchCPU, env) + offsetof(CPUState, cpu_index));
+ offsetof(CPUState, cpu_index) - sizeof(CPUState));
return cpu_index;
}
diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build
index 14bf797fda..185830d0f5 100644
--- a/accel/tcg/meson.build
+++ b/accel/tcg/meson.build
@@ -3,6 +3,10 @@ common_ss.add(when: 'CONFIG_TCG', if_true: files(
'tcg-runtime.c',
'tcg-runtime-gvec.c',
))
+if get_option('plugins')
+ common_ss.add(when: 'CONFIG_TCG', if_true: files('plugin-gen.c'))
+endif
+
tcg_specific_ss = ss.source_set()
tcg_specific_ss.add(files(
'tcg-all.c',
@@ -12,9 +16,6 @@ tcg_specific_ss.add(files(
'translator.c',
))
tcg_specific_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c'))
-if get_option('plugins')
- tcg_specific_ss.add(files('plugin-gen.c'))
-endif
specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_specific_ss)
specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files(
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 02/37] accel/tcg: Build plugin-gen.c once
2025-03-13 3:44 ` [PATCH 02/37] accel/tcg: Build plugin-gen.c once Richard Henderson
@ 2025-03-13 16:46 ` Pierrick Bouvier
2025-03-13 22:57 ` Alex Bennée
1 sibling, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 16:46 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> We assert that env immediately follows CPUState in cpu-all.h.
> Change the offsetof expressions to be based on CPUState instead
> of ArchCPU.
>
Nice change.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> accel/tcg/plugin-gen.c | 13 +++++--------
> accel/tcg/meson.build | 7 ++++---
> 2 files changed, 9 insertions(+), 11 deletions(-)
>
> diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c
> index 7e5f040bf7..c1da753894 100644
> --- a/accel/tcg/plugin-gen.c
> +++ b/accel/tcg/plugin-gen.c
> @@ -22,13 +22,12 @@
> #include "qemu/osdep.h"
> #include "qemu/plugin.h"
> #include "qemu/log.h"
> -#include "cpu.h"
> #include "tcg/tcg.h"
> #include "tcg/tcg-temp-internal.h"
> -#include "tcg/tcg-op.h"
> -#include "exec/exec-all.h"
> +#include "tcg/tcg-op-common.h"
> #include "exec/plugin-gen.h"
> #include "exec/translator.h"
> +#include "exec/translation-block.h"
>
> enum plugin_gen_from {
> PLUGIN_GEN_FROM_TB,
> @@ -89,15 +88,13 @@ static void gen_enable_mem_helper(struct qemu_plugin_tb *ptb,
> qemu_plugin_add_dyn_cb_arr(arr);
>
> tcg_gen_st_ptr(tcg_constant_ptr((intptr_t)arr), tcg_env,
> - offsetof(CPUState, neg.plugin_mem_cbs) -
> - offsetof(ArchCPU, env));
> + offsetof(CPUState, neg.plugin_mem_cbs) - sizeof(CPUState));
> }
>
> static void gen_disable_mem_helper(void)
> {
> tcg_gen_st_ptr(tcg_constant_ptr(0), tcg_env,
> - offsetof(CPUState, neg.plugin_mem_cbs) -
> - offsetof(ArchCPU, env));
> + offsetof(CPUState, neg.plugin_mem_cbs) - sizeof(CPUState));
> }
>
> static TCGv_i32 gen_cpu_index(void)
> @@ -113,7 +110,7 @@ static TCGv_i32 gen_cpu_index(void)
> }
> TCGv_i32 cpu_index = tcg_temp_ebb_new_i32();
> tcg_gen_ld_i32(cpu_index, tcg_env,
> - -offsetof(ArchCPU, env) + offsetof(CPUState, cpu_index));
> + offsetof(CPUState, cpu_index) - sizeof(CPUState));
> return cpu_index;
> }
>
> diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build
> index 14bf797fda..185830d0f5 100644
> --- a/accel/tcg/meson.build
> +++ b/accel/tcg/meson.build
> @@ -3,6 +3,10 @@ common_ss.add(when: 'CONFIG_TCG', if_true: files(
> 'tcg-runtime.c',
> 'tcg-runtime-gvec.c',
> ))
> +if get_option('plugins')
> + common_ss.add(when: 'CONFIG_TCG', if_true: files('plugin-gen.c'))
> +endif
> +
> tcg_specific_ss = ss.source_set()
> tcg_specific_ss.add(files(
> 'tcg-all.c',
> @@ -12,9 +16,6 @@ tcg_specific_ss.add(files(
> 'translator.c',
> ))
> tcg_specific_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c'))
> -if get_option('plugins')
> - tcg_specific_ss.add(files('plugin-gen.c'))
> -endif
> specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_specific_ss)
>
> specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files(
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 02/37] accel/tcg: Build plugin-gen.c once
2025-03-13 3:44 ` [PATCH 02/37] accel/tcg: Build plugin-gen.c once Richard Henderson
2025-03-13 16:46 ` Pierrick Bouvier
@ 2025-03-13 22:57 ` Alex Bennée
1 sibling, 0 replies; 115+ messages in thread
From: Alex Bennée @ 2025-03-13 22:57 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, pierrick.bouvier, pbonzini, philmd
Richard Henderson <richard.henderson@linaro.org> writes:
> We assert that env immediately follows CPUState in cpu-all.h.
> Change the offsetof expressions to be based on CPUState instead
> of ArchCPU.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 03/37] include/exec: Use vaddr for *_mmu guest memory access routines
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
2025-03-13 3:44 ` [PATCH 01/37] accel/tcg: Build user-exec-stub.c once Richard Henderson
2025-03-13 3:44 ` [PATCH 02/37] accel/tcg: Build plugin-gen.c once Richard Henderson
@ 2025-03-13 3:44 ` Richard Henderson
2025-03-13 16:48 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 04/37] include/exec: Split out cpu-ldst-common.h Richard Henderson
` (35 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
Use vaddr only for the newest api, because it has the least
number of uses and therefore is the easiest to audit.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/atomic_template.h | 16 ++++++-------
include/exec/cpu_ldst.h | 48 ++++++++++++++++++-------------------
accel/tcg/cputlb.c | 8 +++----
accel/tcg/user-exec.c | 8 +++----
accel/tcg/ldst_common.c.inc | 20 ++++++++--------
5 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/accel/tcg/atomic_template.h b/accel/tcg/atomic_template.h
index 89593b2502..08a475c10c 100644
--- a/accel/tcg/atomic_template.h
+++ b/accel/tcg/atomic_template.h
@@ -77,7 +77,7 @@
# define END _le
#endif
-ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, abi_ptr addr,
+ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, vaddr addr,
ABI_TYPE cmpv, ABI_TYPE newv,
MemOpIdx oi, uintptr_t retaddr)
{
@@ -101,7 +101,7 @@ ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, abi_ptr addr,
}
#if DATA_SIZE < 16
-ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, abi_ptr addr, ABI_TYPE val,
+ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, vaddr addr, ABI_TYPE val,
MemOpIdx oi, uintptr_t retaddr)
{
DATA_TYPE *haddr = atomic_mmu_lookup(env_cpu(env), addr, oi,
@@ -120,7 +120,7 @@ ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, abi_ptr addr, ABI_TYPE val,
}
#define GEN_ATOMIC_HELPER(X) \
-ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, abi_ptr addr, \
+ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, vaddr addr, \
ABI_TYPE val, MemOpIdx oi, uintptr_t retaddr) \
{ \
DATA_TYPE *haddr, ret; \
@@ -156,7 +156,7 @@ GEN_ATOMIC_HELPER(xor_fetch)
* of CF_PARALLEL's value, we'll trace just a read and a write.
*/
#define GEN_ATOMIC_HELPER_FN(X, FN, XDATA_TYPE, RET) \
-ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, abi_ptr addr, \
+ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, vaddr addr, \
ABI_TYPE xval, MemOpIdx oi, uintptr_t retaddr) \
{ \
XDATA_TYPE *haddr, cmp, old, new, val = xval; \
@@ -202,7 +202,7 @@ GEN_ATOMIC_HELPER_FN(umax_fetch, MAX, DATA_TYPE, new)
# define END _be
#endif
-ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, abi_ptr addr,
+ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, vaddr addr,
ABI_TYPE cmpv, ABI_TYPE newv,
MemOpIdx oi, uintptr_t retaddr)
{
@@ -226,7 +226,7 @@ ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, abi_ptr addr,
}
#if DATA_SIZE < 16
-ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, abi_ptr addr, ABI_TYPE val,
+ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, vaddr addr, ABI_TYPE val,
MemOpIdx oi, uintptr_t retaddr)
{
DATA_TYPE *haddr = atomic_mmu_lookup(env_cpu(env), addr, oi,
@@ -245,7 +245,7 @@ ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, abi_ptr addr, ABI_TYPE val,
}
#define GEN_ATOMIC_HELPER(X) \
-ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, abi_ptr addr, \
+ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, vaddr addr, \
ABI_TYPE val, MemOpIdx oi, uintptr_t retaddr) \
{ \
DATA_TYPE *haddr, ret; \
@@ -278,7 +278,7 @@ GEN_ATOMIC_HELPER(xor_fetch)
* of CF_PARALLEL's value, we'll trace just a read and a write.
*/
#define GEN_ATOMIC_HELPER_FN(X, FN, XDATA_TYPE, RET) \
-ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, abi_ptr addr, \
+ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, vaddr addr, \
ABI_TYPE xval, MemOpIdx oi, uintptr_t retaddr) \
{ \
XDATA_TYPE *haddr, ldo, ldn, old, new, val = xval; \
diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index 769e9fc440..ddd8e0cf48 100644
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -157,48 +157,48 @@ void cpu_stl_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr, uint32_t val,
void cpu_stq_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr, uint64_t val,
int mmu_idx, uintptr_t ra);
-uint8_t cpu_ldb_mmu(CPUArchState *env, abi_ptr ptr, MemOpIdx oi, uintptr_t ra);
-uint16_t cpu_ldw_mmu(CPUArchState *env, abi_ptr ptr, MemOpIdx oi, uintptr_t ra);
-uint32_t cpu_ldl_mmu(CPUArchState *env, abi_ptr ptr, MemOpIdx oi, uintptr_t ra);
-uint64_t cpu_ldq_mmu(CPUArchState *env, abi_ptr ptr, MemOpIdx oi, uintptr_t ra);
-Int128 cpu_ld16_mmu(CPUArchState *env, abi_ptr addr, MemOpIdx oi, uintptr_t ra);
+uint8_t cpu_ldb_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
+uint16_t cpu_ldw_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
+uint32_t cpu_ldl_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
+uint64_t cpu_ldq_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
+Int128 cpu_ld16_mmu(CPUArchState *env, vaddr addr, MemOpIdx oi, uintptr_t ra);
-void cpu_stb_mmu(CPUArchState *env, abi_ptr ptr, uint8_t val,
+void cpu_stb_mmu(CPUArchState *env, vaddr ptr, uint8_t val,
MemOpIdx oi, uintptr_t ra);
-void cpu_stw_mmu(CPUArchState *env, abi_ptr ptr, uint16_t val,
+void cpu_stw_mmu(CPUArchState *env, vaddr ptr, uint16_t val,
MemOpIdx oi, uintptr_t ra);
-void cpu_stl_mmu(CPUArchState *env, abi_ptr ptr, uint32_t val,
+void cpu_stl_mmu(CPUArchState *env, vaddr ptr, uint32_t val,
MemOpIdx oi, uintptr_t ra);
-void cpu_stq_mmu(CPUArchState *env, abi_ptr ptr, uint64_t val,
+void cpu_stq_mmu(CPUArchState *env, vaddr ptr, uint64_t val,
MemOpIdx oi, uintptr_t ra);
-void cpu_st16_mmu(CPUArchState *env, abi_ptr addr, Int128 val,
+void cpu_st16_mmu(CPUArchState *env, vaddr addr, Int128 val,
MemOpIdx oi, uintptr_t ra);
-uint32_t cpu_atomic_cmpxchgb_mmu(CPUArchState *env, abi_ptr addr,
+uint32_t cpu_atomic_cmpxchgb_mmu(CPUArchState *env, vaddr addr,
uint32_t cmpv, uint32_t newv,
MemOpIdx oi, uintptr_t retaddr);
-uint32_t cpu_atomic_cmpxchgw_le_mmu(CPUArchState *env, abi_ptr addr,
+uint32_t cpu_atomic_cmpxchgw_le_mmu(CPUArchState *env, vaddr addr,
uint32_t cmpv, uint32_t newv,
MemOpIdx oi, uintptr_t retaddr);
-uint32_t cpu_atomic_cmpxchgl_le_mmu(CPUArchState *env, abi_ptr addr,
+uint32_t cpu_atomic_cmpxchgl_le_mmu(CPUArchState *env, vaddr addr,
uint32_t cmpv, uint32_t newv,
MemOpIdx oi, uintptr_t retaddr);
-uint64_t cpu_atomic_cmpxchgq_le_mmu(CPUArchState *env, abi_ptr addr,
+uint64_t cpu_atomic_cmpxchgq_le_mmu(CPUArchState *env, vaddr addr,
uint64_t cmpv, uint64_t newv,
MemOpIdx oi, uintptr_t retaddr);
-uint32_t cpu_atomic_cmpxchgw_be_mmu(CPUArchState *env, abi_ptr addr,
+uint32_t cpu_atomic_cmpxchgw_be_mmu(CPUArchState *env, vaddr addr,
uint32_t cmpv, uint32_t newv,
MemOpIdx oi, uintptr_t retaddr);
-uint32_t cpu_atomic_cmpxchgl_be_mmu(CPUArchState *env, abi_ptr addr,
+uint32_t cpu_atomic_cmpxchgl_be_mmu(CPUArchState *env, vaddr addr,
uint32_t cmpv, uint32_t newv,
MemOpIdx oi, uintptr_t retaddr);
-uint64_t cpu_atomic_cmpxchgq_be_mmu(CPUArchState *env, abi_ptr addr,
+uint64_t cpu_atomic_cmpxchgq_be_mmu(CPUArchState *env, vaddr addr,
uint64_t cmpv, uint64_t newv,
MemOpIdx oi, uintptr_t retaddr);
#define GEN_ATOMIC_HELPER(NAME, TYPE, SUFFIX) \
TYPE cpu_atomic_ ## NAME ## SUFFIX ## _mmu \
- (CPUArchState *env, abi_ptr addr, TYPE val, \
+ (CPUArchState *env, vaddr addr, TYPE val, \
MemOpIdx oi, uintptr_t retaddr);
#ifdef CONFIG_ATOMIC64
@@ -244,10 +244,10 @@ GEN_ATOMIC_HELPER_ALL(xchg)
#undef GEN_ATOMIC_HELPER_ALL
#undef GEN_ATOMIC_HELPER
-Int128 cpu_atomic_cmpxchgo_le_mmu(CPUArchState *env, abi_ptr addr,
+Int128 cpu_atomic_cmpxchgo_le_mmu(CPUArchState *env, vaddr addr,
Int128 cmpv, Int128 newv,
MemOpIdx oi, uintptr_t retaddr);
-Int128 cpu_atomic_cmpxchgo_be_mmu(CPUArchState *env, abi_ptr addr,
+Int128 cpu_atomic_cmpxchgo_be_mmu(CPUArchState *env, vaddr addr,
Int128 cmpv, Int128 newv,
MemOpIdx oi, uintptr_t retaddr);
@@ -297,13 +297,13 @@ Int128 cpu_atomic_cmpxchgo_be_mmu(CPUArchState *env, abi_ptr addr,
# define cpu_stq_mmuidx_ra cpu_stq_le_mmuidx_ra
#endif
-uint8_t cpu_ldb_code_mmu(CPUArchState *env, abi_ptr addr,
+uint8_t cpu_ldb_code_mmu(CPUArchState *env, vaddr addr,
MemOpIdx oi, uintptr_t ra);
-uint16_t cpu_ldw_code_mmu(CPUArchState *env, abi_ptr addr,
+uint16_t cpu_ldw_code_mmu(CPUArchState *env, vaddr addr,
MemOpIdx oi, uintptr_t ra);
-uint32_t cpu_ldl_code_mmu(CPUArchState *env, abi_ptr addr,
+uint32_t cpu_ldl_code_mmu(CPUArchState *env, vaddr addr,
MemOpIdx oi, uintptr_t ra);
-uint64_t cpu_ldq_code_mmu(CPUArchState *env, abi_ptr addr,
+uint64_t cpu_ldq_code_mmu(CPUArchState *env, vaddr addr,
MemOpIdx oi, uintptr_t ra);
uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr);
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index fb22048876..b03998f926 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -2925,25 +2925,25 @@ uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr addr)
return do_ld8_mmu(cs, addr, oi, 0, MMU_INST_FETCH);
}
-uint8_t cpu_ldb_code_mmu(CPUArchState *env, abi_ptr addr,
+uint8_t cpu_ldb_code_mmu(CPUArchState *env, vaddr addr,
MemOpIdx oi, uintptr_t retaddr)
{
return do_ld1_mmu(env_cpu(env), addr, oi, retaddr, MMU_INST_FETCH);
}
-uint16_t cpu_ldw_code_mmu(CPUArchState *env, abi_ptr addr,
+uint16_t cpu_ldw_code_mmu(CPUArchState *env, vaddr addr,
MemOpIdx oi, uintptr_t retaddr)
{
return do_ld2_mmu(env_cpu(env), addr, oi, retaddr, MMU_INST_FETCH);
}
-uint32_t cpu_ldl_code_mmu(CPUArchState *env, abi_ptr addr,
+uint32_t cpu_ldl_code_mmu(CPUArchState *env, vaddr addr,
MemOpIdx oi, uintptr_t retaddr)
{
return do_ld4_mmu(env_cpu(env), addr, oi, retaddr, MMU_INST_FETCH);
}
-uint64_t cpu_ldq_code_mmu(CPUArchState *env, abi_ptr addr,
+uint64_t cpu_ldq_code_mmu(CPUArchState *env, vaddr addr,
MemOpIdx oi, uintptr_t retaddr)
{
return do_ld8_mmu(env_cpu(env), addr, oi, retaddr, MMU_INST_FETCH);
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
index 2322181b15..3f63b194bb 100644
--- a/accel/tcg/user-exec.c
+++ b/accel/tcg/user-exec.c
@@ -1254,7 +1254,7 @@ uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr ptr)
return ret;
}
-uint8_t cpu_ldb_code_mmu(CPUArchState *env, abi_ptr addr,
+uint8_t cpu_ldb_code_mmu(CPUArchState *env, vaddr addr,
MemOpIdx oi, uintptr_t ra)
{
void *haddr;
@@ -1266,7 +1266,7 @@ uint8_t cpu_ldb_code_mmu(CPUArchState *env, abi_ptr addr,
return ret;
}
-uint16_t cpu_ldw_code_mmu(CPUArchState *env, abi_ptr addr,
+uint16_t cpu_ldw_code_mmu(CPUArchState *env, vaddr addr,
MemOpIdx oi, uintptr_t ra)
{
void *haddr;
@@ -1281,7 +1281,7 @@ uint16_t cpu_ldw_code_mmu(CPUArchState *env, abi_ptr addr,
return ret;
}
-uint32_t cpu_ldl_code_mmu(CPUArchState *env, abi_ptr addr,
+uint32_t cpu_ldl_code_mmu(CPUArchState *env, vaddr addr,
MemOpIdx oi, uintptr_t ra)
{
void *haddr;
@@ -1296,7 +1296,7 @@ uint32_t cpu_ldl_code_mmu(CPUArchState *env, abi_ptr addr,
return ret;
}
-uint64_t cpu_ldq_code_mmu(CPUArchState *env, abi_ptr addr,
+uint64_t cpu_ldq_code_mmu(CPUArchState *env, vaddr addr,
MemOpIdx oi, uintptr_t ra)
{
void *haddr;
diff --git a/accel/tcg/ldst_common.c.inc b/accel/tcg/ldst_common.c.inc
index ebbf380d76..0447c0bb92 100644
--- a/accel/tcg/ldst_common.c.inc
+++ b/accel/tcg/ldst_common.c.inc
@@ -135,7 +135,7 @@ static void plugin_load_cb(CPUArchState *env, abi_ptr addr,
}
}
-uint8_t cpu_ldb_mmu(CPUArchState *env, abi_ptr addr, MemOpIdx oi, uintptr_t ra)
+uint8_t cpu_ldb_mmu(CPUArchState *env, vaddr addr, MemOpIdx oi, uintptr_t ra)
{
uint8_t ret;
@@ -145,7 +145,7 @@ uint8_t cpu_ldb_mmu(CPUArchState *env, abi_ptr addr, MemOpIdx oi, uintptr_t ra)
return ret;
}
-uint16_t cpu_ldw_mmu(CPUArchState *env, abi_ptr addr,
+uint16_t cpu_ldw_mmu(CPUArchState *env, vaddr addr,
MemOpIdx oi, uintptr_t ra)
{
uint16_t ret;
@@ -156,7 +156,7 @@ uint16_t cpu_ldw_mmu(CPUArchState *env, abi_ptr addr,
return ret;
}
-uint32_t cpu_ldl_mmu(CPUArchState *env, abi_ptr addr,
+uint32_t cpu_ldl_mmu(CPUArchState *env, vaddr addr,
MemOpIdx oi, uintptr_t ra)
{
uint32_t ret;
@@ -167,7 +167,7 @@ uint32_t cpu_ldl_mmu(CPUArchState *env, abi_ptr addr,
return ret;
}
-uint64_t cpu_ldq_mmu(CPUArchState *env, abi_ptr addr,
+uint64_t cpu_ldq_mmu(CPUArchState *env, vaddr addr,
MemOpIdx oi, uintptr_t ra)
{
uint64_t ret;
@@ -178,7 +178,7 @@ uint64_t cpu_ldq_mmu(CPUArchState *env, abi_ptr addr,
return ret;
}
-Int128 cpu_ld16_mmu(CPUArchState *env, abi_ptr addr,
+Int128 cpu_ld16_mmu(CPUArchState *env, vaddr addr,
MemOpIdx oi, uintptr_t ra)
{
Int128 ret;
@@ -205,14 +205,14 @@ static void plugin_store_cb(CPUArchState *env, abi_ptr addr,
}
}
-void cpu_stb_mmu(CPUArchState *env, abi_ptr addr, uint8_t val,
+void cpu_stb_mmu(CPUArchState *env, vaddr addr, uint8_t val,
MemOpIdx oi, uintptr_t retaddr)
{
helper_stb_mmu(env, addr, val, oi, retaddr);
plugin_store_cb(env, addr, val, 0, oi);
}
-void cpu_stw_mmu(CPUArchState *env, abi_ptr addr, uint16_t val,
+void cpu_stw_mmu(CPUArchState *env, vaddr addr, uint16_t val,
MemOpIdx oi, uintptr_t retaddr)
{
tcg_debug_assert((get_memop(oi) & MO_SIZE) == MO_16);
@@ -220,7 +220,7 @@ void cpu_stw_mmu(CPUArchState *env, abi_ptr addr, uint16_t val,
plugin_store_cb(env, addr, val, 0, oi);
}
-void cpu_stl_mmu(CPUArchState *env, abi_ptr addr, uint32_t val,
+void cpu_stl_mmu(CPUArchState *env, vaddr addr, uint32_t val,
MemOpIdx oi, uintptr_t retaddr)
{
tcg_debug_assert((get_memop(oi) & MO_SIZE) == MO_32);
@@ -228,7 +228,7 @@ void cpu_stl_mmu(CPUArchState *env, abi_ptr addr, uint32_t val,
plugin_store_cb(env, addr, val, 0, oi);
}
-void cpu_stq_mmu(CPUArchState *env, abi_ptr addr, uint64_t val,
+void cpu_stq_mmu(CPUArchState *env, vaddr addr, uint64_t val,
MemOpIdx oi, uintptr_t retaddr)
{
tcg_debug_assert((get_memop(oi) & MO_SIZE) == MO_64);
@@ -236,7 +236,7 @@ void cpu_stq_mmu(CPUArchState *env, abi_ptr addr, uint64_t val,
plugin_store_cb(env, addr, val, 0, oi);
}
-void cpu_st16_mmu(CPUArchState *env, abi_ptr addr, Int128 val,
+void cpu_st16_mmu(CPUArchState *env, vaddr addr, Int128 val,
MemOpIdx oi, uintptr_t retaddr)
{
tcg_debug_assert((get_memop(oi) & MO_SIZE) == MO_128);
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 03/37] include/exec: Use vaddr for *_mmu guest memory access routines
2025-03-13 3:44 ` [PATCH 03/37] include/exec: Use vaddr for *_mmu guest memory access routines Richard Henderson
@ 2025-03-13 16:48 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 16:48 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> Use vaddr only for the newest api, because it has the least
> number of uses and therefore is the easiest to audit.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> accel/tcg/atomic_template.h | 16 ++++++-------
> include/exec/cpu_ldst.h | 48 ++++++++++++++++++-------------------
> accel/tcg/cputlb.c | 8 +++----
> accel/tcg/user-exec.c | 8 +++----
> accel/tcg/ldst_common.c.inc | 20 ++++++++--------
> 5 files changed, 50 insertions(+), 50 deletions(-)
>
> diff --git a/accel/tcg/atomic_template.h b/accel/tcg/atomic_template.h
> index 89593b2502..08a475c10c 100644
> --- a/accel/tcg/atomic_template.h
> +++ b/accel/tcg/atomic_template.h
> @@ -77,7 +77,7 @@
> # define END _le
> #endif
>
> -ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, abi_ptr addr,
> +ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, vaddr addr,
> ABI_TYPE cmpv, ABI_TYPE newv,
> MemOpIdx oi, uintptr_t retaddr)
> {
> @@ -101,7 +101,7 @@ ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, abi_ptr addr,
> }
>
> #if DATA_SIZE < 16
> -ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, abi_ptr addr, ABI_TYPE val,
> +ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, vaddr addr, ABI_TYPE val,
> MemOpIdx oi, uintptr_t retaddr)
> {
> DATA_TYPE *haddr = atomic_mmu_lookup(env_cpu(env), addr, oi,
> @@ -120,7 +120,7 @@ ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, abi_ptr addr, ABI_TYPE val,
> }
>
> #define GEN_ATOMIC_HELPER(X) \
> -ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, abi_ptr addr, \
> +ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, vaddr addr, \
> ABI_TYPE val, MemOpIdx oi, uintptr_t retaddr) \
> { \
> DATA_TYPE *haddr, ret; \
> @@ -156,7 +156,7 @@ GEN_ATOMIC_HELPER(xor_fetch)
> * of CF_PARALLEL's value, we'll trace just a read and a write.
> */
> #define GEN_ATOMIC_HELPER_FN(X, FN, XDATA_TYPE, RET) \
> -ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, abi_ptr addr, \
> +ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, vaddr addr, \
> ABI_TYPE xval, MemOpIdx oi, uintptr_t retaddr) \
> { \
> XDATA_TYPE *haddr, cmp, old, new, val = xval; \
> @@ -202,7 +202,7 @@ GEN_ATOMIC_HELPER_FN(umax_fetch, MAX, DATA_TYPE, new)
> # define END _be
> #endif
>
> -ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, abi_ptr addr,
> +ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, vaddr addr,
> ABI_TYPE cmpv, ABI_TYPE newv,
> MemOpIdx oi, uintptr_t retaddr)
> {
> @@ -226,7 +226,7 @@ ABI_TYPE ATOMIC_NAME(cmpxchg)(CPUArchState *env, abi_ptr addr,
> }
>
> #if DATA_SIZE < 16
> -ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, abi_ptr addr, ABI_TYPE val,
> +ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, vaddr addr, ABI_TYPE val,
> MemOpIdx oi, uintptr_t retaddr)
> {
> DATA_TYPE *haddr = atomic_mmu_lookup(env_cpu(env), addr, oi,
> @@ -245,7 +245,7 @@ ABI_TYPE ATOMIC_NAME(xchg)(CPUArchState *env, abi_ptr addr, ABI_TYPE val,
> }
>
> #define GEN_ATOMIC_HELPER(X) \
> -ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, abi_ptr addr, \
> +ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, vaddr addr, \
> ABI_TYPE val, MemOpIdx oi, uintptr_t retaddr) \
> { \
> DATA_TYPE *haddr, ret; \
> @@ -278,7 +278,7 @@ GEN_ATOMIC_HELPER(xor_fetch)
> * of CF_PARALLEL's value, we'll trace just a read and a write.
> */
> #define GEN_ATOMIC_HELPER_FN(X, FN, XDATA_TYPE, RET) \
> -ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, abi_ptr addr, \
> +ABI_TYPE ATOMIC_NAME(X)(CPUArchState *env, vaddr addr, \
> ABI_TYPE xval, MemOpIdx oi, uintptr_t retaddr) \
> { \
> XDATA_TYPE *haddr, ldo, ldn, old, new, val = xval; \
> diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
> index 769e9fc440..ddd8e0cf48 100644
> --- a/include/exec/cpu_ldst.h
> +++ b/include/exec/cpu_ldst.h
> @@ -157,48 +157,48 @@ void cpu_stl_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr, uint32_t val,
> void cpu_stq_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr, uint64_t val,
> int mmu_idx, uintptr_t ra);
>
> -uint8_t cpu_ldb_mmu(CPUArchState *env, abi_ptr ptr, MemOpIdx oi, uintptr_t ra);
> -uint16_t cpu_ldw_mmu(CPUArchState *env, abi_ptr ptr, MemOpIdx oi, uintptr_t ra);
> -uint32_t cpu_ldl_mmu(CPUArchState *env, abi_ptr ptr, MemOpIdx oi, uintptr_t ra);
> -uint64_t cpu_ldq_mmu(CPUArchState *env, abi_ptr ptr, MemOpIdx oi, uintptr_t ra);
> -Int128 cpu_ld16_mmu(CPUArchState *env, abi_ptr addr, MemOpIdx oi, uintptr_t ra);
> +uint8_t cpu_ldb_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
> +uint16_t cpu_ldw_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
> +uint32_t cpu_ldl_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
> +uint64_t cpu_ldq_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
> +Int128 cpu_ld16_mmu(CPUArchState *env, vaddr addr, MemOpIdx oi, uintptr_t ra);
>
> -void cpu_stb_mmu(CPUArchState *env, abi_ptr ptr, uint8_t val,
> +void cpu_stb_mmu(CPUArchState *env, vaddr ptr, uint8_t val,
> MemOpIdx oi, uintptr_t ra);
> -void cpu_stw_mmu(CPUArchState *env, abi_ptr ptr, uint16_t val,
> +void cpu_stw_mmu(CPUArchState *env, vaddr ptr, uint16_t val,
> MemOpIdx oi, uintptr_t ra);
> -void cpu_stl_mmu(CPUArchState *env, abi_ptr ptr, uint32_t val,
> +void cpu_stl_mmu(CPUArchState *env, vaddr ptr, uint32_t val,
> MemOpIdx oi, uintptr_t ra);
> -void cpu_stq_mmu(CPUArchState *env, abi_ptr ptr, uint64_t val,
> +void cpu_stq_mmu(CPUArchState *env, vaddr ptr, uint64_t val,
> MemOpIdx oi, uintptr_t ra);
> -void cpu_st16_mmu(CPUArchState *env, abi_ptr addr, Int128 val,
> +void cpu_st16_mmu(CPUArchState *env, vaddr addr, Int128 val,
> MemOpIdx oi, uintptr_t ra);
>
> -uint32_t cpu_atomic_cmpxchgb_mmu(CPUArchState *env, abi_ptr addr,
> +uint32_t cpu_atomic_cmpxchgb_mmu(CPUArchState *env, vaddr addr,
> uint32_t cmpv, uint32_t newv,
> MemOpIdx oi, uintptr_t retaddr);
> -uint32_t cpu_atomic_cmpxchgw_le_mmu(CPUArchState *env, abi_ptr addr,
> +uint32_t cpu_atomic_cmpxchgw_le_mmu(CPUArchState *env, vaddr addr,
> uint32_t cmpv, uint32_t newv,
> MemOpIdx oi, uintptr_t retaddr);
> -uint32_t cpu_atomic_cmpxchgl_le_mmu(CPUArchState *env, abi_ptr addr,
> +uint32_t cpu_atomic_cmpxchgl_le_mmu(CPUArchState *env, vaddr addr,
> uint32_t cmpv, uint32_t newv,
> MemOpIdx oi, uintptr_t retaddr);
> -uint64_t cpu_atomic_cmpxchgq_le_mmu(CPUArchState *env, abi_ptr addr,
> +uint64_t cpu_atomic_cmpxchgq_le_mmu(CPUArchState *env, vaddr addr,
> uint64_t cmpv, uint64_t newv,
> MemOpIdx oi, uintptr_t retaddr);
> -uint32_t cpu_atomic_cmpxchgw_be_mmu(CPUArchState *env, abi_ptr addr,
> +uint32_t cpu_atomic_cmpxchgw_be_mmu(CPUArchState *env, vaddr addr,
> uint32_t cmpv, uint32_t newv,
> MemOpIdx oi, uintptr_t retaddr);
> -uint32_t cpu_atomic_cmpxchgl_be_mmu(CPUArchState *env, abi_ptr addr,
> +uint32_t cpu_atomic_cmpxchgl_be_mmu(CPUArchState *env, vaddr addr,
> uint32_t cmpv, uint32_t newv,
> MemOpIdx oi, uintptr_t retaddr);
> -uint64_t cpu_atomic_cmpxchgq_be_mmu(CPUArchState *env, abi_ptr addr,
> +uint64_t cpu_atomic_cmpxchgq_be_mmu(CPUArchState *env, vaddr addr,
> uint64_t cmpv, uint64_t newv,
> MemOpIdx oi, uintptr_t retaddr);
>
> #define GEN_ATOMIC_HELPER(NAME, TYPE, SUFFIX) \
> TYPE cpu_atomic_ ## NAME ## SUFFIX ## _mmu \
> - (CPUArchState *env, abi_ptr addr, TYPE val, \
> + (CPUArchState *env, vaddr addr, TYPE val, \
> MemOpIdx oi, uintptr_t retaddr);
>
> #ifdef CONFIG_ATOMIC64
> @@ -244,10 +244,10 @@ GEN_ATOMIC_HELPER_ALL(xchg)
> #undef GEN_ATOMIC_HELPER_ALL
> #undef GEN_ATOMIC_HELPER
>
> -Int128 cpu_atomic_cmpxchgo_le_mmu(CPUArchState *env, abi_ptr addr,
> +Int128 cpu_atomic_cmpxchgo_le_mmu(CPUArchState *env, vaddr addr,
> Int128 cmpv, Int128 newv,
> MemOpIdx oi, uintptr_t retaddr);
> -Int128 cpu_atomic_cmpxchgo_be_mmu(CPUArchState *env, abi_ptr addr,
> +Int128 cpu_atomic_cmpxchgo_be_mmu(CPUArchState *env, vaddr addr,
> Int128 cmpv, Int128 newv,
> MemOpIdx oi, uintptr_t retaddr);
>
> @@ -297,13 +297,13 @@ Int128 cpu_atomic_cmpxchgo_be_mmu(CPUArchState *env, abi_ptr addr,
> # define cpu_stq_mmuidx_ra cpu_stq_le_mmuidx_ra
> #endif
>
> -uint8_t cpu_ldb_code_mmu(CPUArchState *env, abi_ptr addr,
> +uint8_t cpu_ldb_code_mmu(CPUArchState *env, vaddr addr,
> MemOpIdx oi, uintptr_t ra);
> -uint16_t cpu_ldw_code_mmu(CPUArchState *env, abi_ptr addr,
> +uint16_t cpu_ldw_code_mmu(CPUArchState *env, vaddr addr,
> MemOpIdx oi, uintptr_t ra);
> -uint32_t cpu_ldl_code_mmu(CPUArchState *env, abi_ptr addr,
> +uint32_t cpu_ldl_code_mmu(CPUArchState *env, vaddr addr,
> MemOpIdx oi, uintptr_t ra);
> -uint64_t cpu_ldq_code_mmu(CPUArchState *env, abi_ptr addr,
> +uint64_t cpu_ldq_code_mmu(CPUArchState *env, vaddr addr,
> MemOpIdx oi, uintptr_t ra);
>
> uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr);
> diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
> index fb22048876..b03998f926 100644
> --- a/accel/tcg/cputlb.c
> +++ b/accel/tcg/cputlb.c
> @@ -2925,25 +2925,25 @@ uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr addr)
> return do_ld8_mmu(cs, addr, oi, 0, MMU_INST_FETCH);
> }
>
> -uint8_t cpu_ldb_code_mmu(CPUArchState *env, abi_ptr addr,
> +uint8_t cpu_ldb_code_mmu(CPUArchState *env, vaddr addr,
> MemOpIdx oi, uintptr_t retaddr)
> {
> return do_ld1_mmu(env_cpu(env), addr, oi, retaddr, MMU_INST_FETCH);
> }
>
> -uint16_t cpu_ldw_code_mmu(CPUArchState *env, abi_ptr addr,
> +uint16_t cpu_ldw_code_mmu(CPUArchState *env, vaddr addr,
> MemOpIdx oi, uintptr_t retaddr)
> {
> return do_ld2_mmu(env_cpu(env), addr, oi, retaddr, MMU_INST_FETCH);
> }
>
> -uint32_t cpu_ldl_code_mmu(CPUArchState *env, abi_ptr addr,
> +uint32_t cpu_ldl_code_mmu(CPUArchState *env, vaddr addr,
> MemOpIdx oi, uintptr_t retaddr)
> {
> return do_ld4_mmu(env_cpu(env), addr, oi, retaddr, MMU_INST_FETCH);
> }
>
> -uint64_t cpu_ldq_code_mmu(CPUArchState *env, abi_ptr addr,
> +uint64_t cpu_ldq_code_mmu(CPUArchState *env, vaddr addr,
> MemOpIdx oi, uintptr_t retaddr)
> {
> return do_ld8_mmu(env_cpu(env), addr, oi, retaddr, MMU_INST_FETCH);
> diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
> index 2322181b15..3f63b194bb 100644
> --- a/accel/tcg/user-exec.c
> +++ b/accel/tcg/user-exec.c
> @@ -1254,7 +1254,7 @@ uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr ptr)
> return ret;
> }
>
> -uint8_t cpu_ldb_code_mmu(CPUArchState *env, abi_ptr addr,
> +uint8_t cpu_ldb_code_mmu(CPUArchState *env, vaddr addr,
> MemOpIdx oi, uintptr_t ra)
> {
> void *haddr;
> @@ -1266,7 +1266,7 @@ uint8_t cpu_ldb_code_mmu(CPUArchState *env, abi_ptr addr,
> return ret;
> }
>
> -uint16_t cpu_ldw_code_mmu(CPUArchState *env, abi_ptr addr,
> +uint16_t cpu_ldw_code_mmu(CPUArchState *env, vaddr addr,
> MemOpIdx oi, uintptr_t ra)
> {
> void *haddr;
> @@ -1281,7 +1281,7 @@ uint16_t cpu_ldw_code_mmu(CPUArchState *env, abi_ptr addr,
> return ret;
> }
>
> -uint32_t cpu_ldl_code_mmu(CPUArchState *env, abi_ptr addr,
> +uint32_t cpu_ldl_code_mmu(CPUArchState *env, vaddr addr,
> MemOpIdx oi, uintptr_t ra)
> {
> void *haddr;
> @@ -1296,7 +1296,7 @@ uint32_t cpu_ldl_code_mmu(CPUArchState *env, abi_ptr addr,
> return ret;
> }
>
> -uint64_t cpu_ldq_code_mmu(CPUArchState *env, abi_ptr addr,
> +uint64_t cpu_ldq_code_mmu(CPUArchState *env, vaddr addr,
> MemOpIdx oi, uintptr_t ra)
> {
> void *haddr;
> diff --git a/accel/tcg/ldst_common.c.inc b/accel/tcg/ldst_common.c.inc
> index ebbf380d76..0447c0bb92 100644
> --- a/accel/tcg/ldst_common.c.inc
> +++ b/accel/tcg/ldst_common.c.inc
> @@ -135,7 +135,7 @@ static void plugin_load_cb(CPUArchState *env, abi_ptr addr,
> }
> }
>
> -uint8_t cpu_ldb_mmu(CPUArchState *env, abi_ptr addr, MemOpIdx oi, uintptr_t ra)
> +uint8_t cpu_ldb_mmu(CPUArchState *env, vaddr addr, MemOpIdx oi, uintptr_t ra)
> {
> uint8_t ret;
>
> @@ -145,7 +145,7 @@ uint8_t cpu_ldb_mmu(CPUArchState *env, abi_ptr addr, MemOpIdx oi, uintptr_t ra)
> return ret;
> }
>
> -uint16_t cpu_ldw_mmu(CPUArchState *env, abi_ptr addr,
> +uint16_t cpu_ldw_mmu(CPUArchState *env, vaddr addr,
> MemOpIdx oi, uintptr_t ra)
> {
> uint16_t ret;
> @@ -156,7 +156,7 @@ uint16_t cpu_ldw_mmu(CPUArchState *env, abi_ptr addr,
> return ret;
> }
>
> -uint32_t cpu_ldl_mmu(CPUArchState *env, abi_ptr addr,
> +uint32_t cpu_ldl_mmu(CPUArchState *env, vaddr addr,
> MemOpIdx oi, uintptr_t ra)
> {
> uint32_t ret;
> @@ -167,7 +167,7 @@ uint32_t cpu_ldl_mmu(CPUArchState *env, abi_ptr addr,
> return ret;
> }
>
> -uint64_t cpu_ldq_mmu(CPUArchState *env, abi_ptr addr,
> +uint64_t cpu_ldq_mmu(CPUArchState *env, vaddr addr,
> MemOpIdx oi, uintptr_t ra)
> {
> uint64_t ret;
> @@ -178,7 +178,7 @@ uint64_t cpu_ldq_mmu(CPUArchState *env, abi_ptr addr,
> return ret;
> }
>
> -Int128 cpu_ld16_mmu(CPUArchState *env, abi_ptr addr,
> +Int128 cpu_ld16_mmu(CPUArchState *env, vaddr addr,
> MemOpIdx oi, uintptr_t ra)
> {
> Int128 ret;
> @@ -205,14 +205,14 @@ static void plugin_store_cb(CPUArchState *env, abi_ptr addr,
> }
> }
>
> -void cpu_stb_mmu(CPUArchState *env, abi_ptr addr, uint8_t val,
> +void cpu_stb_mmu(CPUArchState *env, vaddr addr, uint8_t val,
> MemOpIdx oi, uintptr_t retaddr)
> {
> helper_stb_mmu(env, addr, val, oi, retaddr);
> plugin_store_cb(env, addr, val, 0, oi);
> }
>
> -void cpu_stw_mmu(CPUArchState *env, abi_ptr addr, uint16_t val,
> +void cpu_stw_mmu(CPUArchState *env, vaddr addr, uint16_t val,
> MemOpIdx oi, uintptr_t retaddr)
> {
> tcg_debug_assert((get_memop(oi) & MO_SIZE) == MO_16);
> @@ -220,7 +220,7 @@ void cpu_stw_mmu(CPUArchState *env, abi_ptr addr, uint16_t val,
> plugin_store_cb(env, addr, val, 0, oi);
> }
>
> -void cpu_stl_mmu(CPUArchState *env, abi_ptr addr, uint32_t val,
> +void cpu_stl_mmu(CPUArchState *env, vaddr addr, uint32_t val,
> MemOpIdx oi, uintptr_t retaddr)
> {
> tcg_debug_assert((get_memop(oi) & MO_SIZE) == MO_32);
> @@ -228,7 +228,7 @@ void cpu_stl_mmu(CPUArchState *env, abi_ptr addr, uint32_t val,
> plugin_store_cb(env, addr, val, 0, oi);
> }
>
> -void cpu_stq_mmu(CPUArchState *env, abi_ptr addr, uint64_t val,
> +void cpu_stq_mmu(CPUArchState *env, vaddr addr, uint64_t val,
> MemOpIdx oi, uintptr_t retaddr)
> {
> tcg_debug_assert((get_memop(oi) & MO_SIZE) == MO_64);
> @@ -236,7 +236,7 @@ void cpu_stq_mmu(CPUArchState *env, abi_ptr addr, uint64_t val,
> plugin_store_cb(env, addr, val, 0, oi);
> }
>
> -void cpu_st16_mmu(CPUArchState *env, abi_ptr addr, Int128 val,
> +void cpu_st16_mmu(CPUArchState *env, vaddr addr, Int128 val,
> MemOpIdx oi, uintptr_t retaddr)
> {
> tcg_debug_assert((get_memop(oi) & MO_SIZE) == MO_128);
Restricting 64bit targets on 32bit hosts comes with nice benefits.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 04/37] include/exec: Split out cpu-ldst-common.h
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (2 preceding siblings ...)
2025-03-13 3:44 ` [PATCH 03/37] include/exec: Use vaddr for *_mmu guest memory access routines Richard Henderson
@ 2025-03-13 3:44 ` Richard Henderson
2025-03-13 16:50 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 05/37] include/exec: Inline *_mmuidx_ra memory operations Richard Henderson
` (34 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
Split out the *_mmu api, which no longer uses
target specific argument types.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/cpu-ldst-common.h | 122 +++++++++++++++++++++++++++++++++
include/exec/cpu_ldst.h | 108 +----------------------------
2 files changed, 123 insertions(+), 107 deletions(-)
create mode 100644 include/exec/cpu-ldst-common.h
diff --git a/include/exec/cpu-ldst-common.h b/include/exec/cpu-ldst-common.h
new file mode 100644
index 0000000000..c46a6ade5d
--- /dev/null
+++ b/include/exec/cpu-ldst-common.h
@@ -0,0 +1,122 @@
+/*
+ * Software MMU support
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
+#ifndef CPU_LDST_COMMON_H
+#define CPU_LDST_COMMON_H
+
+#ifndef CONFIG_TCG
+#error Can only include this header with TCG
+#endif
+
+#include "exec/memopidx.h"
+#include "exec/vaddr.h"
+#include "exec/mmu-access-type.h"
+#include "qemu/int128.h"
+
+uint8_t cpu_ldb_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
+uint16_t cpu_ldw_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
+uint32_t cpu_ldl_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
+uint64_t cpu_ldq_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
+Int128 cpu_ld16_mmu(CPUArchState *env, vaddr addr, MemOpIdx oi, uintptr_t ra);
+
+void cpu_stb_mmu(CPUArchState *env, vaddr ptr, uint8_t val,
+ MemOpIdx oi, uintptr_t ra);
+void cpu_stw_mmu(CPUArchState *env, vaddr ptr, uint16_t val,
+ MemOpIdx oi, uintptr_t ra);
+void cpu_stl_mmu(CPUArchState *env, vaddr ptr, uint32_t val,
+ MemOpIdx oi, uintptr_t ra);
+void cpu_stq_mmu(CPUArchState *env, vaddr ptr, uint64_t val,
+ MemOpIdx oi, uintptr_t ra);
+void cpu_st16_mmu(CPUArchState *env, vaddr addr, Int128 val,
+ MemOpIdx oi, uintptr_t ra);
+
+uint32_t cpu_atomic_cmpxchgb_mmu(CPUArchState *env, vaddr addr,
+ uint32_t cmpv, uint32_t newv,
+ MemOpIdx oi, uintptr_t retaddr);
+uint32_t cpu_atomic_cmpxchgw_le_mmu(CPUArchState *env, vaddr addr,
+ uint32_t cmpv, uint32_t newv,
+ MemOpIdx oi, uintptr_t retaddr);
+uint32_t cpu_atomic_cmpxchgl_le_mmu(CPUArchState *env, vaddr addr,
+ uint32_t cmpv, uint32_t newv,
+ MemOpIdx oi, uintptr_t retaddr);
+uint64_t cpu_atomic_cmpxchgq_le_mmu(CPUArchState *env, vaddr addr,
+ uint64_t cmpv, uint64_t newv,
+ MemOpIdx oi, uintptr_t retaddr);
+uint32_t cpu_atomic_cmpxchgw_be_mmu(CPUArchState *env, vaddr addr,
+ uint32_t cmpv, uint32_t newv,
+ MemOpIdx oi, uintptr_t retaddr);
+uint32_t cpu_atomic_cmpxchgl_be_mmu(CPUArchState *env, vaddr addr,
+ uint32_t cmpv, uint32_t newv,
+ MemOpIdx oi, uintptr_t retaddr);
+uint64_t cpu_atomic_cmpxchgq_be_mmu(CPUArchState *env, vaddr addr,
+ uint64_t cmpv, uint64_t newv,
+ MemOpIdx oi, uintptr_t retaddr);
+
+#define GEN_ATOMIC_HELPER(NAME, TYPE, SUFFIX) \
+TYPE cpu_atomic_ ## NAME ## SUFFIX ## _mmu \
+ (CPUArchState *env, vaddr addr, TYPE val, \
+ MemOpIdx oi, uintptr_t retaddr);
+
+#ifdef CONFIG_ATOMIC64
+#define GEN_ATOMIC_HELPER_ALL(NAME) \
+ GEN_ATOMIC_HELPER(NAME, uint32_t, b) \
+ GEN_ATOMIC_HELPER(NAME, uint32_t, w_le) \
+ GEN_ATOMIC_HELPER(NAME, uint32_t, w_be) \
+ GEN_ATOMIC_HELPER(NAME, uint32_t, l_le) \
+ GEN_ATOMIC_HELPER(NAME, uint32_t, l_be) \
+ GEN_ATOMIC_HELPER(NAME, uint64_t, q_le) \
+ GEN_ATOMIC_HELPER(NAME, uint64_t, q_be)
+#else
+#define GEN_ATOMIC_HELPER_ALL(NAME) \
+ GEN_ATOMIC_HELPER(NAME, uint32_t, b) \
+ GEN_ATOMIC_HELPER(NAME, uint32_t, w_le) \
+ GEN_ATOMIC_HELPER(NAME, uint32_t, w_be) \
+ GEN_ATOMIC_HELPER(NAME, uint32_t, l_le) \
+ GEN_ATOMIC_HELPER(NAME, uint32_t, l_be)
+#endif
+
+GEN_ATOMIC_HELPER_ALL(fetch_add)
+GEN_ATOMIC_HELPER_ALL(fetch_sub)
+GEN_ATOMIC_HELPER_ALL(fetch_and)
+GEN_ATOMIC_HELPER_ALL(fetch_or)
+GEN_ATOMIC_HELPER_ALL(fetch_xor)
+GEN_ATOMIC_HELPER_ALL(fetch_smin)
+GEN_ATOMIC_HELPER_ALL(fetch_umin)
+GEN_ATOMIC_HELPER_ALL(fetch_smax)
+GEN_ATOMIC_HELPER_ALL(fetch_umax)
+
+GEN_ATOMIC_HELPER_ALL(add_fetch)
+GEN_ATOMIC_HELPER_ALL(sub_fetch)
+GEN_ATOMIC_HELPER_ALL(and_fetch)
+GEN_ATOMIC_HELPER_ALL(or_fetch)
+GEN_ATOMIC_HELPER_ALL(xor_fetch)
+GEN_ATOMIC_HELPER_ALL(smin_fetch)
+GEN_ATOMIC_HELPER_ALL(umin_fetch)
+GEN_ATOMIC_HELPER_ALL(smax_fetch)
+GEN_ATOMIC_HELPER_ALL(umax_fetch)
+
+GEN_ATOMIC_HELPER_ALL(xchg)
+
+#undef GEN_ATOMIC_HELPER_ALL
+#undef GEN_ATOMIC_HELPER
+
+Int128 cpu_atomic_cmpxchgo_le_mmu(CPUArchState *env, vaddr addr,
+ Int128 cmpv, Int128 newv,
+ MemOpIdx oi, uintptr_t retaddr);
+Int128 cpu_atomic_cmpxchgo_be_mmu(CPUArchState *env, vaddr addr,
+ Int128 cmpv, Int128 newv,
+ MemOpIdx oi, uintptr_t retaddr);
+
+uint8_t cpu_ldb_code_mmu(CPUArchState *env, vaddr addr,
+ MemOpIdx oi, uintptr_t ra);
+uint16_t cpu_ldw_code_mmu(CPUArchState *env, vaddr addr,
+ MemOpIdx oi, uintptr_t ra);
+uint32_t cpu_ldl_code_mmu(CPUArchState *env, vaddr addr,
+ MemOpIdx oi, uintptr_t ra);
+uint64_t cpu_ldq_code_mmu(CPUArchState *env, vaddr addr,
+ MemOpIdx oi, uintptr_t ra);
+
+#endif /* CPU_LDST_COMMON_H */
diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index ddd8e0cf48..1fbdbe59ae 100644
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -66,11 +66,8 @@
#error Can only include this header with TCG
#endif
-#include "exec/memopidx.h"
-#include "exec/vaddr.h"
+#include "exec/cpu-ldst-common.h"
#include "exec/abi_ptr.h"
-#include "exec/mmu-access-type.h"
-#include "qemu/int128.h"
#if defined(CONFIG_USER_ONLY)
#include "user/guest-host.h"
@@ -157,100 +154,6 @@ void cpu_stl_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr, uint32_t val,
void cpu_stq_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr, uint64_t val,
int mmu_idx, uintptr_t ra);
-uint8_t cpu_ldb_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
-uint16_t cpu_ldw_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
-uint32_t cpu_ldl_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
-uint64_t cpu_ldq_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
-Int128 cpu_ld16_mmu(CPUArchState *env, vaddr addr, MemOpIdx oi, uintptr_t ra);
-
-void cpu_stb_mmu(CPUArchState *env, vaddr ptr, uint8_t val,
- MemOpIdx oi, uintptr_t ra);
-void cpu_stw_mmu(CPUArchState *env, vaddr ptr, uint16_t val,
- MemOpIdx oi, uintptr_t ra);
-void cpu_stl_mmu(CPUArchState *env, vaddr ptr, uint32_t val,
- MemOpIdx oi, uintptr_t ra);
-void cpu_stq_mmu(CPUArchState *env, vaddr ptr, uint64_t val,
- MemOpIdx oi, uintptr_t ra);
-void cpu_st16_mmu(CPUArchState *env, vaddr addr, Int128 val,
- MemOpIdx oi, uintptr_t ra);
-
-uint32_t cpu_atomic_cmpxchgb_mmu(CPUArchState *env, vaddr addr,
- uint32_t cmpv, uint32_t newv,
- MemOpIdx oi, uintptr_t retaddr);
-uint32_t cpu_atomic_cmpxchgw_le_mmu(CPUArchState *env, vaddr addr,
- uint32_t cmpv, uint32_t newv,
- MemOpIdx oi, uintptr_t retaddr);
-uint32_t cpu_atomic_cmpxchgl_le_mmu(CPUArchState *env, vaddr addr,
- uint32_t cmpv, uint32_t newv,
- MemOpIdx oi, uintptr_t retaddr);
-uint64_t cpu_atomic_cmpxchgq_le_mmu(CPUArchState *env, vaddr addr,
- uint64_t cmpv, uint64_t newv,
- MemOpIdx oi, uintptr_t retaddr);
-uint32_t cpu_atomic_cmpxchgw_be_mmu(CPUArchState *env, vaddr addr,
- uint32_t cmpv, uint32_t newv,
- MemOpIdx oi, uintptr_t retaddr);
-uint32_t cpu_atomic_cmpxchgl_be_mmu(CPUArchState *env, vaddr addr,
- uint32_t cmpv, uint32_t newv,
- MemOpIdx oi, uintptr_t retaddr);
-uint64_t cpu_atomic_cmpxchgq_be_mmu(CPUArchState *env, vaddr addr,
- uint64_t cmpv, uint64_t newv,
- MemOpIdx oi, uintptr_t retaddr);
-
-#define GEN_ATOMIC_HELPER(NAME, TYPE, SUFFIX) \
-TYPE cpu_atomic_ ## NAME ## SUFFIX ## _mmu \
- (CPUArchState *env, vaddr addr, TYPE val, \
- MemOpIdx oi, uintptr_t retaddr);
-
-#ifdef CONFIG_ATOMIC64
-#define GEN_ATOMIC_HELPER_ALL(NAME) \
- GEN_ATOMIC_HELPER(NAME, uint32_t, b) \
- GEN_ATOMIC_HELPER(NAME, uint32_t, w_le) \
- GEN_ATOMIC_HELPER(NAME, uint32_t, w_be) \
- GEN_ATOMIC_HELPER(NAME, uint32_t, l_le) \
- GEN_ATOMIC_HELPER(NAME, uint32_t, l_be) \
- GEN_ATOMIC_HELPER(NAME, uint64_t, q_le) \
- GEN_ATOMIC_HELPER(NAME, uint64_t, q_be)
-#else
-#define GEN_ATOMIC_HELPER_ALL(NAME) \
- GEN_ATOMIC_HELPER(NAME, uint32_t, b) \
- GEN_ATOMIC_HELPER(NAME, uint32_t, w_le) \
- GEN_ATOMIC_HELPER(NAME, uint32_t, w_be) \
- GEN_ATOMIC_HELPER(NAME, uint32_t, l_le) \
- GEN_ATOMIC_HELPER(NAME, uint32_t, l_be)
-#endif
-
-GEN_ATOMIC_HELPER_ALL(fetch_add)
-GEN_ATOMIC_HELPER_ALL(fetch_sub)
-GEN_ATOMIC_HELPER_ALL(fetch_and)
-GEN_ATOMIC_HELPER_ALL(fetch_or)
-GEN_ATOMIC_HELPER_ALL(fetch_xor)
-GEN_ATOMIC_HELPER_ALL(fetch_smin)
-GEN_ATOMIC_HELPER_ALL(fetch_umin)
-GEN_ATOMIC_HELPER_ALL(fetch_smax)
-GEN_ATOMIC_HELPER_ALL(fetch_umax)
-
-GEN_ATOMIC_HELPER_ALL(add_fetch)
-GEN_ATOMIC_HELPER_ALL(sub_fetch)
-GEN_ATOMIC_HELPER_ALL(and_fetch)
-GEN_ATOMIC_HELPER_ALL(or_fetch)
-GEN_ATOMIC_HELPER_ALL(xor_fetch)
-GEN_ATOMIC_HELPER_ALL(smin_fetch)
-GEN_ATOMIC_HELPER_ALL(umin_fetch)
-GEN_ATOMIC_HELPER_ALL(smax_fetch)
-GEN_ATOMIC_HELPER_ALL(umax_fetch)
-
-GEN_ATOMIC_HELPER_ALL(xchg)
-
-#undef GEN_ATOMIC_HELPER_ALL
-#undef GEN_ATOMIC_HELPER
-
-Int128 cpu_atomic_cmpxchgo_le_mmu(CPUArchState *env, vaddr addr,
- Int128 cmpv, Int128 newv,
- MemOpIdx oi, uintptr_t retaddr);
-Int128 cpu_atomic_cmpxchgo_be_mmu(CPUArchState *env, vaddr addr,
- Int128 cmpv, Int128 newv,
- MemOpIdx oi, uintptr_t retaddr);
-
#if TARGET_BIG_ENDIAN
# define cpu_lduw_data cpu_lduw_be_data
# define cpu_ldsw_data cpu_ldsw_be_data
@@ -297,15 +200,6 @@ Int128 cpu_atomic_cmpxchgo_be_mmu(CPUArchState *env, vaddr addr,
# define cpu_stq_mmuidx_ra cpu_stq_le_mmuidx_ra
#endif
-uint8_t cpu_ldb_code_mmu(CPUArchState *env, vaddr addr,
- MemOpIdx oi, uintptr_t ra);
-uint16_t cpu_ldw_code_mmu(CPUArchState *env, vaddr addr,
- MemOpIdx oi, uintptr_t ra);
-uint32_t cpu_ldl_code_mmu(CPUArchState *env, vaddr addr,
- MemOpIdx oi, uintptr_t ra);
-uint64_t cpu_ldq_code_mmu(CPUArchState *env, vaddr addr,
- MemOpIdx oi, uintptr_t ra);
-
uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr);
uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr addr);
uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr addr);
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 04/37] include/exec: Split out cpu-ldst-common.h
2025-03-13 3:44 ` [PATCH 04/37] include/exec: Split out cpu-ldst-common.h Richard Henderson
@ 2025-03-13 16:50 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 16:50 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> Split out the *_mmu api, which no longer uses
> target specific argument types.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/exec/cpu-ldst-common.h | 122 +++++++++++++++++++++++++++++++++
> include/exec/cpu_ldst.h | 108 +----------------------------
> 2 files changed, 123 insertions(+), 107 deletions(-)
> create mode 100644 include/exec/cpu-ldst-common.h
>
> diff --git a/include/exec/cpu-ldst-common.h b/include/exec/cpu-ldst-common.h
> new file mode 100644
> index 0000000000..c46a6ade5d
> --- /dev/null
> +++ b/include/exec/cpu-ldst-common.h
> @@ -0,0 +1,122 @@
> +/*
> + * Software MMU support
> + *
> + * SPDX-License-Identifier: LGPL-2.1-or-later
> + */
> +
> +#ifndef CPU_LDST_COMMON_H
> +#define CPU_LDST_COMMON_H
> +
> +#ifndef CONFIG_TCG
> +#error Can only include this header with TCG
> +#endif
> +
> +#include "exec/memopidx.h"
> +#include "exec/vaddr.h"
> +#include "exec/mmu-access-type.h"
> +#include "qemu/int128.h"
> +
> +uint8_t cpu_ldb_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
> +uint16_t cpu_ldw_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
> +uint32_t cpu_ldl_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
> +uint64_t cpu_ldq_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
> +Int128 cpu_ld16_mmu(CPUArchState *env, vaddr addr, MemOpIdx oi, uintptr_t ra);
> +
> +void cpu_stb_mmu(CPUArchState *env, vaddr ptr, uint8_t val,
> + MemOpIdx oi, uintptr_t ra);
> +void cpu_stw_mmu(CPUArchState *env, vaddr ptr, uint16_t val,
> + MemOpIdx oi, uintptr_t ra);
> +void cpu_stl_mmu(CPUArchState *env, vaddr ptr, uint32_t val,
> + MemOpIdx oi, uintptr_t ra);
> +void cpu_stq_mmu(CPUArchState *env, vaddr ptr, uint64_t val,
> + MemOpIdx oi, uintptr_t ra);
> +void cpu_st16_mmu(CPUArchState *env, vaddr addr, Int128 val,
> + MemOpIdx oi, uintptr_t ra);
> +
> +uint32_t cpu_atomic_cmpxchgb_mmu(CPUArchState *env, vaddr addr,
> + uint32_t cmpv, uint32_t newv,
> + MemOpIdx oi, uintptr_t retaddr);
> +uint32_t cpu_atomic_cmpxchgw_le_mmu(CPUArchState *env, vaddr addr,
> + uint32_t cmpv, uint32_t newv,
> + MemOpIdx oi, uintptr_t retaddr);
> +uint32_t cpu_atomic_cmpxchgl_le_mmu(CPUArchState *env, vaddr addr,
> + uint32_t cmpv, uint32_t newv,
> + MemOpIdx oi, uintptr_t retaddr);
> +uint64_t cpu_atomic_cmpxchgq_le_mmu(CPUArchState *env, vaddr addr,
> + uint64_t cmpv, uint64_t newv,
> + MemOpIdx oi, uintptr_t retaddr);
> +uint32_t cpu_atomic_cmpxchgw_be_mmu(CPUArchState *env, vaddr addr,
> + uint32_t cmpv, uint32_t newv,
> + MemOpIdx oi, uintptr_t retaddr);
> +uint32_t cpu_atomic_cmpxchgl_be_mmu(CPUArchState *env, vaddr addr,
> + uint32_t cmpv, uint32_t newv,
> + MemOpIdx oi, uintptr_t retaddr);
> +uint64_t cpu_atomic_cmpxchgq_be_mmu(CPUArchState *env, vaddr addr,
> + uint64_t cmpv, uint64_t newv,
> + MemOpIdx oi, uintptr_t retaddr);
> +
> +#define GEN_ATOMIC_HELPER(NAME, TYPE, SUFFIX) \
> +TYPE cpu_atomic_ ## NAME ## SUFFIX ## _mmu \
> + (CPUArchState *env, vaddr addr, TYPE val, \
> + MemOpIdx oi, uintptr_t retaddr);
> +
> +#ifdef CONFIG_ATOMIC64
> +#define GEN_ATOMIC_HELPER_ALL(NAME) \
> + GEN_ATOMIC_HELPER(NAME, uint32_t, b) \
> + GEN_ATOMIC_HELPER(NAME, uint32_t, w_le) \
> + GEN_ATOMIC_HELPER(NAME, uint32_t, w_be) \
> + GEN_ATOMIC_HELPER(NAME, uint32_t, l_le) \
> + GEN_ATOMIC_HELPER(NAME, uint32_t, l_be) \
> + GEN_ATOMIC_HELPER(NAME, uint64_t, q_le) \
> + GEN_ATOMIC_HELPER(NAME, uint64_t, q_be)
> +#else
> +#define GEN_ATOMIC_HELPER_ALL(NAME) \
> + GEN_ATOMIC_HELPER(NAME, uint32_t, b) \
> + GEN_ATOMIC_HELPER(NAME, uint32_t, w_le) \
> + GEN_ATOMIC_HELPER(NAME, uint32_t, w_be) \
> + GEN_ATOMIC_HELPER(NAME, uint32_t, l_le) \
> + GEN_ATOMIC_HELPER(NAME, uint32_t, l_be)
> +#endif
> +
> +GEN_ATOMIC_HELPER_ALL(fetch_add)
> +GEN_ATOMIC_HELPER_ALL(fetch_sub)
> +GEN_ATOMIC_HELPER_ALL(fetch_and)
> +GEN_ATOMIC_HELPER_ALL(fetch_or)
> +GEN_ATOMIC_HELPER_ALL(fetch_xor)
> +GEN_ATOMIC_HELPER_ALL(fetch_smin)
> +GEN_ATOMIC_HELPER_ALL(fetch_umin)
> +GEN_ATOMIC_HELPER_ALL(fetch_smax)
> +GEN_ATOMIC_HELPER_ALL(fetch_umax)
> +
> +GEN_ATOMIC_HELPER_ALL(add_fetch)
> +GEN_ATOMIC_HELPER_ALL(sub_fetch)
> +GEN_ATOMIC_HELPER_ALL(and_fetch)
> +GEN_ATOMIC_HELPER_ALL(or_fetch)
> +GEN_ATOMIC_HELPER_ALL(xor_fetch)
> +GEN_ATOMIC_HELPER_ALL(smin_fetch)
> +GEN_ATOMIC_HELPER_ALL(umin_fetch)
> +GEN_ATOMIC_HELPER_ALL(smax_fetch)
> +GEN_ATOMIC_HELPER_ALL(umax_fetch)
> +
> +GEN_ATOMIC_HELPER_ALL(xchg)
> +
> +#undef GEN_ATOMIC_HELPER_ALL
> +#undef GEN_ATOMIC_HELPER
> +
> +Int128 cpu_atomic_cmpxchgo_le_mmu(CPUArchState *env, vaddr addr,
> + Int128 cmpv, Int128 newv,
> + MemOpIdx oi, uintptr_t retaddr);
> +Int128 cpu_atomic_cmpxchgo_be_mmu(CPUArchState *env, vaddr addr,
> + Int128 cmpv, Int128 newv,
> + MemOpIdx oi, uintptr_t retaddr);
> +
> +uint8_t cpu_ldb_code_mmu(CPUArchState *env, vaddr addr,
> + MemOpIdx oi, uintptr_t ra);
> +uint16_t cpu_ldw_code_mmu(CPUArchState *env, vaddr addr,
> + MemOpIdx oi, uintptr_t ra);
> +uint32_t cpu_ldl_code_mmu(CPUArchState *env, vaddr addr,
> + MemOpIdx oi, uintptr_t ra);
> +uint64_t cpu_ldq_code_mmu(CPUArchState *env, vaddr addr,
> + MemOpIdx oi, uintptr_t ra);
> +
> +#endif /* CPU_LDST_COMMON_H */
> diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
> index ddd8e0cf48..1fbdbe59ae 100644
> --- a/include/exec/cpu_ldst.h
> +++ b/include/exec/cpu_ldst.h
> @@ -66,11 +66,8 @@
> #error Can only include this header with TCG
> #endif
>
> -#include "exec/memopidx.h"
> -#include "exec/vaddr.h"
> +#include "exec/cpu-ldst-common.h"
> #include "exec/abi_ptr.h"
> -#include "exec/mmu-access-type.h"
> -#include "qemu/int128.h"
>
> #if defined(CONFIG_USER_ONLY)
> #include "user/guest-host.h"
> @@ -157,100 +154,6 @@ void cpu_stl_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr, uint32_t val,
> void cpu_stq_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr, uint64_t val,
> int mmu_idx, uintptr_t ra);
>
> -uint8_t cpu_ldb_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
> -uint16_t cpu_ldw_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
> -uint32_t cpu_ldl_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
> -uint64_t cpu_ldq_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra);
> -Int128 cpu_ld16_mmu(CPUArchState *env, vaddr addr, MemOpIdx oi, uintptr_t ra);
> -
> -void cpu_stb_mmu(CPUArchState *env, vaddr ptr, uint8_t val,
> - MemOpIdx oi, uintptr_t ra);
> -void cpu_stw_mmu(CPUArchState *env, vaddr ptr, uint16_t val,
> - MemOpIdx oi, uintptr_t ra);
> -void cpu_stl_mmu(CPUArchState *env, vaddr ptr, uint32_t val,
> - MemOpIdx oi, uintptr_t ra);
> -void cpu_stq_mmu(CPUArchState *env, vaddr ptr, uint64_t val,
> - MemOpIdx oi, uintptr_t ra);
> -void cpu_st16_mmu(CPUArchState *env, vaddr addr, Int128 val,
> - MemOpIdx oi, uintptr_t ra);
> -
> -uint32_t cpu_atomic_cmpxchgb_mmu(CPUArchState *env, vaddr addr,
> - uint32_t cmpv, uint32_t newv,
> - MemOpIdx oi, uintptr_t retaddr);
> -uint32_t cpu_atomic_cmpxchgw_le_mmu(CPUArchState *env, vaddr addr,
> - uint32_t cmpv, uint32_t newv,
> - MemOpIdx oi, uintptr_t retaddr);
> -uint32_t cpu_atomic_cmpxchgl_le_mmu(CPUArchState *env, vaddr addr,
> - uint32_t cmpv, uint32_t newv,
> - MemOpIdx oi, uintptr_t retaddr);
> -uint64_t cpu_atomic_cmpxchgq_le_mmu(CPUArchState *env, vaddr addr,
> - uint64_t cmpv, uint64_t newv,
> - MemOpIdx oi, uintptr_t retaddr);
> -uint32_t cpu_atomic_cmpxchgw_be_mmu(CPUArchState *env, vaddr addr,
> - uint32_t cmpv, uint32_t newv,
> - MemOpIdx oi, uintptr_t retaddr);
> -uint32_t cpu_atomic_cmpxchgl_be_mmu(CPUArchState *env, vaddr addr,
> - uint32_t cmpv, uint32_t newv,
> - MemOpIdx oi, uintptr_t retaddr);
> -uint64_t cpu_atomic_cmpxchgq_be_mmu(CPUArchState *env, vaddr addr,
> - uint64_t cmpv, uint64_t newv,
> - MemOpIdx oi, uintptr_t retaddr);
> -
> -#define GEN_ATOMIC_HELPER(NAME, TYPE, SUFFIX) \
> -TYPE cpu_atomic_ ## NAME ## SUFFIX ## _mmu \
> - (CPUArchState *env, vaddr addr, TYPE val, \
> - MemOpIdx oi, uintptr_t retaddr);
> -
> -#ifdef CONFIG_ATOMIC64
> -#define GEN_ATOMIC_HELPER_ALL(NAME) \
> - GEN_ATOMIC_HELPER(NAME, uint32_t, b) \
> - GEN_ATOMIC_HELPER(NAME, uint32_t, w_le) \
> - GEN_ATOMIC_HELPER(NAME, uint32_t, w_be) \
> - GEN_ATOMIC_HELPER(NAME, uint32_t, l_le) \
> - GEN_ATOMIC_HELPER(NAME, uint32_t, l_be) \
> - GEN_ATOMIC_HELPER(NAME, uint64_t, q_le) \
> - GEN_ATOMIC_HELPER(NAME, uint64_t, q_be)
> -#else
> -#define GEN_ATOMIC_HELPER_ALL(NAME) \
> - GEN_ATOMIC_HELPER(NAME, uint32_t, b) \
> - GEN_ATOMIC_HELPER(NAME, uint32_t, w_le) \
> - GEN_ATOMIC_HELPER(NAME, uint32_t, w_be) \
> - GEN_ATOMIC_HELPER(NAME, uint32_t, l_le) \
> - GEN_ATOMIC_HELPER(NAME, uint32_t, l_be)
> -#endif
> -
> -GEN_ATOMIC_HELPER_ALL(fetch_add)
> -GEN_ATOMIC_HELPER_ALL(fetch_sub)
> -GEN_ATOMIC_HELPER_ALL(fetch_and)
> -GEN_ATOMIC_HELPER_ALL(fetch_or)
> -GEN_ATOMIC_HELPER_ALL(fetch_xor)
> -GEN_ATOMIC_HELPER_ALL(fetch_smin)
> -GEN_ATOMIC_HELPER_ALL(fetch_umin)
> -GEN_ATOMIC_HELPER_ALL(fetch_smax)
> -GEN_ATOMIC_HELPER_ALL(fetch_umax)
> -
> -GEN_ATOMIC_HELPER_ALL(add_fetch)
> -GEN_ATOMIC_HELPER_ALL(sub_fetch)
> -GEN_ATOMIC_HELPER_ALL(and_fetch)
> -GEN_ATOMIC_HELPER_ALL(or_fetch)
> -GEN_ATOMIC_HELPER_ALL(xor_fetch)
> -GEN_ATOMIC_HELPER_ALL(smin_fetch)
> -GEN_ATOMIC_HELPER_ALL(umin_fetch)
> -GEN_ATOMIC_HELPER_ALL(smax_fetch)
> -GEN_ATOMIC_HELPER_ALL(umax_fetch)
> -
> -GEN_ATOMIC_HELPER_ALL(xchg)
> -
> -#undef GEN_ATOMIC_HELPER_ALL
> -#undef GEN_ATOMIC_HELPER
> -
> -Int128 cpu_atomic_cmpxchgo_le_mmu(CPUArchState *env, vaddr addr,
> - Int128 cmpv, Int128 newv,
> - MemOpIdx oi, uintptr_t retaddr);
> -Int128 cpu_atomic_cmpxchgo_be_mmu(CPUArchState *env, vaddr addr,
> - Int128 cmpv, Int128 newv,
> - MemOpIdx oi, uintptr_t retaddr);
> -
> #if TARGET_BIG_ENDIAN
> # define cpu_lduw_data cpu_lduw_be_data
> # define cpu_ldsw_data cpu_ldsw_be_data
> @@ -297,15 +200,6 @@ Int128 cpu_atomic_cmpxchgo_be_mmu(CPUArchState *env, vaddr addr,
> # define cpu_stq_mmuidx_ra cpu_stq_le_mmuidx_ra
> #endif
>
> -uint8_t cpu_ldb_code_mmu(CPUArchState *env, vaddr addr,
> - MemOpIdx oi, uintptr_t ra);
> -uint16_t cpu_ldw_code_mmu(CPUArchState *env, vaddr addr,
> - MemOpIdx oi, uintptr_t ra);
> -uint32_t cpu_ldl_code_mmu(CPUArchState *env, vaddr addr,
> - MemOpIdx oi, uintptr_t ra);
> -uint64_t cpu_ldq_code_mmu(CPUArchState *env, vaddr addr,
> - MemOpIdx oi, uintptr_t ra);
> -
> uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr);
> uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr addr);
> uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr addr);
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 05/37] include/exec: Inline *_mmuidx_ra memory operations
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (3 preceding siblings ...)
2025-03-13 3:44 ` [PATCH 04/37] include/exec: Split out cpu-ldst-common.h Richard Henderson
@ 2025-03-13 3:44 ` Richard Henderson
2025-03-13 16:59 ` Pierrick Bouvier
2025-03-13 17:11 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 06/37] include/exec: Inline *_data_ra " Richard Henderson
` (33 subsequent siblings)
38 siblings, 2 replies; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
These expand inline to the *_mmu api with trivial
massaging of the arguments.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/cpu_ldst.h | 163 ++++++++++++++++++++++++++++--------
accel/tcg/ldst_common.c.inc | 118 --------------------------
2 files changed, 129 insertions(+), 152 deletions(-)
diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index 1fbdbe59ae..b33755169e 100644
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -118,41 +118,136 @@ void cpu_stl_le_data_ra(CPUArchState *env, abi_ptr ptr,
void cpu_stq_le_data_ra(CPUArchState *env, abi_ptr ptr,
uint64_t val, uintptr_t ra);
-uint32_t cpu_ldub_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
- int mmu_idx, uintptr_t ra);
-int cpu_ldsb_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
- int mmu_idx, uintptr_t ra);
-uint32_t cpu_lduw_be_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
- int mmu_idx, uintptr_t ra);
-int cpu_ldsw_be_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
- int mmu_idx, uintptr_t ra);
-uint32_t cpu_ldl_be_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
- int mmu_idx, uintptr_t ra);
-uint64_t cpu_ldq_be_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
- int mmu_idx, uintptr_t ra);
-uint32_t cpu_lduw_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
- int mmu_idx, uintptr_t ra);
-int cpu_ldsw_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
- int mmu_idx, uintptr_t ra);
-uint32_t cpu_ldl_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
- int mmu_idx, uintptr_t ra);
-uint64_t cpu_ldq_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
- int mmu_idx, uintptr_t ra);
+static inline uint32_t
+cpu_ldub_mmuidx_ra(CPUArchState *env, abi_ptr addr, int mmu_idx, uintptr_t ra)
+{
+ MemOpIdx oi = make_memop_idx(MO_UB, mmu_idx);
+ return cpu_ldb_mmu(env, addr, oi, ra);
+}
-void cpu_stb_mmuidx_ra(CPUArchState *env, abi_ptr ptr, uint32_t val,
- int mmu_idx, uintptr_t ra);
-void cpu_stw_be_mmuidx_ra(CPUArchState *env, abi_ptr ptr, uint32_t val,
- int mmu_idx, uintptr_t ra);
-void cpu_stl_be_mmuidx_ra(CPUArchState *env, abi_ptr ptr, uint32_t val,
- int mmu_idx, uintptr_t ra);
-void cpu_stq_be_mmuidx_ra(CPUArchState *env, abi_ptr ptr, uint64_t val,
- int mmu_idx, uintptr_t ra);
-void cpu_stw_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr, uint32_t val,
- int mmu_idx, uintptr_t ra);
-void cpu_stl_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr, uint32_t val,
- int mmu_idx, uintptr_t ra);
-void cpu_stq_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr, uint64_t val,
- int mmu_idx, uintptr_t ra);
+static inline int
+cpu_ldsb_mmuidx_ra(CPUArchState *env, abi_ptr addr, int mmu_idx, uintptr_t ra)
+{
+ return (int8_t)cpu_ldub_mmuidx_ra(env, addr, mmu_idx, ra);
+}
+
+static inline uint32_t
+cpu_lduw_be_mmuidx_ra(CPUArchState *env, abi_ptr addr,
+ int mmu_idx, uintptr_t ra)
+{
+ MemOpIdx oi = make_memop_idx(MO_BEUW | MO_UNALN, mmu_idx);
+ return cpu_ldw_mmu(env, addr, oi, ra);
+}
+
+static inline int
+cpu_ldsw_be_mmuidx_ra(CPUArchState *env, abi_ptr addr,
+ int mmu_idx, uintptr_t ra)
+{
+ return (int16_t)cpu_lduw_be_mmuidx_ra(env, addr, mmu_idx, ra);
+}
+
+static inline uint32_t
+cpu_ldl_be_mmuidx_ra(CPUArchState *env, abi_ptr addr,
+ int mmu_idx, uintptr_t ra)
+{
+ MemOpIdx oi = make_memop_idx(MO_BEUL | MO_UNALN, mmu_idx);
+ return cpu_ldl_mmu(env, addr, oi, ra);
+}
+
+static inline uint64_t
+cpu_ldq_be_mmuidx_ra(CPUArchState *env, abi_ptr addr,
+ int mmu_idx, uintptr_t ra)
+{
+ MemOpIdx oi = make_memop_idx(MO_BEUQ | MO_UNALN, mmu_idx);
+ return cpu_ldq_mmu(env, addr, oi, ra);
+}
+
+static inline uint32_t
+cpu_lduw_le_mmuidx_ra(CPUArchState *env, abi_ptr addr,
+ int mmu_idx, uintptr_t ra)
+{
+ MemOpIdx oi = make_memop_idx(MO_LEUW | MO_UNALN, mmu_idx);
+ return cpu_ldw_mmu(env, addr, oi, ra);
+}
+
+static inline int
+cpu_ldsw_le_mmuidx_ra(CPUArchState *env, abi_ptr addr,
+ int mmu_idx, uintptr_t ra)
+{
+ return (int16_t)cpu_lduw_le_mmuidx_ra(env, addr, mmu_idx, ra);
+}
+
+static inline uint32_t
+cpu_ldl_le_mmuidx_ra(CPUArchState *env, abi_ptr addr,
+ int mmu_idx, uintptr_t ra)
+{
+ MemOpIdx oi = make_memop_idx(MO_LEUL | MO_UNALN, mmu_idx);
+ return cpu_ldl_mmu(env, addr, oi, ra);
+}
+
+static inline uint64_t
+cpu_ldq_le_mmuidx_ra(CPUArchState *env, abi_ptr addr,
+ int mmu_idx, uintptr_t ra)
+{
+ MemOpIdx oi = make_memop_idx(MO_LEUQ | MO_UNALN, mmu_idx);
+ return cpu_ldq_mmu(env, addr, oi, ra);
+}
+
+static inline void
+cpu_stb_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint32_t val,
+ int mmu_idx, uintptr_t ra)
+{
+ MemOpIdx oi = make_memop_idx(MO_UB, mmu_idx);
+ cpu_stb_mmu(env, addr, val, oi, ra);
+}
+
+static inline void
+cpu_stw_be_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint32_t val,
+ int mmu_idx, uintptr_t ra)
+{
+ MemOpIdx oi = make_memop_idx(MO_BEUW | MO_UNALN, mmu_idx);
+ cpu_stw_mmu(env, addr, val, oi, ra);
+}
+
+static inline void
+cpu_stl_be_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint32_t val,
+ int mmu_idx, uintptr_t ra)
+{
+ MemOpIdx oi = make_memop_idx(MO_BEUL | MO_UNALN, mmu_idx);
+ cpu_stl_mmu(env, addr, val, oi, ra);
+}
+
+static inline void
+cpu_stq_be_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint64_t val,
+ int mmu_idx, uintptr_t ra)
+{
+ MemOpIdx oi = make_memop_idx(MO_BEUQ | MO_UNALN, mmu_idx);
+ cpu_stq_mmu(env, addr, val, oi, ra);
+}
+
+static inline void
+cpu_stw_le_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint32_t val,
+ int mmu_idx, uintptr_t ra)
+{
+ MemOpIdx oi = make_memop_idx(MO_LEUW | MO_UNALN, mmu_idx);
+ cpu_stw_mmu(env, addr, val, oi, ra);
+}
+
+static inline void
+cpu_stl_le_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint32_t val,
+ int mmu_idx, uintptr_t ra)
+{
+ MemOpIdx oi = make_memop_idx(MO_LEUL | MO_UNALN, mmu_idx);
+ cpu_stl_mmu(env, addr, val, oi, ra);
+}
+
+static inline void
+cpu_stq_le_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint64_t val,
+ int mmu_idx, uintptr_t ra)
+{
+ MemOpIdx oi = make_memop_idx(MO_LEUQ | MO_UNALN, mmu_idx);
+ cpu_stq_mmu(env, addr, val, oi, ra);
+}
#if TARGET_BIG_ENDIAN
# define cpu_lduw_data cpu_lduw_be_data
diff --git a/accel/tcg/ldst_common.c.inc b/accel/tcg/ldst_common.c.inc
index 0447c0bb92..99a56df3fb 100644
--- a/accel/tcg/ldst_common.c.inc
+++ b/accel/tcg/ldst_common.c.inc
@@ -248,124 +248,6 @@ void cpu_st16_mmu(CPUArchState *env, vaddr addr, Int128 val,
* Wrappers of the above
*/
-uint32_t cpu_ldub_mmuidx_ra(CPUArchState *env, abi_ptr addr,
- int mmu_idx, uintptr_t ra)
-{
- MemOpIdx oi = make_memop_idx(MO_UB, mmu_idx);
- return cpu_ldb_mmu(env, addr, oi, ra);
-}
-
-int cpu_ldsb_mmuidx_ra(CPUArchState *env, abi_ptr addr,
- int mmu_idx, uintptr_t ra)
-{
- return (int8_t)cpu_ldub_mmuidx_ra(env, addr, mmu_idx, ra);
-}
-
-uint32_t cpu_lduw_be_mmuidx_ra(CPUArchState *env, abi_ptr addr,
- int mmu_idx, uintptr_t ra)
-{
- MemOpIdx oi = make_memop_idx(MO_BEUW | MO_UNALN, mmu_idx);
- return cpu_ldw_mmu(env, addr, oi, ra);
-}
-
-int cpu_ldsw_be_mmuidx_ra(CPUArchState *env, abi_ptr addr,
- int mmu_idx, uintptr_t ra)
-{
- return (int16_t)cpu_lduw_be_mmuidx_ra(env, addr, mmu_idx, ra);
-}
-
-uint32_t cpu_ldl_be_mmuidx_ra(CPUArchState *env, abi_ptr addr,
- int mmu_idx, uintptr_t ra)
-{
- MemOpIdx oi = make_memop_idx(MO_BEUL | MO_UNALN, mmu_idx);
- return cpu_ldl_mmu(env, addr, oi, ra);
-}
-
-uint64_t cpu_ldq_be_mmuidx_ra(CPUArchState *env, abi_ptr addr,
- int mmu_idx, uintptr_t ra)
-{
- MemOpIdx oi = make_memop_idx(MO_BEUQ | MO_UNALN, mmu_idx);
- return cpu_ldq_mmu(env, addr, oi, ra);
-}
-
-uint32_t cpu_lduw_le_mmuidx_ra(CPUArchState *env, abi_ptr addr,
- int mmu_idx, uintptr_t ra)
-{
- MemOpIdx oi = make_memop_idx(MO_LEUW | MO_UNALN, mmu_idx);
- return cpu_ldw_mmu(env, addr, oi, ra);
-}
-
-int cpu_ldsw_le_mmuidx_ra(CPUArchState *env, abi_ptr addr,
- int mmu_idx, uintptr_t ra)
-{
- return (int16_t)cpu_lduw_le_mmuidx_ra(env, addr, mmu_idx, ra);
-}
-
-uint32_t cpu_ldl_le_mmuidx_ra(CPUArchState *env, abi_ptr addr,
- int mmu_idx, uintptr_t ra)
-{
- MemOpIdx oi = make_memop_idx(MO_LEUL | MO_UNALN, mmu_idx);
- return cpu_ldl_mmu(env, addr, oi, ra);
-}
-
-uint64_t cpu_ldq_le_mmuidx_ra(CPUArchState *env, abi_ptr addr,
- int mmu_idx, uintptr_t ra)
-{
- MemOpIdx oi = make_memop_idx(MO_LEUQ | MO_UNALN, mmu_idx);
- return cpu_ldq_mmu(env, addr, oi, ra);
-}
-
-void cpu_stb_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint32_t val,
- int mmu_idx, uintptr_t ra)
-{
- MemOpIdx oi = make_memop_idx(MO_UB, mmu_idx);
- cpu_stb_mmu(env, addr, val, oi, ra);
-}
-
-void cpu_stw_be_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint32_t val,
- int mmu_idx, uintptr_t ra)
-{
- MemOpIdx oi = make_memop_idx(MO_BEUW | MO_UNALN, mmu_idx);
- cpu_stw_mmu(env, addr, val, oi, ra);
-}
-
-void cpu_stl_be_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint32_t val,
- int mmu_idx, uintptr_t ra)
-{
- MemOpIdx oi = make_memop_idx(MO_BEUL | MO_UNALN, mmu_idx);
- cpu_stl_mmu(env, addr, val, oi, ra);
-}
-
-void cpu_stq_be_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint64_t val,
- int mmu_idx, uintptr_t ra)
-{
- MemOpIdx oi = make_memop_idx(MO_BEUQ | MO_UNALN, mmu_idx);
- cpu_stq_mmu(env, addr, val, oi, ra);
-}
-
-void cpu_stw_le_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint32_t val,
- int mmu_idx, uintptr_t ra)
-{
- MemOpIdx oi = make_memop_idx(MO_LEUW | MO_UNALN, mmu_idx);
- cpu_stw_mmu(env, addr, val, oi, ra);
-}
-
-void cpu_stl_le_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint32_t val,
- int mmu_idx, uintptr_t ra)
-{
- MemOpIdx oi = make_memop_idx(MO_LEUL | MO_UNALN, mmu_idx);
- cpu_stl_mmu(env, addr, val, oi, ra);
-}
-
-void cpu_stq_le_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint64_t val,
- int mmu_idx, uintptr_t ra)
-{
- MemOpIdx oi = make_memop_idx(MO_LEUQ | MO_UNALN, mmu_idx);
- cpu_stq_mmu(env, addr, val, oi, ra);
-}
-
-/*--------------------------*/
-
uint32_t cpu_ldub_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
{
int mmu_index = cpu_mmu_index(env_cpu(env), false);
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 05/37] include/exec: Inline *_mmuidx_ra memory operations
2025-03-13 3:44 ` [PATCH 05/37] include/exec: Inline *_mmuidx_ra memory operations Richard Henderson
@ 2025-03-13 16:59 ` Pierrick Bouvier
2025-03-13 18:05 ` Richard Henderson
2025-03-13 17:11 ` Pierrick Bouvier
1 sibling, 1 reply; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 16:59 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> These expand inline to the *_mmu api with trivial
> massaging of the arguments.
>
I hope they feel relaxed after that :).
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/exec/cpu_ldst.h | 163 ++++++++++++++++++++++++++++--------
> accel/tcg/ldst_common.c.inc | 118 --------------------------
> 2 files changed, 129 insertions(+), 152 deletions(-)
>
<snip>
> +
> +static inline int
> +cpu_ldsw_be_mmuidx_ra(CPUArchState *env, abi_ptr addr,
> + int mmu_idx, uintptr_t ra)
> +{
> + return (int16_t)cpu_lduw_be_mmuidx_ra(env, addr, mmu_idx, ra);
For my personal culture, is that strictly equivalent to doing the load
with MO_BESW?
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 05/37] include/exec: Inline *_mmuidx_ra memory operations
2025-03-13 16:59 ` Pierrick Bouvier
@ 2025-03-13 18:05 ` Richard Henderson
2025-03-13 18:26 ` Philippe Mathieu-Daudé
2025-03-13 20:14 ` Pierrick Bouvier
0 siblings, 2 replies; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 18:05 UTC (permalink / raw)
To: Pierrick Bouvier, qemu-devel; +Cc: pbonzini, philmd
On 3/13/25 09:59, Pierrick Bouvier wrote:
>> +static inline int
>> +cpu_ldsw_be_mmuidx_ra(CPUArchState *env, abi_ptr addr,
>> + int mmu_idx, uintptr_t ra)
>> +{
>> + return (int16_t)cpu_lduw_be_mmuidx_ra(env, addr, mmu_idx, ra);
>
> For my personal culture, is that strictly equivalent to doing the load with MO_BESW?
If you're asking if it's the same as passing MO_BESW to tcg_gen_qemu_ld_i32(), yes. The
tcg code generator takes care of making the value sign-extended.
If you're asking if it's the same as passing MO_BESW to cpu_ldw_mmu(), no. The core
functions only handle unsigned values. This older api contained functions with a signed
return value, so we preserve that.
r~
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 05/37] include/exec: Inline *_mmuidx_ra memory operations
2025-03-13 18:05 ` Richard Henderson
@ 2025-03-13 18:26 ` Philippe Mathieu-Daudé
2025-03-14 0:07 ` Richard Henderson
2025-03-13 20:14 ` Pierrick Bouvier
1 sibling, 1 reply; 115+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-03-13 18:26 UTC (permalink / raw)
To: Richard Henderson, Pierrick Bouvier, qemu-devel; +Cc: pbonzini
On 13/3/25 19:05, Richard Henderson wrote:
> On 3/13/25 09:59, Pierrick Bouvier wrote:
>>> +static inline int
>>> +cpu_ldsw_be_mmuidx_ra(CPUArchState *env, abi_ptr addr,
>>> + int mmu_idx, uintptr_t ra)
>>> +{
>>> + return (int16_t)cpu_lduw_be_mmuidx_ra(env, addr, mmu_idx, ra);
>>
>> For my personal culture, is that strictly equivalent to doing the load
>> with MO_BESW?
>
> If you're asking if it's the same as passing MO_BESW to
> tcg_gen_qemu_ld_i32(), yes. The tcg code generator takes care of making
> the value sign-extended.
>
> If you're asking if it's the same as passing MO_BESW to cpu_ldw_mmu(),
> no. The core functions only handle unsigned values. This older api
> contained functions with a signed return value, so we preserve that.
Are these 2 APIs doing the same thing? What are the uses? Can we rename
the legacy one?
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 05/37] include/exec: Inline *_mmuidx_ra memory operations
2025-03-13 18:26 ` Philippe Mathieu-Daudé
@ 2025-03-14 0:07 ` Richard Henderson
0 siblings, 0 replies; 115+ messages in thread
From: Richard Henderson @ 2025-03-14 0:07 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Pierrick Bouvier, qemu-devel; +Cc: pbonzini
On 3/13/25 11:26, Philippe Mathieu-Daudé wrote:
> On 13/3/25 19:05, Richard Henderson wrote:
>> On 3/13/25 09:59, Pierrick Bouvier wrote:
>>>> +static inline int
>>>> +cpu_ldsw_be_mmuidx_ra(CPUArchState *env, abi_ptr addr,
>>>> + int mmu_idx, uintptr_t ra)
>>>> +{
>>>> + return (int16_t)cpu_lduw_be_mmuidx_ra(env, addr, mmu_idx, ra);
>>>
>>> For my personal culture, is that strictly equivalent to doing the load with MO_BESW?
>>
>> If you're asking if it's the same as passing MO_BESW to tcg_gen_qemu_ld_i32(), yes. The
>> tcg code generator takes care of making the value sign-extended.
>>
>> If you're asking if it's the same as passing MO_BESW to cpu_ldw_mmu(), no. The core
>> functions only handle unsigned values. This older api contained functions with a signed
>> return value, so we preserve that.
>
> Are these 2 APIs doing the same thing? What are the uses? Can we rename
> the legacy one?
There are 4 apis doing the same thing:
cpu_ld*_data()
cpu_ld*_data_ra()
cpu_ld*_mmuidx_ra()
cpu_ld*_mmu()
It would be lovely to get rid of some of them.
A mere matter of coccinelle and lots of testing, I guess.
r~
^ permalink raw reply [flat|nested] 115+ messages in thread
* Re: [PATCH 05/37] include/exec: Inline *_mmuidx_ra memory operations
2025-03-13 18:05 ` Richard Henderson
2025-03-13 18:26 ` Philippe Mathieu-Daudé
@ 2025-03-13 20:14 ` Pierrick Bouvier
1 sibling, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 20:14 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/13/25 11:05, Richard Henderson wrote:
> On 3/13/25 09:59, Pierrick Bouvier wrote:
>>> +static inline int
>>> +cpu_ldsw_be_mmuidx_ra(CPUArchState *env, abi_ptr addr,
>>> + int mmu_idx, uintptr_t ra)
>>> +{
>>> + return (int16_t)cpu_lduw_be_mmuidx_ra(env, addr, mmu_idx, ra);
>>
>> For my personal culture, is that strictly equivalent to doing the load with MO_BESW?
>
> If you're asking if it's the same as passing MO_BESW to tcg_gen_qemu_ld_i32(), yes. The
> tcg code generator takes care of making the value sign-extended.
>
> If you're asking if it's the same as passing MO_BESW to cpu_ldw_mmu(), no. The core
> functions only handle unsigned values. This older api contained functions with a signed
> return value, so we preserve that.
>
That was my question, thanks.
So we need to keep on doing the integral cast instead of calling
cpu_ldw_mmu with MO_BESW.
>
> r~
^ permalink raw reply [flat|nested] 115+ messages in thread
* Re: [PATCH 05/37] include/exec: Inline *_mmuidx_ra memory operations
2025-03-13 3:44 ` [PATCH 05/37] include/exec: Inline *_mmuidx_ra memory operations Richard Henderson
2025-03-13 16:59 ` Pierrick Bouvier
@ 2025-03-13 17:11 ` Pierrick Bouvier
2025-03-13 17:55 ` Richard Henderson
1 sibling, 1 reply; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 17:11 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> These expand inline to the *_mmu api with trivial
> massaging of the arguments.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/exec/cpu_ldst.h | 163 ++++++++++++++++++++++++++++--------
> accel/tcg/ldst_common.c.inc | 118 --------------------------
> 2 files changed, 129 insertions(+), 152 deletions(-)
>
> diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
> index 1fbdbe59ae..b33755169e 100644
> --- a/include/exec/cpu_ldst.h
> +++ b/include/exec/cpu_ldst.h
> @@ -118,41 +118,136 @@ void cpu_stl_le_data_ra(CPUArchState *env, abi_ptr ptr,
> void cpu_stq_le_data_ra(CPUArchState *env, abi_ptr ptr,
> uint64_t val, uintptr_t ra);
>
> -uint32_t cpu_ldub_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
> - int mmu_idx, uintptr_t ra);
> -int cpu_ldsb_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
> - int mmu_idx, uintptr_t ra);
> -uint32_t cpu_lduw_be_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
> - int mmu_idx, uintptr_t ra);
> -int cpu_ldsw_be_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
> - int mmu_idx, uintptr_t ra);
> -uint32_t cpu_ldl_be_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
> - int mmu_idx, uintptr_t ra);
> -uint64_t cpu_ldq_be_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
> - int mmu_idx, uintptr_t ra);
> -uint32_t cpu_lduw_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
> - int mmu_idx, uintptr_t ra);
> -int cpu_ldsw_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
> - int mmu_idx, uintptr_t ra);
> -uint32_t cpu_ldl_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
> - int mmu_idx, uintptr_t ra);
> -uint64_t cpu_ldq_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
> - int mmu_idx, uintptr_t ra);
Not related to the change, but the naming _ra is very confusing, since
it means the opposite of what it seems. *NO* requirement alignment, when
you expect the opposite.
^ permalink raw reply [flat|nested] 115+ messages in thread
* Re: [PATCH 05/37] include/exec: Inline *_mmuidx_ra memory operations
2025-03-13 17:11 ` Pierrick Bouvier
@ 2025-03-13 17:55 ` Richard Henderson
0 siblings, 0 replies; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 17:55 UTC (permalink / raw)
To: Pierrick Bouvier, qemu-devel; +Cc: pbonzini, philmd
On 3/13/25 10:11, Pierrick Bouvier wrote:
>> -uint64_t cpu_ldq_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr,
>> - int mmu_idx, uintptr_t ra);
>
> Not related to the change, but the naming _ra is very confusing, since it means the
> opposite of what it seems. *NO* requirement alignment, when you expect the opposite.
*_ra stands for "return address".
r~
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 06/37] include/exec: Inline *_data_ra memory operations
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (4 preceding siblings ...)
2025-03-13 3:44 ` [PATCH 05/37] include/exec: Inline *_mmuidx_ra memory operations Richard Henderson
@ 2025-03-13 3:44 ` Richard Henderson
2025-03-13 16:22 ` Alex Bennée
2025-03-13 17:04 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 07/37] include/exec: Inline *_data " Richard Henderson
` (32 subsequent siblings)
38 siblings, 2 replies; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
These expand inline to the *_mmuidx_ra api with
a lookup of the target's cpu_mmu_index().
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/cpu_ldst.h | 144 +++++++++++++++++++++++++++++-------
accel/tcg/ldst_common.c.inc | 108 ---------------------------
2 files changed, 118 insertions(+), 134 deletions(-)
diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index b33755169e..963c538176 100644
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -84,17 +84,6 @@ int cpu_ldsw_le_data(CPUArchState *env, abi_ptr ptr);
uint32_t cpu_ldl_le_data(CPUArchState *env, abi_ptr ptr);
uint64_t cpu_ldq_le_data(CPUArchState *env, abi_ptr ptr);
-uint32_t cpu_ldub_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
-int cpu_ldsb_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
-uint32_t cpu_lduw_be_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
-int cpu_ldsw_be_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
-uint32_t cpu_ldl_be_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
-uint64_t cpu_ldq_be_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
-uint32_t cpu_lduw_le_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
-int cpu_ldsw_le_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
-uint32_t cpu_ldl_le_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
-uint64_t cpu_ldq_le_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
-
void cpu_stb_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
void cpu_stw_be_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
void cpu_stl_be_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
@@ -103,21 +92,6 @@ void cpu_stw_le_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
void cpu_stl_le_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
void cpu_stq_le_data(CPUArchState *env, abi_ptr ptr, uint64_t val);
-void cpu_stb_data_ra(CPUArchState *env, abi_ptr ptr,
- uint32_t val, uintptr_t ra);
-void cpu_stw_be_data_ra(CPUArchState *env, abi_ptr ptr,
- uint32_t val, uintptr_t ra);
-void cpu_stl_be_data_ra(CPUArchState *env, abi_ptr ptr,
- uint32_t val, uintptr_t ra);
-void cpu_stq_be_data_ra(CPUArchState *env, abi_ptr ptr,
- uint64_t val, uintptr_t ra);
-void cpu_stw_le_data_ra(CPUArchState *env, abi_ptr ptr,
- uint32_t val, uintptr_t ra);
-void cpu_stl_le_data_ra(CPUArchState *env, abi_ptr ptr,
- uint32_t val, uintptr_t ra);
-void cpu_stq_le_data_ra(CPUArchState *env, abi_ptr ptr,
- uint64_t val, uintptr_t ra);
-
static inline uint32_t
cpu_ldub_mmuidx_ra(CPUArchState *env, abi_ptr addr, int mmu_idx, uintptr_t ra)
{
@@ -249,6 +223,124 @@ cpu_stq_le_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint64_t val,
cpu_stq_mmu(env, addr, val, oi, ra);
}
+/*--------------------------*/
+
+static inline uint32_t
+cpu_ldub_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
+{
+ int mmu_index = cpu_mmu_index(env_cpu(env), false);
+ return cpu_ldub_mmuidx_ra(env, addr, mmu_index, ra);
+}
+
+static inline int
+cpu_ldsb_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
+{
+ return (int8_t)cpu_ldub_data_ra(env, addr, ra);
+}
+
+static inline uint32_t
+cpu_lduw_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
+{
+ int mmu_index = cpu_mmu_index(env_cpu(env), false);
+ return cpu_lduw_be_mmuidx_ra(env, addr, mmu_index, ra);
+}
+
+static inline int
+cpu_ldsw_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
+{
+ return (int16_t)cpu_lduw_be_data_ra(env, addr, ra);
+}
+
+static inline uint32_t
+cpu_ldl_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
+{
+ int mmu_index = cpu_mmu_index(env_cpu(env), false);
+ return cpu_ldl_be_mmuidx_ra(env, addr, mmu_index, ra);
+}
+
+static inline uint64_t
+cpu_ldq_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
+{
+ int mmu_index = cpu_mmu_index(env_cpu(env), false);
+ return cpu_ldq_be_mmuidx_ra(env, addr, mmu_index, ra);
+}
+
+static inline uint32_t
+cpu_lduw_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
+{
+ int mmu_index = cpu_mmu_index(env_cpu(env), false);
+ return cpu_lduw_le_mmuidx_ra(env, addr, mmu_index, ra);
+}
+
+static inline int
+cpu_ldsw_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
+{
+ return (int16_t)cpu_lduw_le_data_ra(env, addr, ra);
+}
+
+static inline uint32_t
+cpu_ldl_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
+{
+ int mmu_index = cpu_mmu_index(env_cpu(env), false);
+ return cpu_ldl_le_mmuidx_ra(env, addr, mmu_index, ra);
+}
+
+static inline uint64_t
+cpu_ldq_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
+{
+ int mmu_index = cpu_mmu_index(env_cpu(env), false);
+ return cpu_ldq_le_mmuidx_ra(env, addr, mmu_index, ra);
+}
+
+static inline void
+cpu_stb_data_ra(CPUArchState *env, abi_ptr addr, uint32_t val, uintptr_t ra)
+{
+ int mmu_index = cpu_mmu_index(env_cpu(env), false);
+ cpu_stb_mmuidx_ra(env, addr, val, mmu_index, ra);
+}
+
+static inline void
+cpu_stw_be_data_ra(CPUArchState *env, abi_ptr addr, uint32_t val, uintptr_t ra)
+{
+ int mmu_index = cpu_mmu_index(env_cpu(env), false);
+ cpu_stw_be_mmuidx_ra(env, addr, val, mmu_index, ra);
+}
+
+static inline void
+cpu_stl_be_data_ra(CPUArchState *env, abi_ptr addr, uint32_t val, uintptr_t ra)
+{
+ int mmu_index = cpu_mmu_index(env_cpu(env), false);
+ cpu_stl_be_mmuidx_ra(env, addr, val, mmu_index, ra);
+}
+
+static inline void
+cpu_stq_be_data_ra(CPUArchState *env, abi_ptr addr, uint64_t val, uintptr_t ra)
+{
+ int mmu_index = cpu_mmu_index(env_cpu(env), false);
+ cpu_stq_be_mmuidx_ra(env, addr, val, mmu_index, ra);
+}
+
+static inline void
+cpu_stw_le_data_ra(CPUArchState *env, abi_ptr addr, uint32_t val, uintptr_t ra)
+{
+ int mmu_index = cpu_mmu_index(env_cpu(env), false);
+ cpu_stw_le_mmuidx_ra(env, addr, val, mmu_index, ra);
+}
+
+static inline void
+cpu_stl_le_data_ra(CPUArchState *env, abi_ptr addr, uint32_t val, uintptr_t ra)
+{
+ int mmu_index = cpu_mmu_index(env_cpu(env), false);
+ cpu_stl_le_mmuidx_ra(env, addr, val, mmu_index, ra);
+}
+
+static inline void
+cpu_stq_le_data_ra(CPUArchState *env, abi_ptr addr, uint64_t val, uintptr_t ra)
+{
+ int mmu_index = cpu_mmu_index(env_cpu(env), false);
+ cpu_stq_le_mmuidx_ra(env, addr, val, mmu_index, ra);
+}
+
#if TARGET_BIG_ENDIAN
# define cpu_lduw_data cpu_lduw_be_data
# define cpu_ldsw_data cpu_ldsw_be_data
diff --git a/accel/tcg/ldst_common.c.inc b/accel/tcg/ldst_common.c.inc
index 99a56df3fb..2f203290db 100644
--- a/accel/tcg/ldst_common.c.inc
+++ b/accel/tcg/ldst_common.c.inc
@@ -248,114 +248,6 @@ void cpu_st16_mmu(CPUArchState *env, vaddr addr, Int128 val,
* Wrappers of the above
*/
-uint32_t cpu_ldub_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
-{
- int mmu_index = cpu_mmu_index(env_cpu(env), false);
- return cpu_ldub_mmuidx_ra(env, addr, mmu_index, ra);
-}
-
-int cpu_ldsb_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
-{
- return (int8_t)cpu_ldub_data_ra(env, addr, ra);
-}
-
-uint32_t cpu_lduw_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
-{
- int mmu_index = cpu_mmu_index(env_cpu(env), false);
- return cpu_lduw_be_mmuidx_ra(env, addr, mmu_index, ra);
-}
-
-int cpu_ldsw_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
-{
- return (int16_t)cpu_lduw_be_data_ra(env, addr, ra);
-}
-
-uint32_t cpu_ldl_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
-{
- int mmu_index = cpu_mmu_index(env_cpu(env), false);
- return cpu_ldl_be_mmuidx_ra(env, addr, mmu_index, ra);
-}
-
-uint64_t cpu_ldq_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
-{
- int mmu_index = cpu_mmu_index(env_cpu(env), false);
- return cpu_ldq_be_mmuidx_ra(env, addr, mmu_index, ra);
-}
-
-uint32_t cpu_lduw_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
-{
- int mmu_index = cpu_mmu_index(env_cpu(env), false);
- return cpu_lduw_le_mmuidx_ra(env, addr, mmu_index, ra);
-}
-
-int cpu_ldsw_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
-{
- return (int16_t)cpu_lduw_le_data_ra(env, addr, ra);
-}
-
-uint32_t cpu_ldl_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
-{
- int mmu_index = cpu_mmu_index(env_cpu(env), false);
- return cpu_ldl_le_mmuidx_ra(env, addr, mmu_index, ra);
-}
-
-uint64_t cpu_ldq_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
-{
- int mmu_index = cpu_mmu_index(env_cpu(env), false);
- return cpu_ldq_le_mmuidx_ra(env, addr, mmu_index, ra);
-}
-
-void cpu_stb_data_ra(CPUArchState *env, abi_ptr addr,
- uint32_t val, uintptr_t ra)
-{
- int mmu_index = cpu_mmu_index(env_cpu(env), false);
- cpu_stb_mmuidx_ra(env, addr, val, mmu_index, ra);
-}
-
-void cpu_stw_be_data_ra(CPUArchState *env, abi_ptr addr,
- uint32_t val, uintptr_t ra)
-{
- int mmu_index = cpu_mmu_index(env_cpu(env), false);
- cpu_stw_be_mmuidx_ra(env, addr, val, mmu_index, ra);
-}
-
-void cpu_stl_be_data_ra(CPUArchState *env, abi_ptr addr,
- uint32_t val, uintptr_t ra)
-{
- int mmu_index = cpu_mmu_index(env_cpu(env), false);
- cpu_stl_be_mmuidx_ra(env, addr, val, mmu_index, ra);
-}
-
-void cpu_stq_be_data_ra(CPUArchState *env, abi_ptr addr,
- uint64_t val, uintptr_t ra)
-{
- int mmu_index = cpu_mmu_index(env_cpu(env), false);
- cpu_stq_be_mmuidx_ra(env, addr, val, mmu_index, ra);
-}
-
-void cpu_stw_le_data_ra(CPUArchState *env, abi_ptr addr,
- uint32_t val, uintptr_t ra)
-{
- int mmu_index = cpu_mmu_index(env_cpu(env), false);
- cpu_stw_le_mmuidx_ra(env, addr, val, mmu_index, ra);
-}
-
-void cpu_stl_le_data_ra(CPUArchState *env, abi_ptr addr,
- uint32_t val, uintptr_t ra)
-{
- int mmu_index = cpu_mmu_index(env_cpu(env), false);
- cpu_stl_le_mmuidx_ra(env, addr, val, mmu_index, ra);
-}
-
-void cpu_stq_le_data_ra(CPUArchState *env, abi_ptr addr,
- uint64_t val, uintptr_t ra)
-{
- int mmu_index = cpu_mmu_index(env_cpu(env), false);
- cpu_stq_le_mmuidx_ra(env, addr, val, mmu_index, ra);
-}
-
-/*--------------------------*/
-
uint32_t cpu_ldub_data(CPUArchState *env, abi_ptr addr)
{
return cpu_ldub_data_ra(env, addr, 0);
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 06/37] include/exec: Inline *_data_ra memory operations
2025-03-13 3:44 ` [PATCH 06/37] include/exec: Inline *_data_ra " Richard Henderson
@ 2025-03-13 16:22 ` Alex Bennée
2025-03-14 0:20 ` Richard Henderson
2025-03-13 17:04 ` Pierrick Bouvier
1 sibling, 1 reply; 115+ messages in thread
From: Alex Bennée @ 2025-03-13 16:22 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, pierrick.bouvier, pbonzini, philmd
Richard Henderson <richard.henderson@linaro.org> writes:
> These expand inline to the *_mmuidx_ra api with
> a lookup of the target's cpu_mmu_index().
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This is where my re-based bisect broke. Fixed by moving cpu.h
modified target/ppc/tcg-excp_helper.c
@@ -19,6 +19,7 @@
#include "qemu/osdep.h"
#include "qemu/main-loop.h"
#include "qemu/log.h"
+#include "cpu.h"
#include "exec/cpu_ldst.h"
#include "exec/exec-all.h"
#include "exec/helper-proto.h"
@@ -27,7 +28,6 @@
#include "helper_regs.h"
#include "hw/ppc/ppc.h"
#include "internal.h"
-#include "cpu.h"
#include "trace.h"
> ---
> include/exec/cpu_ldst.h | 144 +++++++++++++++++++++++++++++-------
> accel/tcg/ldst_common.c.inc | 108 ---------------------------
> 2 files changed, 118 insertions(+), 134 deletions(-)
>
> diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
> index b33755169e..963c538176 100644
> --- a/include/exec/cpu_ldst.h
> +++ b/include/exec/cpu_ldst.h
> @@ -84,17 +84,6 @@ int cpu_ldsw_le_data(CPUArchState *env, abi_ptr ptr);
> uint32_t cpu_ldl_le_data(CPUArchState *env, abi_ptr ptr);
> uint64_t cpu_ldq_le_data(CPUArchState *env, abi_ptr ptr);
>
> -uint32_t cpu_ldub_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
> -int cpu_ldsb_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
> -uint32_t cpu_lduw_be_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
> -int cpu_ldsw_be_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
> -uint32_t cpu_ldl_be_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
> -uint64_t cpu_ldq_be_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
> -uint32_t cpu_lduw_le_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
> -int cpu_ldsw_le_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
> -uint32_t cpu_ldl_le_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
> -uint64_t cpu_ldq_le_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
> -
> void cpu_stb_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
> void cpu_stw_be_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
> void cpu_stl_be_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
> @@ -103,21 +92,6 @@ void cpu_stw_le_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
> void cpu_stl_le_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
> void cpu_stq_le_data(CPUArchState *env, abi_ptr ptr, uint64_t val);
>
> -void cpu_stb_data_ra(CPUArchState *env, abi_ptr ptr,
> - uint32_t val, uintptr_t ra);
> -void cpu_stw_be_data_ra(CPUArchState *env, abi_ptr ptr,
> - uint32_t val, uintptr_t ra);
> -void cpu_stl_be_data_ra(CPUArchState *env, abi_ptr ptr,
> - uint32_t val, uintptr_t ra);
> -void cpu_stq_be_data_ra(CPUArchState *env, abi_ptr ptr,
> - uint64_t val, uintptr_t ra);
> -void cpu_stw_le_data_ra(CPUArchState *env, abi_ptr ptr,
> - uint32_t val, uintptr_t ra);
> -void cpu_stl_le_data_ra(CPUArchState *env, abi_ptr ptr,
> - uint32_t val, uintptr_t ra);
> -void cpu_stq_le_data_ra(CPUArchState *env, abi_ptr ptr,
> - uint64_t val, uintptr_t ra);
> -
> static inline uint32_t
> cpu_ldub_mmuidx_ra(CPUArchState *env, abi_ptr addr, int mmu_idx, uintptr_t ra)
> {
> @@ -249,6 +223,124 @@ cpu_stq_le_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint64_t val,
> cpu_stq_mmu(env, addr, val, oi, ra);
> }
>
> +/*--------------------------*/
> +
> +static inline uint32_t
> +cpu_ldub_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + return cpu_ldub_mmuidx_ra(env, addr, mmu_index, ra);
> +}
> +
> +static inline int
> +cpu_ldsb_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> +{
> + return (int8_t)cpu_ldub_data_ra(env, addr, ra);
> +}
> +
> +static inline uint32_t
> +cpu_lduw_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + return cpu_lduw_be_mmuidx_ra(env, addr, mmu_index, ra);
> +}
> +
> +static inline int
> +cpu_ldsw_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> +{
> + return (int16_t)cpu_lduw_be_data_ra(env, addr, ra);
> +}
> +
> +static inline uint32_t
> +cpu_ldl_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + return cpu_ldl_be_mmuidx_ra(env, addr, mmu_index, ra);
> +}
> +
> +static inline uint64_t
> +cpu_ldq_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + return cpu_ldq_be_mmuidx_ra(env, addr, mmu_index, ra);
> +}
> +
> +static inline uint32_t
> +cpu_lduw_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + return cpu_lduw_le_mmuidx_ra(env, addr, mmu_index, ra);
> +}
> +
> +static inline int
> +cpu_ldsw_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> +{
> + return (int16_t)cpu_lduw_le_data_ra(env, addr, ra);
> +}
> +
> +static inline uint32_t
> +cpu_ldl_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + return cpu_ldl_le_mmuidx_ra(env, addr, mmu_index, ra);
> +}
> +
> +static inline uint64_t
> +cpu_ldq_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + return cpu_ldq_le_mmuidx_ra(env, addr, mmu_index, ra);
> +}
> +
> +static inline void
> +cpu_stb_data_ra(CPUArchState *env, abi_ptr addr, uint32_t val, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + cpu_stb_mmuidx_ra(env, addr, val, mmu_index, ra);
> +}
> +
> +static inline void
> +cpu_stw_be_data_ra(CPUArchState *env, abi_ptr addr, uint32_t val, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + cpu_stw_be_mmuidx_ra(env, addr, val, mmu_index, ra);
> +}
> +
> +static inline void
> +cpu_stl_be_data_ra(CPUArchState *env, abi_ptr addr, uint32_t val, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + cpu_stl_be_mmuidx_ra(env, addr, val, mmu_index, ra);
> +}
> +
> +static inline void
> +cpu_stq_be_data_ra(CPUArchState *env, abi_ptr addr, uint64_t val, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + cpu_stq_be_mmuidx_ra(env, addr, val, mmu_index, ra);
> +}
> +
> +static inline void
> +cpu_stw_le_data_ra(CPUArchState *env, abi_ptr addr, uint32_t val, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + cpu_stw_le_mmuidx_ra(env, addr, val, mmu_index, ra);
> +}
> +
> +static inline void
> +cpu_stl_le_data_ra(CPUArchState *env, abi_ptr addr, uint32_t val, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + cpu_stl_le_mmuidx_ra(env, addr, val, mmu_index, ra);
> +}
> +
> +static inline void
> +cpu_stq_le_data_ra(CPUArchState *env, abi_ptr addr, uint64_t val, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + cpu_stq_le_mmuidx_ra(env, addr, val, mmu_index, ra);
> +}
> +
> #if TARGET_BIG_ENDIAN
> # define cpu_lduw_data cpu_lduw_be_data
> # define cpu_ldsw_data cpu_ldsw_be_data
> diff --git a/accel/tcg/ldst_common.c.inc b/accel/tcg/ldst_common.c.inc
> index 99a56df3fb..2f203290db 100644
> --- a/accel/tcg/ldst_common.c.inc
> +++ b/accel/tcg/ldst_common.c.inc
> @@ -248,114 +248,6 @@ void cpu_st16_mmu(CPUArchState *env, vaddr addr, Int128 val,
> * Wrappers of the above
> */
>
> -uint32_t cpu_ldub_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - return cpu_ldub_mmuidx_ra(env, addr, mmu_index, ra);
> -}
> -
> -int cpu_ldsb_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> -{
> - return (int8_t)cpu_ldub_data_ra(env, addr, ra);
> -}
> -
> -uint32_t cpu_lduw_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - return cpu_lduw_be_mmuidx_ra(env, addr, mmu_index, ra);
> -}
> -
> -int cpu_ldsw_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> -{
> - return (int16_t)cpu_lduw_be_data_ra(env, addr, ra);
> -}
> -
> -uint32_t cpu_ldl_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - return cpu_ldl_be_mmuidx_ra(env, addr, mmu_index, ra);
> -}
> -
> -uint64_t cpu_ldq_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - return cpu_ldq_be_mmuidx_ra(env, addr, mmu_index, ra);
> -}
> -
> -uint32_t cpu_lduw_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - return cpu_lduw_le_mmuidx_ra(env, addr, mmu_index, ra);
> -}
> -
> -int cpu_ldsw_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> -{
> - return (int16_t)cpu_lduw_le_data_ra(env, addr, ra);
> -}
> -
> -uint32_t cpu_ldl_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - return cpu_ldl_le_mmuidx_ra(env, addr, mmu_index, ra);
> -}
> -
> -uint64_t cpu_ldq_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - return cpu_ldq_le_mmuidx_ra(env, addr, mmu_index, ra);
> -}
> -
> -void cpu_stb_data_ra(CPUArchState *env, abi_ptr addr,
> - uint32_t val, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - cpu_stb_mmuidx_ra(env, addr, val, mmu_index, ra);
> -}
> -
> -void cpu_stw_be_data_ra(CPUArchState *env, abi_ptr addr,
> - uint32_t val, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - cpu_stw_be_mmuidx_ra(env, addr, val, mmu_index, ra);
> -}
> -
> -void cpu_stl_be_data_ra(CPUArchState *env, abi_ptr addr,
> - uint32_t val, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - cpu_stl_be_mmuidx_ra(env, addr, val, mmu_index, ra);
> -}
> -
> -void cpu_stq_be_data_ra(CPUArchState *env, abi_ptr addr,
> - uint64_t val, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - cpu_stq_be_mmuidx_ra(env, addr, val, mmu_index, ra);
> -}
> -
> -void cpu_stw_le_data_ra(CPUArchState *env, abi_ptr addr,
> - uint32_t val, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - cpu_stw_le_mmuidx_ra(env, addr, val, mmu_index, ra);
> -}
> -
> -void cpu_stl_le_data_ra(CPUArchState *env, abi_ptr addr,
> - uint32_t val, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - cpu_stl_le_mmuidx_ra(env, addr, val, mmu_index, ra);
> -}
> -
> -void cpu_stq_le_data_ra(CPUArchState *env, abi_ptr addr,
> - uint64_t val, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - cpu_stq_le_mmuidx_ra(env, addr, val, mmu_index, ra);
> -}
> -
> -/*--------------------------*/
> -
> uint32_t cpu_ldub_data(CPUArchState *env, abi_ptr addr)
> {
> return cpu_ldub_data_ra(env, addr, 0);
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 06/37] include/exec: Inline *_data_ra memory operations
2025-03-13 16:22 ` Alex Bennée
@ 2025-03-14 0:20 ` Richard Henderson
0 siblings, 0 replies; 115+ messages in thread
From: Richard Henderson @ 2025-03-14 0:20 UTC (permalink / raw)
To: Alex Bennée; +Cc: qemu-devel, pierrick.bouvier, pbonzini, philmd
On 3/13/25 09:22, Alex Bennée wrote:
> Richard Henderson <richard.henderson@linaro.org> writes:
>
>> These expand inline to the *_mmuidx_ra api with
>> a lookup of the target's cpu_mmu_index().
>>
>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>
> This is where my re-based bisect broke. Fixed by moving cpu.h
>
> modified target/ppc/tcg-excp_helper.c
> @@ -19,6 +19,7 @@
> #include "qemu/osdep.h"
> #include "qemu/main-loop.h"
> #include "qemu/log.h"
> +#include "cpu.h"
> #include "exec/cpu_ldst.h"
> #include "exec/exec-all.h"
> #include "exec/helper-proto.h"
> @@ -27,7 +28,6 @@
> #include "helper_regs.h"
> #include "hw/ppc/ppc.h"
> #include "internal.h"
> -#include "cpu.h"
> #include "trace.h"
I shall move up the cpu-mmu-index.h split, so that I can include
it in the proper place here in cpu_ldst.h.
r~
^ permalink raw reply [flat|nested] 115+ messages in thread
* Re: [PATCH 06/37] include/exec: Inline *_data_ra memory operations
2025-03-13 3:44 ` [PATCH 06/37] include/exec: Inline *_data_ra " Richard Henderson
2025-03-13 16:22 ` Alex Bennée
@ 2025-03-13 17:04 ` Pierrick Bouvier
1 sibling, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 17:04 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> These expand inline to the *_mmuidx_ra api with
> a lookup of the target's cpu_mmu_index().
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/exec/cpu_ldst.h | 144 +++++++++++++++++++++++++++++-------
> accel/tcg/ldst_common.c.inc | 108 ---------------------------
> 2 files changed, 118 insertions(+), 134 deletions(-)
>
> diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
> index b33755169e..963c538176 100644
> --- a/include/exec/cpu_ldst.h
> +++ b/include/exec/cpu_ldst.h
> @@ -84,17 +84,6 @@ int cpu_ldsw_le_data(CPUArchState *env, abi_ptr ptr);
> uint32_t cpu_ldl_le_data(CPUArchState *env, abi_ptr ptr);
> uint64_t cpu_ldq_le_data(CPUArchState *env, abi_ptr ptr);
>
> -uint32_t cpu_ldub_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
> -int cpu_ldsb_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
> -uint32_t cpu_lduw_be_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
> -int cpu_ldsw_be_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
> -uint32_t cpu_ldl_be_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
> -uint64_t cpu_ldq_be_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
> -uint32_t cpu_lduw_le_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
> -int cpu_ldsw_le_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
> -uint32_t cpu_ldl_le_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
> -uint64_t cpu_ldq_le_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t ra);
> -
> void cpu_stb_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
> void cpu_stw_be_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
> void cpu_stl_be_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
> @@ -103,21 +92,6 @@ void cpu_stw_le_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
> void cpu_stl_le_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
> void cpu_stq_le_data(CPUArchState *env, abi_ptr ptr, uint64_t val);
>
> -void cpu_stb_data_ra(CPUArchState *env, abi_ptr ptr,
> - uint32_t val, uintptr_t ra);
> -void cpu_stw_be_data_ra(CPUArchState *env, abi_ptr ptr,
> - uint32_t val, uintptr_t ra);
> -void cpu_stl_be_data_ra(CPUArchState *env, abi_ptr ptr,
> - uint32_t val, uintptr_t ra);
> -void cpu_stq_be_data_ra(CPUArchState *env, abi_ptr ptr,
> - uint64_t val, uintptr_t ra);
> -void cpu_stw_le_data_ra(CPUArchState *env, abi_ptr ptr,
> - uint32_t val, uintptr_t ra);
> -void cpu_stl_le_data_ra(CPUArchState *env, abi_ptr ptr,
> - uint32_t val, uintptr_t ra);
> -void cpu_stq_le_data_ra(CPUArchState *env, abi_ptr ptr,
> - uint64_t val, uintptr_t ra);
> -
> static inline uint32_t
> cpu_ldub_mmuidx_ra(CPUArchState *env, abi_ptr addr, int mmu_idx, uintptr_t ra)
> {
> @@ -249,6 +223,124 @@ cpu_stq_le_mmuidx_ra(CPUArchState *env, abi_ptr addr, uint64_t val,
> cpu_stq_mmu(env, addr, val, oi, ra);
> }
>
> +/*--------------------------*/
> +
> +static inline uint32_t
> +cpu_ldub_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + return cpu_ldub_mmuidx_ra(env, addr, mmu_index, ra);
> +}
> +
> +static inline int
> +cpu_ldsb_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> +{
> + return (int8_t)cpu_ldub_data_ra(env, addr, ra);
> +}
> +
> +static inline uint32_t
> +cpu_lduw_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + return cpu_lduw_be_mmuidx_ra(env, addr, mmu_index, ra);
> +}
> +
> +static inline int
> +cpu_ldsw_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> +{
> + return (int16_t)cpu_lduw_be_data_ra(env, addr, ra);
> +}
> +
> +static inline uint32_t
> +cpu_ldl_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + return cpu_ldl_be_mmuidx_ra(env, addr, mmu_index, ra);
> +}
> +
> +static inline uint64_t
> +cpu_ldq_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + return cpu_ldq_be_mmuidx_ra(env, addr, mmu_index, ra);
> +}
> +
> +static inline uint32_t
> +cpu_lduw_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + return cpu_lduw_le_mmuidx_ra(env, addr, mmu_index, ra);
> +}
> +
> +static inline int
> +cpu_ldsw_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> +{
> + return (int16_t)cpu_lduw_le_data_ra(env, addr, ra);
> +}
> +
> +static inline uint32_t
> +cpu_ldl_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + return cpu_ldl_le_mmuidx_ra(env, addr, mmu_index, ra);
> +}
> +
> +static inline uint64_t
> +cpu_ldq_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + return cpu_ldq_le_mmuidx_ra(env, addr, mmu_index, ra);
> +}
> +
> +static inline void
> +cpu_stb_data_ra(CPUArchState *env, abi_ptr addr, uint32_t val, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + cpu_stb_mmuidx_ra(env, addr, val, mmu_index, ra);
> +}
> +
> +static inline void
> +cpu_stw_be_data_ra(CPUArchState *env, abi_ptr addr, uint32_t val, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + cpu_stw_be_mmuidx_ra(env, addr, val, mmu_index, ra);
> +}
> +
> +static inline void
> +cpu_stl_be_data_ra(CPUArchState *env, abi_ptr addr, uint32_t val, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + cpu_stl_be_mmuidx_ra(env, addr, val, mmu_index, ra);
> +}
> +
> +static inline void
> +cpu_stq_be_data_ra(CPUArchState *env, abi_ptr addr, uint64_t val, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + cpu_stq_be_mmuidx_ra(env, addr, val, mmu_index, ra);
> +}
> +
> +static inline void
> +cpu_stw_le_data_ra(CPUArchState *env, abi_ptr addr, uint32_t val, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + cpu_stw_le_mmuidx_ra(env, addr, val, mmu_index, ra);
> +}
> +
> +static inline void
> +cpu_stl_le_data_ra(CPUArchState *env, abi_ptr addr, uint32_t val, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + cpu_stl_le_mmuidx_ra(env, addr, val, mmu_index, ra);
> +}
> +
> +static inline void
> +cpu_stq_le_data_ra(CPUArchState *env, abi_ptr addr, uint64_t val, uintptr_t ra)
> +{
> + int mmu_index = cpu_mmu_index(env_cpu(env), false);
> + cpu_stq_le_mmuidx_ra(env, addr, val, mmu_index, ra);
> +}
> +
> #if TARGET_BIG_ENDIAN
> # define cpu_lduw_data cpu_lduw_be_data
> # define cpu_ldsw_data cpu_ldsw_be_data
> diff --git a/accel/tcg/ldst_common.c.inc b/accel/tcg/ldst_common.c.inc
> index 99a56df3fb..2f203290db 100644
> --- a/accel/tcg/ldst_common.c.inc
> +++ b/accel/tcg/ldst_common.c.inc
> @@ -248,114 +248,6 @@ void cpu_st16_mmu(CPUArchState *env, vaddr addr, Int128 val,
> * Wrappers of the above
> */
>
> -uint32_t cpu_ldub_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - return cpu_ldub_mmuidx_ra(env, addr, mmu_index, ra);
> -}
> -
> -int cpu_ldsb_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> -{
> - return (int8_t)cpu_ldub_data_ra(env, addr, ra);
> -}
> -
> -uint32_t cpu_lduw_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - return cpu_lduw_be_mmuidx_ra(env, addr, mmu_index, ra);
> -}
> -
> -int cpu_ldsw_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> -{
> - return (int16_t)cpu_lduw_be_data_ra(env, addr, ra);
> -}
> -
> -uint32_t cpu_ldl_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - return cpu_ldl_be_mmuidx_ra(env, addr, mmu_index, ra);
> -}
> -
> -uint64_t cpu_ldq_be_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - return cpu_ldq_be_mmuidx_ra(env, addr, mmu_index, ra);
> -}
> -
> -uint32_t cpu_lduw_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - return cpu_lduw_le_mmuidx_ra(env, addr, mmu_index, ra);
> -}
> -
> -int cpu_ldsw_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> -{
> - return (int16_t)cpu_lduw_le_data_ra(env, addr, ra);
> -}
> -
> -uint32_t cpu_ldl_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - return cpu_ldl_le_mmuidx_ra(env, addr, mmu_index, ra);
> -}
> -
> -uint64_t cpu_ldq_le_data_ra(CPUArchState *env, abi_ptr addr, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - return cpu_ldq_le_mmuidx_ra(env, addr, mmu_index, ra);
> -}
> -
> -void cpu_stb_data_ra(CPUArchState *env, abi_ptr addr,
> - uint32_t val, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - cpu_stb_mmuidx_ra(env, addr, val, mmu_index, ra);
> -}
> -
> -void cpu_stw_be_data_ra(CPUArchState *env, abi_ptr addr,
> - uint32_t val, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - cpu_stw_be_mmuidx_ra(env, addr, val, mmu_index, ra);
> -}
> -
> -void cpu_stl_be_data_ra(CPUArchState *env, abi_ptr addr,
> - uint32_t val, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - cpu_stl_be_mmuidx_ra(env, addr, val, mmu_index, ra);
> -}
> -
> -void cpu_stq_be_data_ra(CPUArchState *env, abi_ptr addr,
> - uint64_t val, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - cpu_stq_be_mmuidx_ra(env, addr, val, mmu_index, ra);
> -}
> -
> -void cpu_stw_le_data_ra(CPUArchState *env, abi_ptr addr,
> - uint32_t val, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - cpu_stw_le_mmuidx_ra(env, addr, val, mmu_index, ra);
> -}
> -
> -void cpu_stl_le_data_ra(CPUArchState *env, abi_ptr addr,
> - uint32_t val, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - cpu_stl_le_mmuidx_ra(env, addr, val, mmu_index, ra);
> -}
> -
> -void cpu_stq_le_data_ra(CPUArchState *env, abi_ptr addr,
> - uint64_t val, uintptr_t ra)
> -{
> - int mmu_index = cpu_mmu_index(env_cpu(env), false);
> - cpu_stq_le_mmuidx_ra(env, addr, val, mmu_index, ra);
> -}
> -
> -/*--------------------------*/
> -
> uint32_t cpu_ldub_data(CPUArchState *env, abi_ptr addr)
> {
> return cpu_ldub_data_ra(env, addr, 0);
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 07/37] include/exec: Inline *_data memory operations
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (5 preceding siblings ...)
2025-03-13 3:44 ` [PATCH 06/37] include/exec: Inline *_data_ra " Richard Henderson
@ 2025-03-13 3:44 ` Richard Henderson
2025-03-13 17:05 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 08/37] include/exec: Inline *_code " Richard Henderson
` (31 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
These expand inline to the *_data_ra api with ra == 0.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/cpu_ldst.h | 123 ++++++++++++++++++++++++++++++------
accel/tcg/ldst_common.c.inc | 89 --------------------------
2 files changed, 104 insertions(+), 108 deletions(-)
diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index 963c538176..70e98ebc52 100644
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -73,25 +73,6 @@
#include "user/guest-host.h"
#endif /* CONFIG_USER_ONLY */
-uint32_t cpu_ldub_data(CPUArchState *env, abi_ptr ptr);
-int cpu_ldsb_data(CPUArchState *env, abi_ptr ptr);
-uint32_t cpu_lduw_be_data(CPUArchState *env, abi_ptr ptr);
-int cpu_ldsw_be_data(CPUArchState *env, abi_ptr ptr);
-uint32_t cpu_ldl_be_data(CPUArchState *env, abi_ptr ptr);
-uint64_t cpu_ldq_be_data(CPUArchState *env, abi_ptr ptr);
-uint32_t cpu_lduw_le_data(CPUArchState *env, abi_ptr ptr);
-int cpu_ldsw_le_data(CPUArchState *env, abi_ptr ptr);
-uint32_t cpu_ldl_le_data(CPUArchState *env, abi_ptr ptr);
-uint64_t cpu_ldq_le_data(CPUArchState *env, abi_ptr ptr);
-
-void cpu_stb_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
-void cpu_stw_be_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
-void cpu_stl_be_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
-void cpu_stq_be_data(CPUArchState *env, abi_ptr ptr, uint64_t val);
-void cpu_stw_le_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
-void cpu_stl_le_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
-void cpu_stq_le_data(CPUArchState *env, abi_ptr ptr, uint64_t val);
-
static inline uint32_t
cpu_ldub_mmuidx_ra(CPUArchState *env, abi_ptr addr, int mmu_idx, uintptr_t ra)
{
@@ -341,6 +322,110 @@ cpu_stq_le_data_ra(CPUArchState *env, abi_ptr addr, uint64_t val, uintptr_t ra)
cpu_stq_le_mmuidx_ra(env, addr, val, mmu_index, ra);
}
+/*--------------------------*/
+
+static inline uint32_t
+cpu_ldub_data(CPUArchState *env, abi_ptr addr)
+{
+ return cpu_ldub_data_ra(env, addr, 0);
+}
+
+static inline int
+cpu_ldsb_data(CPUArchState *env, abi_ptr addr)
+{
+ return (int8_t)cpu_ldub_data(env, addr);
+}
+
+static inline uint32_t
+cpu_lduw_be_data(CPUArchState *env, abi_ptr addr)
+{
+ return cpu_lduw_be_data_ra(env, addr, 0);
+}
+
+static inline int
+cpu_ldsw_be_data(CPUArchState *env, abi_ptr addr)
+{
+ return (int16_t)cpu_lduw_be_data(env, addr);
+}
+
+static inline uint32_t
+cpu_ldl_be_data(CPUArchState *env, abi_ptr addr)
+{
+ return cpu_ldl_be_data_ra(env, addr, 0);
+}
+
+static inline uint64_t
+cpu_ldq_be_data(CPUArchState *env, abi_ptr addr)
+{
+ return cpu_ldq_be_data_ra(env, addr, 0);
+}
+
+static inline uint32_t
+cpu_lduw_le_data(CPUArchState *env, abi_ptr addr)
+{
+ return cpu_lduw_le_data_ra(env, addr, 0);
+}
+
+static inline int
+cpu_ldsw_le_data(CPUArchState *env, abi_ptr addr)
+{
+ return (int16_t)cpu_lduw_le_data(env, addr);
+}
+
+static inline uint32_t
+cpu_ldl_le_data(CPUArchState *env, abi_ptr addr)
+{
+ return cpu_ldl_le_data_ra(env, addr, 0);
+}
+
+static inline uint64_t
+cpu_ldq_le_data(CPUArchState *env, abi_ptr addr)
+{
+ return cpu_ldq_le_data_ra(env, addr, 0);
+}
+
+static inline void
+cpu_stb_data(CPUArchState *env, abi_ptr addr, uint32_t val)
+{
+ cpu_stb_data_ra(env, addr, val, 0);
+}
+
+static inline void
+cpu_stw_be_data(CPUArchState *env, abi_ptr addr, uint32_t val)
+{
+ cpu_stw_be_data_ra(env, addr, val, 0);
+}
+
+static inline void
+cpu_stl_be_data(CPUArchState *env, abi_ptr addr, uint32_t val)
+{
+ cpu_stl_be_data_ra(env, addr, val, 0);
+}
+
+static inline void
+cpu_stq_be_data(CPUArchState *env, abi_ptr addr, uint64_t val)
+{
+ cpu_stq_be_data_ra(env, addr, val, 0);
+}
+
+static inline void
+cpu_stw_le_data(CPUArchState *env, abi_ptr addr, uint32_t val)
+{
+ cpu_stw_le_data_ra(env, addr, val, 0);
+}
+
+static inline void
+cpu_stl_le_data(CPUArchState *env, abi_ptr addr, uint32_t val)
+{
+ cpu_stl_le_data_ra(env, addr, val, 0);
+}
+
+static inline void
+cpu_stq_le_data(CPUArchState *env, abi_ptr addr, uint64_t val)
+{
+ cpu_stq_le_data_ra(env, addr, val, 0);
+}
+
#if TARGET_BIG_ENDIAN
# define cpu_lduw_data cpu_lduw_be_data
# define cpu_ldsw_data cpu_ldsw_be_data
diff --git a/accel/tcg/ldst_common.c.inc b/accel/tcg/ldst_common.c.inc
index 2f203290db..9791a4e9ef 100644
--- a/accel/tcg/ldst_common.c.inc
+++ b/accel/tcg/ldst_common.c.inc
@@ -243,92 +243,3 @@ void cpu_st16_mmu(CPUArchState *env, vaddr addr, Int128 val,
do_st16_mmu(env_cpu(env), addr, val, oi, retaddr);
plugin_store_cb(env, addr, int128_getlo(val), int128_gethi(val), oi);
}
-
-/*
- * Wrappers of the above
- */
-
-uint32_t cpu_ldub_data(CPUArchState *env, abi_ptr addr)
-{
- return cpu_ldub_data_ra(env, addr, 0);
-}
-
-int cpu_ldsb_data(CPUArchState *env, abi_ptr addr)
-{
- return (int8_t)cpu_ldub_data(env, addr);
-}
-
-uint32_t cpu_lduw_be_data(CPUArchState *env, abi_ptr addr)
-{
- return cpu_lduw_be_data_ra(env, addr, 0);
-}
-
-int cpu_ldsw_be_data(CPUArchState *env, abi_ptr addr)
-{
- return (int16_t)cpu_lduw_be_data(env, addr);
-}
-
-uint32_t cpu_ldl_be_data(CPUArchState *env, abi_ptr addr)
-{
- return cpu_ldl_be_data_ra(env, addr, 0);
-}
-
-uint64_t cpu_ldq_be_data(CPUArchState *env, abi_ptr addr)
-{
- return cpu_ldq_be_data_ra(env, addr, 0);
-}
-
-uint32_t cpu_lduw_le_data(CPUArchState *env, abi_ptr addr)
-{
- return cpu_lduw_le_data_ra(env, addr, 0);
-}
-
-int cpu_ldsw_le_data(CPUArchState *env, abi_ptr addr)
-{
- return (int16_t)cpu_lduw_le_data(env, addr);
-}
-
-uint32_t cpu_ldl_le_data(CPUArchState *env, abi_ptr addr)
-{
- return cpu_ldl_le_data_ra(env, addr, 0);
-}
-
-uint64_t cpu_ldq_le_data(CPUArchState *env, abi_ptr addr)
-{
- return cpu_ldq_le_data_ra(env, addr, 0);
-}
-
-void cpu_stb_data(CPUArchState *env, abi_ptr addr, uint32_t val)
-{
- cpu_stb_data_ra(env, addr, val, 0);
-}
-
-void cpu_stw_be_data(CPUArchState *env, abi_ptr addr, uint32_t val)
-{
- cpu_stw_be_data_ra(env, addr, val, 0);
-}
-
-void cpu_stl_be_data(CPUArchState *env, abi_ptr addr, uint32_t val)
-{
- cpu_stl_be_data_ra(env, addr, val, 0);
-}
-
-void cpu_stq_be_data(CPUArchState *env, abi_ptr addr, uint64_t val)
-{
- cpu_stq_be_data_ra(env, addr, val, 0);
-}
-
-void cpu_stw_le_data(CPUArchState *env, abi_ptr addr, uint32_t val)
-{
- cpu_stw_le_data_ra(env, addr, val, 0);
-}
-
-void cpu_stl_le_data(CPUArchState *env, abi_ptr addr, uint32_t val)
-{
- cpu_stl_le_data_ra(env, addr, val, 0);
-}
-
-void cpu_stq_le_data(CPUArchState *env, abi_ptr addr, uint64_t val)
-{
- cpu_stq_le_data_ra(env, addr, val, 0);
-}
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 07/37] include/exec: Inline *_data memory operations
2025-03-13 3:44 ` [PATCH 07/37] include/exec: Inline *_data " Richard Henderson
@ 2025-03-13 17:05 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 17:05 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> These expand inline to the *_data_ra api with ra == 0.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/exec/cpu_ldst.h | 123 ++++++++++++++++++++++++++++++------
> accel/tcg/ldst_common.c.inc | 89 --------------------------
> 2 files changed, 104 insertions(+), 108 deletions(-)
>
> diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
> index 963c538176..70e98ebc52 100644
> --- a/include/exec/cpu_ldst.h
> +++ b/include/exec/cpu_ldst.h
> @@ -73,25 +73,6 @@
> #include "user/guest-host.h"
> #endif /* CONFIG_USER_ONLY */
>
> -uint32_t cpu_ldub_data(CPUArchState *env, abi_ptr ptr);
> -int cpu_ldsb_data(CPUArchState *env, abi_ptr ptr);
> -uint32_t cpu_lduw_be_data(CPUArchState *env, abi_ptr ptr);
> -int cpu_ldsw_be_data(CPUArchState *env, abi_ptr ptr);
> -uint32_t cpu_ldl_be_data(CPUArchState *env, abi_ptr ptr);
> -uint64_t cpu_ldq_be_data(CPUArchState *env, abi_ptr ptr);
> -uint32_t cpu_lduw_le_data(CPUArchState *env, abi_ptr ptr);
> -int cpu_ldsw_le_data(CPUArchState *env, abi_ptr ptr);
> -uint32_t cpu_ldl_le_data(CPUArchState *env, abi_ptr ptr);
> -uint64_t cpu_ldq_le_data(CPUArchState *env, abi_ptr ptr);
> -
> -void cpu_stb_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
> -void cpu_stw_be_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
> -void cpu_stl_be_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
> -void cpu_stq_be_data(CPUArchState *env, abi_ptr ptr, uint64_t val);
> -void cpu_stw_le_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
> -void cpu_stl_le_data(CPUArchState *env, abi_ptr ptr, uint32_t val);
> -void cpu_stq_le_data(CPUArchState *env, abi_ptr ptr, uint64_t val);
> -
> static inline uint32_t
> cpu_ldub_mmuidx_ra(CPUArchState *env, abi_ptr addr, int mmu_idx, uintptr_t ra)
> {
> @@ -341,6 +322,110 @@ cpu_stq_le_data_ra(CPUArchState *env, abi_ptr addr, uint64_t val, uintptr_t ra)
> cpu_stq_le_mmuidx_ra(env, addr, val, mmu_index, ra);
> }
>
> +/*--------------------------*/
> +
> +static inline uint32_t
> +cpu_ldub_data(CPUArchState *env, abi_ptr addr)
> +{
> + return cpu_ldub_data_ra(env, addr, 0);
> +}
> +
> +static inline int
> +cpu_ldsb_data(CPUArchState *env, abi_ptr addr)
> +{
> + return (int8_t)cpu_ldub_data(env, addr);
> +}
> +
> +static inline uint32_t
> +cpu_lduw_be_data(CPUArchState *env, abi_ptr addr)
> +{
> + return cpu_lduw_be_data_ra(env, addr, 0);
> +}
> +
> +static inline int
> +cpu_ldsw_be_data(CPUArchState *env, abi_ptr addr)
> +{
> + return (int16_t)cpu_lduw_be_data(env, addr);
> +}
> +
> +static inline uint32_t
> +cpu_ldl_be_data(CPUArchState *env, abi_ptr addr)
> +{
> + return cpu_ldl_be_data_ra(env, addr, 0);
> +}
> +
> +static inline uint64_t
> +cpu_ldq_be_data(CPUArchState *env, abi_ptr addr)
> +{
> + return cpu_ldq_be_data_ra(env, addr, 0);
> +}
> +
> +static inline uint32_t
> +cpu_lduw_le_data(CPUArchState *env, abi_ptr addr)
> +{
> + return cpu_lduw_le_data_ra(env, addr, 0);
> +}
> +
> +static inline int
> +cpu_ldsw_le_data(CPUArchState *env, abi_ptr addr)
> +{
> + return (int16_t)cpu_lduw_le_data(env, addr);
> +}
> +
> +static inline uint32_t
> +cpu_ldl_le_data(CPUArchState *env, abi_ptr addr)
> +{
> + return cpu_ldl_le_data_ra(env, addr, 0);
> +}
> +
> +static inline uint64_t
> +cpu_ldq_le_data(CPUArchState *env, abi_ptr addr)
> +{
> + return cpu_ldq_le_data_ra(env, addr, 0);
> +}
> +
> +static inline void
> +cpu_stb_data(CPUArchState *env, abi_ptr addr, uint32_t val)
> +{
> + cpu_stb_data_ra(env, addr, val, 0);
> +}
> +
> +static inline void
> +cpu_stw_be_data(CPUArchState *env, abi_ptr addr, uint32_t val)
> +{
> + cpu_stw_be_data_ra(env, addr, val, 0);
> +}
> +
> +static inline void
> +cpu_stl_be_data(CPUArchState *env, abi_ptr addr, uint32_t val)
> +{
> + cpu_stl_be_data_ra(env, addr, val, 0);
> +}
> +
> +static inline void
> +cpu_stq_be_data(CPUArchState *env, abi_ptr addr, uint64_t val)
> +{
> + cpu_stq_be_data_ra(env, addr, val, 0);
> +}
> +
> +static inline void
> +cpu_stw_le_data(CPUArchState *env, abi_ptr addr, uint32_t val)
> +{
> + cpu_stw_le_data_ra(env, addr, val, 0);
> +}
> +
> +static inline void
> +cpu_stl_le_data(CPUArchState *env, abi_ptr addr, uint32_t val)
> +{
> + cpu_stl_le_data_ra(env, addr, val, 0);
> +}
> +
> +static inline void
> +cpu_stq_le_data(CPUArchState *env, abi_ptr addr, uint64_t val)
> +{
> + cpu_stq_le_data_ra(env, addr, val, 0);
> +}
> +
> #if TARGET_BIG_ENDIAN
> # define cpu_lduw_data cpu_lduw_be_data
> # define cpu_ldsw_data cpu_ldsw_be_data
> diff --git a/accel/tcg/ldst_common.c.inc b/accel/tcg/ldst_common.c.inc
> index 2f203290db..9791a4e9ef 100644
> --- a/accel/tcg/ldst_common.c.inc
> +++ b/accel/tcg/ldst_common.c.inc
> @@ -243,92 +243,3 @@ void cpu_st16_mmu(CPUArchState *env, vaddr addr, Int128 val,
> do_st16_mmu(env_cpu(env), addr, val, oi, retaddr);
> plugin_store_cb(env, addr, int128_getlo(val), int128_gethi(val), oi);
> }
> -
> -/*
> - * Wrappers of the above
> - */
> -
> -uint32_t cpu_ldub_data(CPUArchState *env, abi_ptr addr)
> -{
> - return cpu_ldub_data_ra(env, addr, 0);
> -}
> -
> -int cpu_ldsb_data(CPUArchState *env, abi_ptr addr)
> -{
> - return (int8_t)cpu_ldub_data(env, addr);
> -}
> -
> -uint32_t cpu_lduw_be_data(CPUArchState *env, abi_ptr addr)
> -{
> - return cpu_lduw_be_data_ra(env, addr, 0);
> -}
> -
> -int cpu_ldsw_be_data(CPUArchState *env, abi_ptr addr)
> -{
> - return (int16_t)cpu_lduw_be_data(env, addr);
> -}
> -
> -uint32_t cpu_ldl_be_data(CPUArchState *env, abi_ptr addr)
> -{
> - return cpu_ldl_be_data_ra(env, addr, 0);
> -}
> -
> -uint64_t cpu_ldq_be_data(CPUArchState *env, abi_ptr addr)
> -{
> - return cpu_ldq_be_data_ra(env, addr, 0);
> -}
> -
> -uint32_t cpu_lduw_le_data(CPUArchState *env, abi_ptr addr)
> -{
> - return cpu_lduw_le_data_ra(env, addr, 0);
> -}
> -
> -int cpu_ldsw_le_data(CPUArchState *env, abi_ptr addr)
> -{
> - return (int16_t)cpu_lduw_le_data(env, addr);
> -}
> -
> -uint32_t cpu_ldl_le_data(CPUArchState *env, abi_ptr addr)
> -{
> - return cpu_ldl_le_data_ra(env, addr, 0);
> -}
> -
> -uint64_t cpu_ldq_le_data(CPUArchState *env, abi_ptr addr)
> -{
> - return cpu_ldq_le_data_ra(env, addr, 0);
> -}
> -
> -void cpu_stb_data(CPUArchState *env, abi_ptr addr, uint32_t val)
> -{
> - cpu_stb_data_ra(env, addr, val, 0);
> -}
> -
> -void cpu_stw_be_data(CPUArchState *env, abi_ptr addr, uint32_t val)
> -{
> - cpu_stw_be_data_ra(env, addr, val, 0);
> -}
> -
> -void cpu_stl_be_data(CPUArchState *env, abi_ptr addr, uint32_t val)
> -{
> - cpu_stl_be_data_ra(env, addr, val, 0);
> -}
> -
> -void cpu_stq_be_data(CPUArchState *env, abi_ptr addr, uint64_t val)
> -{
> - cpu_stq_be_data_ra(env, addr, val, 0);
> -}
> -
> -void cpu_stw_le_data(CPUArchState *env, abi_ptr addr, uint32_t val)
> -{
> - cpu_stw_le_data_ra(env, addr, val, 0);
> -}
> -
> -void cpu_stl_le_data(CPUArchState *env, abi_ptr addr, uint32_t val)
> -{
> - cpu_stl_le_data_ra(env, addr, val, 0);
> -}
> -
> -void cpu_stq_le_data(CPUArchState *env, abi_ptr addr, uint64_t val)
> -{
> - cpu_stq_le_data_ra(env, addr, val, 0);
> -}
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 08/37] include/exec: Inline *_code memory operations
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (6 preceding siblings ...)
2025-03-13 3:44 ` [PATCH 07/37] include/exec: Inline *_data " Richard Henderson
@ 2025-03-13 3:44 ` Richard Henderson
2025-03-13 17:08 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 09/37] accel/tcg: Perform aligned atomic reads in translator_ld Richard Henderson
` (30 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
These expand inline to the *_mmu api with a lookup of
the target's cpu_mmu_index() and ra == 0.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/cpu_ldst.h | 31 +++++++++++++++++++++++++++----
accel/tcg/cputlb.c | 28 ----------------------------
accel/tcg/user-exec.c | 40 ----------------------------------------
3 files changed, 27 insertions(+), 72 deletions(-)
diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index 70e98ebc52..92b4cf20fd 100644
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -472,10 +472,33 @@ cpu_stq_le_data(CPUArchState *env, abi_ptr addr, uint64_t val)
# define cpu_stq_mmuidx_ra cpu_stq_le_mmuidx_ra
#endif
-uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr);
-uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr addr);
-uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr addr);
-uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr addr);
+static inline uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr)
+{
+ CPUState *cs = env_cpu(env);
+ MemOpIdx oi = make_memop_idx(MO_UB, cpu_mmu_index(cs, true));
+ return cpu_ldb_code_mmu(env, addr, oi, 0);
+}
+
+static inline uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr addr)
+{
+ CPUState *cs = env_cpu(env);
+ MemOpIdx oi = make_memop_idx(MO_TEUW, cpu_mmu_index(cs, true));
+ return cpu_ldw_code_mmu(env, addr, oi, 0);
+}
+
+static inline uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr addr)
+{
+ CPUState *cs = env_cpu(env);
+ MemOpIdx oi = make_memop_idx(MO_TEUL, cpu_mmu_index(cs, true));
+ return cpu_ldl_code_mmu(env, addr, oi, 0);
+}
+
+static inline uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr addr)
+{
+ CPUState *cs = env_cpu(env);
+ MemOpIdx oi = make_memop_idx(MO_TEUQ, cpu_mmu_index(cs, true));
+ return cpu_ldq_code_mmu(env, addr, oi, 0);
+}
/**
* tlb_vaddr_to_host:
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index b03998f926..2817c9dbdd 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -2897,34 +2897,6 @@ static void do_st16_mmu(CPUState *cpu, vaddr addr, Int128 val,
/* Code access functions. */
-uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr)
-{
- CPUState *cs = env_cpu(env);
- MemOpIdx oi = make_memop_idx(MO_UB, cpu_mmu_index(cs, true));
- return do_ld1_mmu(cs, addr, oi, 0, MMU_INST_FETCH);
-}
-
-uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr addr)
-{
- CPUState *cs = env_cpu(env);
- MemOpIdx oi = make_memop_idx(MO_TEUW, cpu_mmu_index(cs, true));
- return do_ld2_mmu(cs, addr, oi, 0, MMU_INST_FETCH);
-}
-
-uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr addr)
-{
- CPUState *cs = env_cpu(env);
- MemOpIdx oi = make_memop_idx(MO_TEUL, cpu_mmu_index(cs, true));
- return do_ld4_mmu(cs, addr, oi, 0, MMU_INST_FETCH);
-}
-
-uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr addr)
-{
- CPUState *cs = env_cpu(env);
- MemOpIdx oi = make_memop_idx(MO_TEUQ, cpu_mmu_index(cs, true));
- return do_ld8_mmu(cs, addr, oi, 0, MMU_INST_FETCH);
-}
-
uint8_t cpu_ldb_code_mmu(CPUArchState *env, vaddr addr,
MemOpIdx oi, uintptr_t retaddr)
{
diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
index 3f63b194bb..5bdbb6f968 100644
--- a/accel/tcg/user-exec.c
+++ b/accel/tcg/user-exec.c
@@ -1214,46 +1214,6 @@ static void do_st16_mmu(CPUState *cpu, vaddr addr, Int128 val,
clear_helper_retaddr();
}
-uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr ptr)
-{
- uint32_t ret;
-
- set_helper_retaddr(1);
- ret = ldub_p(g2h_untagged(ptr));
- clear_helper_retaddr();
- return ret;
-}
-
-uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr ptr)
-{
- uint32_t ret;
-
- set_helper_retaddr(1);
- ret = lduw_p(g2h_untagged(ptr));
- clear_helper_retaddr();
- return ret;
-}
-
-uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr ptr)
-{
- uint32_t ret;
-
- set_helper_retaddr(1);
- ret = ldl_p(g2h_untagged(ptr));
- clear_helper_retaddr();
- return ret;
-}
-
-uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr ptr)
-{
- uint64_t ret;
-
- set_helper_retaddr(1);
- ret = ldq_p(g2h_untagged(ptr));
- clear_helper_retaddr();
- return ret;
-}
-
uint8_t cpu_ldb_code_mmu(CPUArchState *env, vaddr addr,
MemOpIdx oi, uintptr_t ra)
{
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 08/37] include/exec: Inline *_code memory operations
2025-03-13 3:44 ` [PATCH 08/37] include/exec: Inline *_code " Richard Henderson
@ 2025-03-13 17:08 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 17:08 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> These expand inline to the *_mmu api with a lookup of
> the target's cpu_mmu_index() and ra == 0.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/exec/cpu_ldst.h | 31 +++++++++++++++++++++++++++----
> accel/tcg/cputlb.c | 28 ----------------------------
> accel/tcg/user-exec.c | 40 ----------------------------------------
> 3 files changed, 27 insertions(+), 72 deletions(-)
>
> diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
> index 70e98ebc52..92b4cf20fd 100644
> --- a/include/exec/cpu_ldst.h
> +++ b/include/exec/cpu_ldst.h
> @@ -472,10 +472,33 @@ cpu_stq_le_data(CPUArchState *env, abi_ptr addr, uint64_t val)
> # define cpu_stq_mmuidx_ra cpu_stq_le_mmuidx_ra
> #endif
>
> -uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr);
> -uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr addr);
> -uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr addr);
> -uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr addr);
> +static inline uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr)
> +{
> + CPUState *cs = env_cpu(env);
> + MemOpIdx oi = make_memop_idx(MO_UB, cpu_mmu_index(cs, true));
> + return cpu_ldb_code_mmu(env, addr, oi, 0);
> +}
> +
> +static inline uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr addr)
> +{
> + CPUState *cs = env_cpu(env);
> + MemOpIdx oi = make_memop_idx(MO_TEUW, cpu_mmu_index(cs, true));
> + return cpu_ldw_code_mmu(env, addr, oi, 0);
> +}
> +
> +static inline uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr addr)
> +{
> + CPUState *cs = env_cpu(env);
> + MemOpIdx oi = make_memop_idx(MO_TEUL, cpu_mmu_index(cs, true));
> + return cpu_ldl_code_mmu(env, addr, oi, 0);
> +}
> +
> +static inline uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr addr)
> +{
> + CPUState *cs = env_cpu(env);
> + MemOpIdx oi = make_memop_idx(MO_TEUQ, cpu_mmu_index(cs, true));
> + return cpu_ldq_code_mmu(env, addr, oi, 0);
> +}
>
> /**
> * tlb_vaddr_to_host:
> diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
> index b03998f926..2817c9dbdd 100644
> --- a/accel/tcg/cputlb.c
> +++ b/accel/tcg/cputlb.c
> @@ -2897,34 +2897,6 @@ static void do_st16_mmu(CPUState *cpu, vaddr addr, Int128 val,
>
> /* Code access functions. */
>
> -uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr)
> -{
> - CPUState *cs = env_cpu(env);
> - MemOpIdx oi = make_memop_idx(MO_UB, cpu_mmu_index(cs, true));
> - return do_ld1_mmu(cs, addr, oi, 0, MMU_INST_FETCH);
> -}
> -
> -uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr addr)
> -{
> - CPUState *cs = env_cpu(env);
> - MemOpIdx oi = make_memop_idx(MO_TEUW, cpu_mmu_index(cs, true));
> - return do_ld2_mmu(cs, addr, oi, 0, MMU_INST_FETCH);
> -}
> -
> -uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr addr)
> -{
> - CPUState *cs = env_cpu(env);
> - MemOpIdx oi = make_memop_idx(MO_TEUL, cpu_mmu_index(cs, true));
> - return do_ld4_mmu(cs, addr, oi, 0, MMU_INST_FETCH);
> -}
> -
> -uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr addr)
> -{
> - CPUState *cs = env_cpu(env);
> - MemOpIdx oi = make_memop_idx(MO_TEUQ, cpu_mmu_index(cs, true));
> - return do_ld8_mmu(cs, addr, oi, 0, MMU_INST_FETCH);
> -}
> -
> uint8_t cpu_ldb_code_mmu(CPUArchState *env, vaddr addr,
> MemOpIdx oi, uintptr_t retaddr)
> {
> diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c
> index 3f63b194bb..5bdbb6f968 100644
> --- a/accel/tcg/user-exec.c
> +++ b/accel/tcg/user-exec.c
> @@ -1214,46 +1214,6 @@ static void do_st16_mmu(CPUState *cpu, vaddr addr, Int128 val,
> clear_helper_retaddr();
> }
>
> -uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr ptr)
> -{
> - uint32_t ret;
> -
> - set_helper_retaddr(1);
> - ret = ldub_p(g2h_untagged(ptr));
> - clear_helper_retaddr();
> - return ret;
> -}
> -
> -uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr ptr)
> -{
> - uint32_t ret;
> -
> - set_helper_retaddr(1);
> - ret = lduw_p(g2h_untagged(ptr));
> - clear_helper_retaddr();
> - return ret;
> -}
> -
> -uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr ptr)
> -{
> - uint32_t ret;
> -
> - set_helper_retaddr(1);
> - ret = ldl_p(g2h_untagged(ptr));
> - clear_helper_retaddr();
> - return ret;
> -}
> -
> -uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr ptr)
> -{
> - uint64_t ret;
> -
> - set_helper_retaddr(1);
> - ret = ldq_p(g2h_untagged(ptr));
> - clear_helper_retaddr();
> - return ret;
> -}
> -
> uint8_t cpu_ldb_code_mmu(CPUArchState *env, vaddr addr,
> MemOpIdx oi, uintptr_t ra)
> {
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 09/37] accel/tcg: Perform aligned atomic reads in translator_ld
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (7 preceding siblings ...)
2025-03-13 3:44 ` [PATCH 08/37] include/exec: Inline *_code " Richard Henderson
@ 2025-03-13 3:44 ` Richard Henderson
2025-03-13 17:14 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 10/37] accel/tcg: Use cpu_ld*_code_mmu in translator.c Richard Henderson
` (29 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
Perform aligned atomic reads in translator_ld, if possible.
According to
https://lore.kernel.org/qemu-devel/20240607101403.1109-1-jim.shu@sifive.com/
this is required for RISC-V Ziccif.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/translator.c | 42 ++++++++++++++++++++++++++++++++++++++----
1 file changed, 38 insertions(+), 4 deletions(-)
diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
index ef1538b4fc..0260fb1915 100644
--- a/accel/tcg/translator.c
+++ b/accel/tcg/translator.c
@@ -265,12 +265,14 @@ static bool translator_ld(CPUArchState *env, DisasContextBase *db,
if (likely(((base ^ last) & TARGET_PAGE_MASK) == 0)) {
/* Entire read is from the first page. */
- memcpy(dest, host + (pc - base), len);
- return true;
+ goto do_read;
}
if (unlikely(((base ^ pc) & TARGET_PAGE_MASK) == 0)) {
- /* Read begins on the first page and extends to the second. */
+ /*
+ * Read begins on the first page and extends to the second.
+ * The unaligned read is never atomic.
+ */
size_t len0 = -(pc | TARGET_PAGE_MASK);
memcpy(dest, host + (pc - base), len0);
pc += len0;
@@ -329,7 +331,39 @@ static bool translator_ld(CPUArchState *env, DisasContextBase *db,
host = db->host_addr[1];
}
- memcpy(dest, host + (pc - base), len);
+ do_read:
+ /*
+ * Assume aligned reads should be atomic, if possible.
+ * We're not in a position to jump out with EXCP_ATOMIC.
+ */
+ host += pc - base;
+ switch (len) {
+ case 2:
+ if (QEMU_IS_ALIGNED(pc, 2)) {
+ uint16_t t = qatomic_read((uint16_t *)host);
+ stw_he_p(dest, t);
+ return true;
+ }
+ break;
+ case 4:
+ if (QEMU_IS_ALIGNED(pc, 4)) {
+ uint32_t t = qatomic_read((uint32_t *)host);
+ stl_he_p(dest, t);
+ return true;
+ }
+ break;
+#ifdef CONFIG_ATOMIC64
+ case 8:
+ if (QEMU_IS_ALIGNED(pc, 8)) {
+ uint64_t t = qatomic_read__nocheck((uint64_t *)host);
+ stl_he_p(dest, t);
+ return true;
+ }
+ break;
+#endif
+ }
+ /* Unaligned or partial read from the second page is not atomic. */
+ memcpy(dest, host, len);
return true;
}
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 09/37] accel/tcg: Perform aligned atomic reads in translator_ld
2025-03-13 3:44 ` [PATCH 09/37] accel/tcg: Perform aligned atomic reads in translator_ld Richard Henderson
@ 2025-03-13 17:14 ` Pierrick Bouvier
2025-03-14 0:47 ` Richard Henderson
0 siblings, 1 reply; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 17:14 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> Perform aligned atomic reads in translator_ld, if possible.
> According to
>
> https://lore.kernel.org/qemu-devel/20240607101403.1109-1-jim.shu@sifive.com/
>
> this is required for RISC-V Ziccif.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> accel/tcg/translator.c | 42 ++++++++++++++++++++++++++++++++++++++----
> 1 file changed, 38 insertions(+), 4 deletions(-)
>
> diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
> index ef1538b4fc..0260fb1915 100644
> --- a/accel/tcg/translator.c
> +++ b/accel/tcg/translator.c
> @@ -265,12 +265,14 @@ static bool translator_ld(CPUArchState *env, DisasContextBase *db,
>
> if (likely(((base ^ last) & TARGET_PAGE_MASK) == 0)) {
> /* Entire read is from the first page. */
> - memcpy(dest, host + (pc - base), len);
> - return true;
> + goto do_read;
> }
>
> if (unlikely(((base ^ pc) & TARGET_PAGE_MASK) == 0)) {
> - /* Read begins on the first page and extends to the second. */
> + /*
> + * Read begins on the first page and extends to the second.
> + * The unaligned read is never atomic.
> + */
> size_t len0 = -(pc | TARGET_PAGE_MASK);
> memcpy(dest, host + (pc - base), len0);
> pc += len0;
> @@ -329,7 +331,39 @@ static bool translator_ld(CPUArchState *env, DisasContextBase *db,
> host = db->host_addr[1];
> }
>
> - memcpy(dest, host + (pc - base), len);
> + do_read:
> + /*
> + * Assume aligned reads should be atomic, if possible.
> + * We're not in a position to jump out with EXCP_ATOMIC.
> + */
> + host += pc - base;
> + switch (len) {
> + case 2:
> + if (QEMU_IS_ALIGNED(pc, 2)) {
> + uint16_t t = qatomic_read((uint16_t *)host);
> + stw_he_p(dest, t);
> + return true;
> + }
> + break;
> + case 4:
> + if (QEMU_IS_ALIGNED(pc, 4)) {
> + uint32_t t = qatomic_read((uint32_t *)host);
> + stl_he_p(dest, t);
> + return true;
> + }
> + break;
> +#ifdef CONFIG_ATOMIC64
> + case 8:
> + if (QEMU_IS_ALIGNED(pc, 8)) {
> + uint64_t t = qatomic_read__nocheck((uint64_t *)host);
> + stl_he_p(dest, t);
Should it be stq_he_p?
> + return true;
> + }
> + break;
> +#endif
> + }
> + /* Unaligned or partial read from the second page is not atomic. */
> + memcpy(dest, host, len);
> return true;
> }
>
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 09/37] accel/tcg: Perform aligned atomic reads in translator_ld
2025-03-13 17:14 ` Pierrick Bouvier
@ 2025-03-14 0:47 ` Richard Henderson
0 siblings, 0 replies; 115+ messages in thread
From: Richard Henderson @ 2025-03-14 0:47 UTC (permalink / raw)
To: Pierrick Bouvier, qemu-devel; +Cc: pbonzini, philmd
On 3/13/25 10:14, Pierrick Bouvier wrote:
>> +#ifdef CONFIG_ATOMIC64
>> + case 8:
>> + if (QEMU_IS_ALIGNED(pc, 8)) {
>> + uint64_t t = qatomic_read__nocheck((uint64_t *)host);
>> + stl_he_p(dest, t);
>
> Should it be stq_he_p?
Good eyes, thanks.
This would have only appeared as disassembly errors on x86_64 guest.
r~
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 10/37] accel/tcg: Use cpu_ld*_code_mmu in translator.c
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (8 preceding siblings ...)
2025-03-13 3:44 ` [PATCH 09/37] accel/tcg: Perform aligned atomic reads in translator_ld Richard Henderson
@ 2025-03-13 3:44 ` Richard Henderson
2025-03-13 9:54 ` Philippe Mathieu-Daudé
2025-03-13 17:21 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 11/37] accel/tcg: Implement translator_ld*_end Richard Henderson
` (28 subsequent siblings)
38 siblings, 2 replies; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
Cache the mmu index in DisasContextBase.
Perform the read on host endianness, which lets us
share code with the translator_ld fast path.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/translator.h | 1 +
accel/tcg/translator.c | 57 ++++++++++++++++++---------------------
2 files changed, 27 insertions(+), 31 deletions(-)
diff --git a/include/exec/translator.h b/include/exec/translator.h
index d70942a10f..205dd85bba 100644
--- a/include/exec/translator.h
+++ b/include/exec/translator.h
@@ -73,6 +73,7 @@ struct DisasContextBase {
int max_insns;
bool plugin_enabled;
bool fake_insn;
+ uint8_t code_mmuidx;
struct TCGOp *insn_start;
void *host_addr[2];
diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
index 0260fb1915..64fa069b51 100644
--- a/accel/tcg/translator.c
+++ b/accel/tcg/translator.c
@@ -11,10 +11,9 @@
#include "qemu/log.h"
#include "qemu/error-report.h"
#include "exec/exec-all.h"
+#include "exec/cpu-ldst-common.h"
#include "exec/translator.h"
-#include "exec/cpu_ldst.h"
#include "exec/plugin-gen.h"
-#include "exec/cpu_ldst.h"
#include "exec/tswap.h"
#include "tcg/tcg-op-common.h"
#include "internal-target.h"
@@ -142,6 +141,7 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int *max_insns,
db->host_addr[1] = NULL;
db->record_start = 0;
db->record_len = 0;
+ db->code_mmuidx = cpu_mmu_index(cpu, true);
ops->init_disas_context(db, cpu);
tcg_debug_assert(db->is_jmp == DISAS_NEXT); /* no early exit */
@@ -457,55 +457,50 @@ bool translator_st(const DisasContextBase *db, void *dest,
uint8_t translator_ldub(CPUArchState *env, DisasContextBase *db, vaddr pc)
{
- uint8_t raw;
+ uint8_t val;
- if (!translator_ld(env, db, &raw, pc, sizeof(raw))) {
- raw = cpu_ldub_code(env, pc);
- record_save(db, pc, &raw, sizeof(raw));
+ if (!translator_ld(env, db, &val, pc, sizeof(val))) {
+ MemOpIdx oi = make_memop_idx(MO_UB, db->code_mmuidx);
+ val = cpu_ldb_code_mmu(env, pc, oi, 0);
+ record_save(db, pc, &val, sizeof(val));
}
- return raw;
+ return val;
}
uint16_t translator_lduw(CPUArchState *env, DisasContextBase *db, vaddr pc)
{
- uint16_t raw, tgt;
+ uint16_t val;
- if (translator_ld(env, db, &raw, pc, sizeof(raw))) {
- tgt = tswap16(raw);
- } else {
- tgt = cpu_lduw_code(env, pc);
- raw = tswap16(tgt);
- record_save(db, pc, &raw, sizeof(raw));
+ if (!translator_ld(env, db, &val, pc, sizeof(val))) {
+ MemOpIdx oi = make_memop_idx(MO_UW, db->code_mmuidx);
+ val = cpu_ldw_code_mmu(env, pc, oi, 0);
+ record_save(db, pc, &val, sizeof(val));
}
- return tgt;
+ return tswap16(val);
}
uint32_t translator_ldl(CPUArchState *env, DisasContextBase *db, vaddr pc)
{
- uint32_t raw, tgt;
+ uint32_t val;
- if (translator_ld(env, db, &raw, pc, sizeof(raw))) {
- tgt = tswap32(raw);
- } else {
- tgt = cpu_ldl_code(env, pc);
- raw = tswap32(tgt);
- record_save(db, pc, &raw, sizeof(raw));
+ if (!translator_ld(env, db, &val, pc, sizeof(val))) {
+ MemOpIdx oi = make_memop_idx(MO_UL, db->code_mmuidx);
+ val = cpu_ldl_code_mmu(env, pc, oi, 0);
+ record_save(db, pc, &val, sizeof(val));
}
- return tgt;
+ return tswap32(val);
}
uint64_t translator_ldq(CPUArchState *env, DisasContextBase *db, vaddr pc)
{
- uint64_t raw, tgt;
+ uint64_t val;
- if (translator_ld(env, db, &raw, pc, sizeof(raw))) {
- tgt = tswap64(raw);
- } else {
- tgt = cpu_ldq_code(env, pc);
- raw = tswap64(tgt);
- record_save(db, pc, &raw, sizeof(raw));
+ if (!translator_ld(env, db, &val, pc, sizeof(val))) {
+ MemOpIdx oi = make_memop_idx(MO_UL, db->code_mmuidx);
+ val = cpu_ldq_code_mmu(env, pc, oi, 0);
+ record_save(db, pc, &val, sizeof(val));
}
- return tgt;
+ return tswap64(val);
}
void translator_fake_ld(DisasContextBase *db, const void *data, size_t len)
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 10/37] accel/tcg: Use cpu_ld*_code_mmu in translator.c
2025-03-13 3:44 ` [PATCH 10/37] accel/tcg: Use cpu_ld*_code_mmu in translator.c Richard Henderson
@ 2025-03-13 9:54 ` Philippe Mathieu-Daudé
2025-03-13 9:57 ` Philippe Mathieu-Daudé
2025-03-13 17:21 ` Pierrick Bouvier
1 sibling, 1 reply; 115+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-03-13 9:54 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pierrick.bouvier, pbonzini
Hi Richard,
On 13/3/25 04:44, Richard Henderson wrote:
> Cache the mmu index in DisasContextBase.
> Perform the read on host endianness, which lets us
> share code with the translator_ld fast path.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/exec/translator.h | 1 +
> accel/tcg/translator.c | 57 ++++++++++++++++++---------------------
> 2 files changed, 27 insertions(+), 31 deletions(-)
>
> diff --git a/include/exec/translator.h b/include/exec/translator.h
> index d70942a10f..205dd85bba 100644
> --- a/include/exec/translator.h
> +++ b/include/exec/translator.h
> @@ -73,6 +73,7 @@ struct DisasContextBase {
> int max_insns;
> bool plugin_enabled;
> bool fake_insn;
> + uint8_t code_mmuidx;
> struct TCGOp *insn_start;
> void *host_addr[2];
>
> diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
> index 0260fb1915..64fa069b51 100644
> --- a/accel/tcg/translator.c
> +++ b/accel/tcg/translator.c
> @@ -11,10 +11,9 @@
> #include "qemu/log.h"
> #include "qemu/error-report.h"
> #include "exec/exec-all.h"
> +#include "exec/cpu-ldst-common.h"
> #include "exec/translator.h"
> -#include "exec/cpu_ldst.h"
> #include "exec/plugin-gen.h"
> -#include "exec/cpu_ldst.h"
> #include "exec/tswap.h"
> #include "tcg/tcg-op-common.h"
> #include "internal-target.h"
> @@ -142,6 +141,7 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int *max_insns,
> db->host_addr[1] = NULL;
> db->record_start = 0;
> db->record_len = 0;
> + db->code_mmuidx = cpu_mmu_index(cpu, true);
>
> ops->init_disas_context(db, cpu);
> tcg_debug_assert(db->is_jmp == DISAS_NEXT); /* no early exit */
> @@ -457,55 +457,50 @@ bool translator_st(const DisasContextBase *db, void *dest,
>
> uint8_t translator_ldub(CPUArchState *env, DisasContextBase *db, vaddr pc)
> {
> - uint8_t raw;
> + uint8_t val;
>
> - if (!translator_ld(env, db, &raw, pc, sizeof(raw))) {
> - raw = cpu_ldub_code(env, pc);
> - record_save(db, pc, &raw, sizeof(raw));
> + if (!translator_ld(env, db, &val, pc, sizeof(val))) {
> + MemOpIdx oi = make_memop_idx(MO_UB, db->code_mmuidx);
> + val = cpu_ldb_code_mmu(env, pc, oi, 0);
> + record_save(db, pc, &val, sizeof(val));
> }
> - return raw;
> + return val;
> }
>
> uint16_t translator_lduw(CPUArchState *env, DisasContextBase *db, vaddr pc)
> {
> - uint16_t raw, tgt;
> + uint16_t val;
>
> - if (translator_ld(env, db, &raw, pc, sizeof(raw))) {
> - tgt = tswap16(raw);
> - } else {
> - tgt = cpu_lduw_code(env, pc);
> - raw = tswap16(tgt);
> - record_save(db, pc, &raw, sizeof(raw));
> + if (!translator_ld(env, db, &val, pc, sizeof(val))) {
> + MemOpIdx oi = make_memop_idx(MO_UW, db->code_mmuidx);
Could we pass MO_TE rather than calling tswap()?
> + val = cpu_ldw_code_mmu(env, pc, oi, 0);
> + record_save(db, pc, &val, sizeof(val));
So recorded bytes are in host endianness, is it still OK w.r.t.
translator_st() use?
> }
> - return tgt;
> + return tswap16(val);
> }
>
> uint32_t translator_ldl(CPUArchState *env, DisasContextBase *db, vaddr pc)
> {
> - uint32_t raw, tgt;
> + uint32_t val;
>
> - if (translator_ld(env, db, &raw, pc, sizeof(raw))) {
> - tgt = tswap32(raw);
> - } else {
> - tgt = cpu_ldl_code(env, pc);
> - raw = tswap32(tgt);
> - record_save(db, pc, &raw, sizeof(raw));
> + if (!translator_ld(env, db, &val, pc, sizeof(val))) {
> + MemOpIdx oi = make_memop_idx(MO_UL, db->code_mmuidx);
> + val = cpu_ldl_code_mmu(env, pc, oi, 0);
> + record_save(db, pc, &val, sizeof(val));
> }
> - return tgt;
> + return tswap32(val);
> }
>
> uint64_t translator_ldq(CPUArchState *env, DisasContextBase *db, vaddr pc)
> {
> - uint64_t raw, tgt;
> + uint64_t val;
>
> - if (translator_ld(env, db, &raw, pc, sizeof(raw))) {
> - tgt = tswap64(raw);
> - } else {
> - tgt = cpu_ldq_code(env, pc);
> - raw = tswap64(tgt);
> - record_save(db, pc, &raw, sizeof(raw));
> + if (!translator_ld(env, db, &val, pc, sizeof(val))) {
> + MemOpIdx oi = make_memop_idx(MO_UL, db->code_mmuidx);
> + val = cpu_ldq_code_mmu(env, pc, oi, 0);
> + record_save(db, pc, &val, sizeof(val));
> }
> - return tgt;
> + return tswap64(val);
> }
>
> void translator_fake_ld(DisasContextBase *db, const void *data, size_t len)
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 10/37] accel/tcg: Use cpu_ld*_code_mmu in translator.c
2025-03-13 9:54 ` Philippe Mathieu-Daudé
@ 2025-03-13 9:57 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 115+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-03-13 9:57 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pierrick.bouvier, pbonzini
On 13/3/25 10:54, Philippe Mathieu-Daudé wrote:
> Hi Richard,
>
> On 13/3/25 04:44, Richard Henderson wrote:
>> Cache the mmu index in DisasContextBase.
>> Perform the read on host endianness, which lets us
>> share code with the translator_ld fast path.
>>
>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>> ---
>> include/exec/translator.h | 1 +
>> accel/tcg/translator.c | 57 ++++++++++++++++++---------------------
>> 2 files changed, 27 insertions(+), 31 deletions(-)
>>
>> diff --git a/include/exec/translator.h b/include/exec/translator.h
>> index d70942a10f..205dd85bba 100644
>> --- a/include/exec/translator.h
>> +++ b/include/exec/translator.h
>> @@ -73,6 +73,7 @@ struct DisasContextBase {
>> int max_insns;
>> bool plugin_enabled;
>> bool fake_insn;
>> + uint8_t code_mmuidx;
>> struct TCGOp *insn_start;
>> void *host_addr[2];
>> diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
>> index 0260fb1915..64fa069b51 100644
>> --- a/accel/tcg/translator.c
>> +++ b/accel/tcg/translator.c
>> @@ -11,10 +11,9 @@
>> #include "qemu/log.h"
>> #include "qemu/error-report.h"
>> #include "exec/exec-all.h"
>> +#include "exec/cpu-ldst-common.h"
>> #include "exec/translator.h"
>> -#include "exec/cpu_ldst.h"
>> #include "exec/plugin-gen.h"
>> -#include "exec/cpu_ldst.h"
>> #include "exec/tswap.h"
>> #include "tcg/tcg-op-common.h"
>> #include "internal-target.h"
>> @@ -142,6 +141,7 @@ void translator_loop(CPUState *cpu,
>> TranslationBlock *tb, int *max_insns,
>> db->host_addr[1] = NULL;
>> db->record_start = 0;
>> db->record_len = 0;
>> + db->code_mmuidx = cpu_mmu_index(cpu, true);
>> ops->init_disas_context(db, cpu);
>> tcg_debug_assert(db->is_jmp == DISAS_NEXT); /* no early exit */
>> @@ -457,55 +457,50 @@ bool translator_st(const DisasContextBase *db,
>> void *dest,
>> uint8_t translator_ldub(CPUArchState *env, DisasContextBase *db,
>> vaddr pc)
>> {
>> - uint8_t raw;
>> + uint8_t val;
>> - if (!translator_ld(env, db, &raw, pc, sizeof(raw))) {
>> - raw = cpu_ldub_code(env, pc);
>> - record_save(db, pc, &raw, sizeof(raw));
>> + if (!translator_ld(env, db, &val, pc, sizeof(val))) {
>> + MemOpIdx oi = make_memop_idx(MO_UB, db->code_mmuidx);
>> + val = cpu_ldb_code_mmu(env, pc, oi, 0);
>> + record_save(db, pc, &val, sizeof(val));
>> }
>> - return raw;
>> + return val;
>> }
>> uint16_t translator_lduw(CPUArchState *env, DisasContextBase *db,
>> vaddr pc)
>> {
>> - uint16_t raw, tgt;
>> + uint16_t val;
>> - if (translator_ld(env, db, &raw, pc, sizeof(raw))) {
>> - tgt = tswap16(raw);
>> - } else {
>> - tgt = cpu_lduw_code(env, pc);
>> - raw = tswap16(tgt);
>> - record_save(db, pc, &raw, sizeof(raw));
>> + if (!translator_ld(env, db, &val, pc, sizeof(val))) {
>> + MemOpIdx oi = make_memop_idx(MO_UW, db->code_mmuidx);
>
> Could we pass MO_TE rather than calling tswap()?
Answer to that is in the next patch ;)
>
>> + val = cpu_ldw_code_mmu(env, pc, oi, 0);
>> + record_save(db, pc, &val, sizeof(val));
>
> So recorded bytes are in host endianness, is it still OK w.r.t.
> translator_st() use?
>
>> }
>> - return tgt;
>> + return tswap16(val);
>> }
^ permalink raw reply [flat|nested] 115+ messages in thread
* Re: [PATCH 10/37] accel/tcg: Use cpu_ld*_code_mmu in translator.c
2025-03-13 3:44 ` [PATCH 10/37] accel/tcg: Use cpu_ld*_code_mmu in translator.c Richard Henderson
2025-03-13 9:54 ` Philippe Mathieu-Daudé
@ 2025-03-13 17:21 ` Pierrick Bouvier
2025-03-14 0:57 ` Richard Henderson
1 sibling, 1 reply; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 17:21 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> Cache the mmu index in DisasContextBase.
> Perform the read on host endianness, which lets us
> share code with the translator_ld fast path.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/exec/translator.h | 1 +
> accel/tcg/translator.c | 57 ++++++++++++++++++---------------------
> 2 files changed, 27 insertions(+), 31 deletions(-)
>
> diff --git a/include/exec/translator.h b/include/exec/translator.h
> index d70942a10f..205dd85bba 100644
> --- a/include/exec/translator.h
> +++ b/include/exec/translator.h
> @@ -73,6 +73,7 @@ struct DisasContextBase {
> int max_insns;
> bool plugin_enabled;
> bool fake_insn;
> + uint8_t code_mmuidx;
> struct TCGOp *insn_start;
> void *host_addr[2];
>
> diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
> index 0260fb1915..64fa069b51 100644
> --- a/accel/tcg/translator.c
> +++ b/accel/tcg/translator.c
> @@ -11,10 +11,9 @@
> #include "qemu/log.h"
> #include "qemu/error-report.h"
> #include "exec/exec-all.h"
> +#include "exec/cpu-ldst-common.h"
> #include "exec/translator.h"
> -#include "exec/cpu_ldst.h"
> #include "exec/plugin-gen.h"
> -#include "exec/cpu_ldst.h"
> #include "exec/tswap.h"
> #include "tcg/tcg-op-common.h"
> #include "internal-target.h"
> @@ -142,6 +141,7 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int *max_insns,
> db->host_addr[1] = NULL;
> db->record_start = 0;
> db->record_len = 0;
> + db->code_mmuidx = cpu_mmu_index(cpu, true);
>
> ops->init_disas_context(db, cpu);
> tcg_debug_assert(db->is_jmp == DISAS_NEXT); /* no early exit */
> @@ -457,55 +457,50 @@ bool translator_st(const DisasContextBase *db, void *dest,
>
> uint8_t translator_ldub(CPUArchState *env, DisasContextBase *db, vaddr pc)
> {
> - uint8_t raw;
> + uint8_t val;
>
> - if (!translator_ld(env, db, &raw, pc, sizeof(raw))) {
> - raw = cpu_ldub_code(env, pc);
> - record_save(db, pc, &raw, sizeof(raw));
> + if (!translator_ld(env, db, &val, pc, sizeof(val))) {
> + MemOpIdx oi = make_memop_idx(MO_UB, db->code_mmuidx);
> + val = cpu_ldb_code_mmu(env, pc, oi, 0);
> + record_save(db, pc, &val, sizeof(val));
> }
> - return raw;
> + return val;
> }
>
> uint16_t translator_lduw(CPUArchState *env, DisasContextBase *db, vaddr pc)
> {
> - uint16_t raw, tgt;
> + uint16_t val;
>
> - if (translator_ld(env, db, &raw, pc, sizeof(raw))) {
> - tgt = tswap16(raw);
> - } else {
> - tgt = cpu_lduw_code(env, pc);
> - raw = tswap16(tgt);
> - record_save(db, pc, &raw, sizeof(raw));
> + if (!translator_ld(env, db, &val, pc, sizeof(val))) {
> + MemOpIdx oi = make_memop_idx(MO_UW, db->code_mmuidx);
> + val = cpu_ldw_code_mmu(env, pc, oi, 0);
> + record_save(db, pc, &val, sizeof(val));
> }
> - return tgt;
> + return tswap16(val);
> }
>
> uint32_t translator_ldl(CPUArchState *env, DisasContextBase *db, vaddr pc)
> {
> - uint32_t raw, tgt;
> + uint32_t val;
>
> - if (translator_ld(env, db, &raw, pc, sizeof(raw))) {
> - tgt = tswap32(raw);
> - } else {
> - tgt = cpu_ldl_code(env, pc);
> - raw = tswap32(tgt);
> - record_save(db, pc, &raw, sizeof(raw));
> + if (!translator_ld(env, db, &val, pc, sizeof(val))) {
> + MemOpIdx oi = make_memop_idx(MO_UL, db->code_mmuidx);
> + val = cpu_ldl_code_mmu(env, pc, oi, 0);
> + record_save(db, pc, &val, sizeof(val));
> }
> - return tgt;
> + return tswap32(val);
> }
>
> uint64_t translator_ldq(CPUArchState *env, DisasContextBase *db, vaddr pc)
> {
> - uint64_t raw, tgt;
> + uint64_t val;
>
> - if (translator_ld(env, db, &raw, pc, sizeof(raw))) {
> - tgt = tswap64(raw);
> - } else {
> - tgt = cpu_ldq_code(env, pc);
> - raw = tswap64(tgt);
> - record_save(db, pc, &raw, sizeof(raw));
> + if (!translator_ld(env, db, &val, pc, sizeof(val))) {
> + MemOpIdx oi = make_memop_idx(MO_UL, db->code_mmuidx);
Should it be MO_UQ?
> + val = cpu_ldq_code_mmu(env, pc, oi, 0);
> + record_save(db, pc, &val, sizeof(val));
> }
> - return tgt;
> + return tswap64(val);
> }
>
> void translator_fake_ld(DisasContextBase *db, const void *data, size_t len)
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 10/37] accel/tcg: Use cpu_ld*_code_mmu in translator.c
2025-03-13 17:21 ` Pierrick Bouvier
@ 2025-03-14 0:57 ` Richard Henderson
0 siblings, 0 replies; 115+ messages in thread
From: Richard Henderson @ 2025-03-14 0:57 UTC (permalink / raw)
To: Pierrick Bouvier, qemu-devel; +Cc: pbonzini, philmd
On 3/13/25 10:21, Pierrick Bouvier wrote:
> On 3/12/25 20:44, Richard Henderson wrote:
>> uint64_t translator_ldq(CPUArchState *env, DisasContextBase *db, vaddr pc)
>> {
>> - uint64_t raw, tgt;
>> + uint64_t val;
>> - if (translator_ld(env, db, &raw, pc, sizeof(raw))) {
>> - tgt = tswap64(raw);
>> - } else {
>> - tgt = cpu_ldq_code(env, pc);
>> - raw = tswap64(tgt);
>> - record_save(db, pc, &raw, sizeof(raw));
>> + if (!translator_ld(env, db, &val, pc, sizeof(val))) {
>> + MemOpIdx oi = make_memop_idx(MO_UL, db->code_mmuidx);
>
> Should it be MO_UQ?
Yep, thanks.
r~
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 11/37] accel/tcg: Implement translator_ld*_end
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (9 preceding siblings ...)
2025-03-13 3:44 ` [PATCH 10/37] accel/tcg: Use cpu_ld*_code_mmu in translator.c Richard Henderson
@ 2025-03-13 3:44 ` Richard Henderson
2025-03-13 17:33 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 12/37] accel/tcg: Remove mmap_lock/unlock from watchpoint.c Richard Henderson
` (27 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
Add a new family of translator load functions which take
an absolute endianness value in the form of MO_BE/MO_LE.
Expand the other translator_ld* functions on top of this.
Remove exec/tswap.h from translator.c.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/translator.h | 49 ++++++++++++++++++++++++---------------
accel/tcg/translator.c | 26 +++++++++++++++------
2 files changed, 49 insertions(+), 26 deletions(-)
diff --git a/include/exec/translator.h b/include/exec/translator.h
index 205dd85bba..3c32655569 100644
--- a/include/exec/translator.h
+++ b/include/exec/translator.h
@@ -18,7 +18,7 @@
* member in your target-specific DisasContext.
*/
-#include "qemu/bswap.h"
+#include "exec/memop.h"
#include "exec/vaddr.h"
/**
@@ -181,42 +181,53 @@ bool translator_io_start(DisasContextBase *db);
*/
uint8_t translator_ldub(CPUArchState *env, DisasContextBase *db, vaddr pc);
-uint16_t translator_lduw(CPUArchState *env, DisasContextBase *db, vaddr pc);
-uint32_t translator_ldl(CPUArchState *env, DisasContextBase *db, vaddr pc);
-uint64_t translator_ldq(CPUArchState *env, DisasContextBase *db, vaddr pc);
+uint16_t translator_lduw_end(CPUArchState *env, DisasContextBase *db,
+ vaddr pc, MemOp endian);
+uint32_t translator_ldl_end(CPUArchState *env, DisasContextBase *db,
+ vaddr pc, MemOp endian);
+uint64_t translator_ldq_end(CPUArchState *env, DisasContextBase *db,
+ vaddr pc, MemOp endian);
+
+#ifdef COMPILING_PER_TARGET
+static inline uint16_t
+translator_lduw(CPUArchState *env, DisasContextBase *db, vaddr pc)
+{
+ return translator_lduw_end(env, db, pc, MO_TE);
+}
+
+static inline uint32_t
+translator_ldl(CPUArchState *env, DisasContextBase *db, vaddr pc)
+{
+ return translator_ldl_end(env, db, pc, MO_TE);
+}
+
+static inline uint64_t
+translator_ldq(CPUArchState *env, DisasContextBase *db, vaddr pc)
+{
+ return translator_ldq_end(env, db, pc, MO_TE);
+}
static inline uint16_t
translator_lduw_swap(CPUArchState *env, DisasContextBase *db,
vaddr pc, bool do_swap)
{
- uint16_t ret = translator_lduw(env, db, pc);
- if (do_swap) {
- ret = bswap16(ret);
- }
- return ret;
+ return translator_lduw_end(env, db, pc, MO_TE ^ (do_swap * MO_BSWAP));
}
static inline uint32_t
translator_ldl_swap(CPUArchState *env, DisasContextBase *db,
vaddr pc, bool do_swap)
{
- uint32_t ret = translator_ldl(env, db, pc);
- if (do_swap) {
- ret = bswap32(ret);
- }
- return ret;
+ return translator_ldl_end(env, db, pc, MO_TE ^ (do_swap * MO_BSWAP));
}
static inline uint64_t
translator_ldq_swap(CPUArchState *env, DisasContextBase *db,
vaddr pc, bool do_swap)
{
- uint64_t ret = translator_ldq(env, db, pc);
- if (do_swap) {
- ret = bswap64(ret);
- }
- return ret;
+ return translator_ldq_end(env, db, pc, MO_TE ^ (do_swap * MO_BSWAP));
}
+#endif /* COMPILING_PER_TARGET */
/**
* translator_fake_ld - fake instruction load
diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
index 64fa069b51..405e0b44c4 100644
--- a/accel/tcg/translator.c
+++ b/accel/tcg/translator.c
@@ -8,13 +8,13 @@
*/
#include "qemu/osdep.h"
+#include "qemu/bswap.h"
#include "qemu/log.h"
#include "qemu/error-report.h"
#include "exec/exec-all.h"
#include "exec/cpu-ldst-common.h"
#include "exec/translator.h"
#include "exec/plugin-gen.h"
-#include "exec/tswap.h"
#include "tcg/tcg-op-common.h"
#include "internal-target.h"
#include "disas/disas.h"
@@ -467,7 +467,8 @@ uint8_t translator_ldub(CPUArchState *env, DisasContextBase *db, vaddr pc)
return val;
}
-uint16_t translator_lduw(CPUArchState *env, DisasContextBase *db, vaddr pc)
+uint16_t translator_lduw_end(CPUArchState *env, DisasContextBase *db,
+ vaddr pc, MemOp endian)
{
uint16_t val;
@@ -476,10 +477,14 @@ uint16_t translator_lduw(CPUArchState *env, DisasContextBase *db, vaddr pc)
val = cpu_ldw_code_mmu(env, pc, oi, 0);
record_save(db, pc, &val, sizeof(val));
}
- return tswap16(val);
+ if (endian & MO_BSWAP) {
+ val = bswap16(val);
+ }
+ return val;
}
-uint32_t translator_ldl(CPUArchState *env, DisasContextBase *db, vaddr pc)
+uint32_t translator_ldl_end(CPUArchState *env, DisasContextBase *db,
+ vaddr pc, MemOp endian)
{
uint32_t val;
@@ -488,10 +493,14 @@ uint32_t translator_ldl(CPUArchState *env, DisasContextBase *db, vaddr pc)
val = cpu_ldl_code_mmu(env, pc, oi, 0);
record_save(db, pc, &val, sizeof(val));
}
- return tswap32(val);
+ if (endian & MO_BSWAP) {
+ val = bswap32(val);
+ }
+ return val;
}
-uint64_t translator_ldq(CPUArchState *env, DisasContextBase *db, vaddr pc)
+uint64_t translator_ldq_end(CPUArchState *env, DisasContextBase *db,
+ vaddr pc, MemOp endian)
{
uint64_t val;
@@ -500,7 +509,10 @@ uint64_t translator_ldq(CPUArchState *env, DisasContextBase *db, vaddr pc)
val = cpu_ldq_code_mmu(env, pc, oi, 0);
record_save(db, pc, &val, sizeof(val));
}
- return tswap64(val);
+ if (endian & MO_BSWAP) {
+ val = bswap64(val);
+ }
+ return val;
}
void translator_fake_ld(DisasContextBase *db, const void *data, size_t len)
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 11/37] accel/tcg: Implement translator_ld*_end
2025-03-13 3:44 ` [PATCH 11/37] accel/tcg: Implement translator_ld*_end Richard Henderson
@ 2025-03-13 17:33 ` Pierrick Bouvier
2025-03-13 18:17 ` Richard Henderson
0 siblings, 1 reply; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 17:33 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> Add a new family of translator load functions which take
> an absolute endianness value in the form of MO_BE/MO_LE.
> Expand the other translator_ld* functions on top of this.
> Remove exec/tswap.h from translator.c.
>
Is there a need further down the road to break the dependency to tswap?
I am not sure of the benefit to drop tswap, as the resulting code is
more complicated than simply calling tswap*().
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/exec/translator.h | 49 ++++++++++++++++++++++++---------------
> accel/tcg/translator.c | 26 +++++++++++++++------
> 2 files changed, 49 insertions(+), 26 deletions(-)
>
> diff --git a/include/exec/translator.h b/include/exec/translator.h
> index 205dd85bba..3c32655569 100644
> --- a/include/exec/translator.h
> +++ b/include/exec/translator.h
> @@ -18,7 +18,7 @@
> * member in your target-specific DisasContext.
> */
>
> -#include "qemu/bswap.h"
> +#include "exec/memop.h"
> #include "exec/vaddr.h"
>
> /**
> @@ -181,42 +181,53 @@ bool translator_io_start(DisasContextBase *db);
> */
>
> uint8_t translator_ldub(CPUArchState *env, DisasContextBase *db, vaddr pc);
> -uint16_t translator_lduw(CPUArchState *env, DisasContextBase *db, vaddr pc);
> -uint32_t translator_ldl(CPUArchState *env, DisasContextBase *db, vaddr pc);
> -uint64_t translator_ldq(CPUArchState *env, DisasContextBase *db, vaddr pc);
> +uint16_t translator_lduw_end(CPUArchState *env, DisasContextBase *db,
> + vaddr pc, MemOp endian);
> +uint32_t translator_ldl_end(CPUArchState *env, DisasContextBase *db,
> + vaddr pc, MemOp endian);
> +uint64_t translator_ldq_end(CPUArchState *env, DisasContextBase *db,
> + vaddr pc, MemOp endian);
> +
> +#ifdef COMPILING_PER_TARGET
> +static inline uint16_t
> +translator_lduw(CPUArchState *env, DisasContextBase *db, vaddr pc)
> +{
> + return translator_lduw_end(env, db, pc, MO_TE);
> +}
> +
> +static inline uint32_t
> +translator_ldl(CPUArchState *env, DisasContextBase *db, vaddr pc)
> +{
> + return translator_ldl_end(env, db, pc, MO_TE);
> +}
> +
> +static inline uint64_t
> +translator_ldq(CPUArchState *env, DisasContextBase *db, vaddr pc)
> +{
> + return translator_ldq_end(env, db, pc, MO_TE);
> +}
>
> static inline uint16_t
> translator_lduw_swap(CPUArchState *env, DisasContextBase *db,
> vaddr pc, bool do_swap)
> {
> - uint16_t ret = translator_lduw(env, db, pc);
> - if (do_swap) {
> - ret = bswap16(ret);
> - }
> - return ret;
> + return translator_lduw_end(env, db, pc, MO_TE ^ (do_swap * MO_BSWAP));
> }
>
> static inline uint32_t
> translator_ldl_swap(CPUArchState *env, DisasContextBase *db,
> vaddr pc, bool do_swap)
> {
> - uint32_t ret = translator_ldl(env, db, pc);
> - if (do_swap) {
> - ret = bswap32(ret);
> - }
> - return ret;
> + return translator_ldl_end(env, db, pc, MO_TE ^ (do_swap * MO_BSWAP));
> }
>
> static inline uint64_t
> translator_ldq_swap(CPUArchState *env, DisasContextBase *db,
> vaddr pc, bool do_swap)
> {
> - uint64_t ret = translator_ldq(env, db, pc);
> - if (do_swap) {
> - ret = bswap64(ret);
> - }
> - return ret;
> + return translator_ldq_end(env, db, pc, MO_TE ^ (do_swap * MO_BSWAP));
> }
> +#endif /* COMPILING_PER_TARGET */
>
> /**
> * translator_fake_ld - fake instruction load
> diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
> index 64fa069b51..405e0b44c4 100644
> --- a/accel/tcg/translator.c
> +++ b/accel/tcg/translator.c
> @@ -8,13 +8,13 @@
> */
>
> #include "qemu/osdep.h"
> +#include "qemu/bswap.h"
> #include "qemu/log.h"
> #include "qemu/error-report.h"
> #include "exec/exec-all.h"
> #include "exec/cpu-ldst-common.h"
> #include "exec/translator.h"
> #include "exec/plugin-gen.h"
> -#include "exec/tswap.h"
> #include "tcg/tcg-op-common.h"
> #include "internal-target.h"
> #include "disas/disas.h"
> @@ -467,7 +467,8 @@ uint8_t translator_ldub(CPUArchState *env, DisasContextBase *db, vaddr pc)
> return val;
> }
>
> -uint16_t translator_lduw(CPUArchState *env, DisasContextBase *db, vaddr pc)
> +uint16_t translator_lduw_end(CPUArchState *env, DisasContextBase *db,
> + vaddr pc, MemOp endian)
> {
> uint16_t val;
>
> @@ -476,10 +477,14 @@ uint16_t translator_lduw(CPUArchState *env, DisasContextBase *db, vaddr pc)
> val = cpu_ldw_code_mmu(env, pc, oi, 0);
> record_save(db, pc, &val, sizeof(val));
> }
> - return tswap16(val);
> + if (endian & MO_BSWAP) {
> + val = bswap16(val);
> + }
> + return val;
> }
>
> -uint32_t translator_ldl(CPUArchState *env, DisasContextBase *db, vaddr pc)
> +uint32_t translator_ldl_end(CPUArchState *env, DisasContextBase *db,
> + vaddr pc, MemOp endian)
> {
> uint32_t val;
>
> @@ -488,10 +493,14 @@ uint32_t translator_ldl(CPUArchState *env, DisasContextBase *db, vaddr pc)
> val = cpu_ldl_code_mmu(env, pc, oi, 0);
> record_save(db, pc, &val, sizeof(val));
> }
> - return tswap32(val);
> + if (endian & MO_BSWAP) {
> + val = bswap32(val);
> + }
> + return val;
> }
>
> -uint64_t translator_ldq(CPUArchState *env, DisasContextBase *db, vaddr pc)
> +uint64_t translator_ldq_end(CPUArchState *env, DisasContextBase *db,
> + vaddr pc, MemOp endian)
> {
> uint64_t val;
>
> @@ -500,7 +509,10 @@ uint64_t translator_ldq(CPUArchState *env, DisasContextBase *db, vaddr pc)
> val = cpu_ldq_code_mmu(env, pc, oi, 0);
> record_save(db, pc, &val, sizeof(val));
> }
> - return tswap64(val);
> + if (endian & MO_BSWAP) {
> + val = bswap64(val);
> + }
> + return val;
> }
>
> void translator_fake_ld(DisasContextBase *db, const void *data, size_t len)
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 11/37] accel/tcg: Implement translator_ld*_end
2025-03-13 17:33 ` Pierrick Bouvier
@ 2025-03-13 18:17 ` Richard Henderson
2025-03-13 20:49 ` Pierrick Bouvier
0 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 18:17 UTC (permalink / raw)
To: Pierrick Bouvier, qemu-devel; +Cc: pbonzini, philmd
On 3/13/25 10:33, Pierrick Bouvier wrote:
> On 3/12/25 20:44, Richard Henderson wrote:
>> Add a new family of translator load functions which take
>> an absolute endianness value in the form of MO_BE/MO_LE.
>> Expand the other translator_ld* functions on top of this.
>> Remove exec/tswap.h from translator.c.
>>
>
> Is there a need further down the road to break the dependency to tswap?
> I am not sure of the benefit to drop tswap, as the resulting code is more complicated than
> simply calling tswap*().
This combines the tswap in the core routine with the bswap in translator_ld_swap().
It enables cleanup in the various translators where we currently choose "swap from
TARGET_BIG_ENDIAN" rather than specifying the absolute endianness desired, which is
usually already at hand for use by all of the other memory references.
r~
^ permalink raw reply [flat|nested] 115+ messages in thread
* Re: [PATCH 11/37] accel/tcg: Implement translator_ld*_end
2025-03-13 18:17 ` Richard Henderson
@ 2025-03-13 20:49 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 20:49 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/13/25 11:17, Richard Henderson wrote:
> On 3/13/25 10:33, Pierrick Bouvier wrote:
>> On 3/12/25 20:44, Richard Henderson wrote:
>>> Add a new family of translator load functions which take
>>> an absolute endianness value in the form of MO_BE/MO_LE.
>>> Expand the other translator_ld* functions on top of this.
>>> Remove exec/tswap.h from translator.c.
>>>
>>
>> Is there a need further down the road to break the dependency to tswap?
>> I am not sure of the benefit to drop tswap, as the resulting code is more complicated than
>> simply calling tswap*().
>
> This combines the tswap in the core routine with the bswap in translator_ld_swap().
>
> It enables cleanup in the various translators where we currently choose "swap from
> TARGET_BIG_ENDIAN" rather than specifying the absolute endianness desired, which is
> usually already at hand for use by all of the other memory references.
>
Ok.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>
> r~
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 12/37] accel/tcg: Remove mmap_lock/unlock from watchpoint.c
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (10 preceding siblings ...)
2025-03-13 3:44 ` [PATCH 11/37] accel/tcg: Implement translator_ld*_end Richard Henderson
@ 2025-03-13 3:44 ` Richard Henderson
2025-03-13 9:57 ` Philippe Mathieu-Daudé
2025-03-13 17:27 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 13/37] include/exec: Split out mmap-lock.h Richard Henderson
` (26 subsequent siblings)
38 siblings, 2 replies; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
The mmap_lock is user-only, whereas watchpoint.c
is only compiled for system mode.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/watchpoint.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/accel/tcg/watchpoint.c b/accel/tcg/watchpoint.c
index 65b21884ce..cfb37a49e7 100644
--- a/accel/tcg/watchpoint.c
+++ b/accel/tcg/watchpoint.c
@@ -124,17 +124,14 @@ void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len,
}
cpu->watchpoint_hit = wp;
- mmap_lock();
/* This call also restores vCPU state */
tb_check_watchpoint(cpu, ra);
if (wp->flags & BP_STOP_BEFORE_ACCESS) {
cpu->exception_index = EXCP_DEBUG;
- mmap_unlock();
cpu_loop_exit(cpu);
} else {
/* Force execution of one insn next time. */
cpu->cflags_next_tb = 1 | CF_NOIRQ | curr_cflags(cpu);
- mmap_unlock();
cpu_loop_exit_noexc(cpu);
}
} else {
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 12/37] accel/tcg: Remove mmap_lock/unlock from watchpoint.c
2025-03-13 3:44 ` [PATCH 12/37] accel/tcg: Remove mmap_lock/unlock from watchpoint.c Richard Henderson
@ 2025-03-13 9:57 ` Philippe Mathieu-Daudé
2025-03-13 17:27 ` Pierrick Bouvier
1 sibling, 0 replies; 115+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-03-13 9:57 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pierrick.bouvier, pbonzini
On 13/3/25 04:44, Richard Henderson wrote:
> The mmap_lock is user-only, whereas watchpoint.c
> is only compiled for system mode.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> accel/tcg/watchpoint.c | 3 ---
> 1 file changed, 3 deletions(-)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* Re: [PATCH 12/37] accel/tcg: Remove mmap_lock/unlock from watchpoint.c
2025-03-13 3:44 ` [PATCH 12/37] accel/tcg: Remove mmap_lock/unlock from watchpoint.c Richard Henderson
2025-03-13 9:57 ` Philippe Mathieu-Daudé
@ 2025-03-13 17:27 ` Pierrick Bouvier
1 sibling, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 17:27 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> The mmap_lock is user-only, whereas watchpoint.c
> is only compiled for system mode.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> accel/tcg/watchpoint.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/accel/tcg/watchpoint.c b/accel/tcg/watchpoint.c
> index 65b21884ce..cfb37a49e7 100644
> --- a/accel/tcg/watchpoint.c
> +++ b/accel/tcg/watchpoint.c
> @@ -124,17 +124,14 @@ void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len,
> }
> cpu->watchpoint_hit = wp;
>
> - mmap_lock();
> /* This call also restores vCPU state */
> tb_check_watchpoint(cpu, ra);
> if (wp->flags & BP_STOP_BEFORE_ACCESS) {
> cpu->exception_index = EXCP_DEBUG;
> - mmap_unlock();
> cpu_loop_exit(cpu);
> } else {
> /* Force execution of one insn next time. */
> cpu->cflags_next_tb = 1 | CF_NOIRQ | curr_cflags(cpu);
> - mmap_unlock();
> cpu_loop_exit_noexc(cpu);
> }
> } else {
Hum, how can we link that today?
Answer to myself: a stub in page-protection.h.
Maybe would be worth to add a g_assert_not_reached() in mmap_lock, and
do the small cleanup for concerned places.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 13/37] include/exec: Split out mmap-lock.h
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (11 preceding siblings ...)
2025-03-13 3:44 ` [PATCH 12/37] accel/tcg: Remove mmap_lock/unlock from watchpoint.c Richard Henderson
@ 2025-03-13 3:44 ` Richard Henderson
2025-03-13 9:58 ` Philippe Mathieu-Daudé
2025-03-13 17:34 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 14/37] include/system: Move exec/memory.h to system/memory.h Richard Henderson
` (25 subsequent siblings)
38 siblings, 2 replies; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
Split out mmap_lock, et al from page-protection.h
to a new header.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/internal-target.h | 1 +
include/exec/mmap-lock.h | 33 +++++++++++++++++++++++++++++++++
include/exec/page-protection.h | 22 ----------------------
accel/tcg/cpu-exec.c | 1 +
accel/tcg/tb-maint.c | 1 +
accel/tcg/translate-all.c | 1 +
linux-user/arm/cpu_loop.c | 1 +
linux-user/elfload.c | 1 +
linux-user/flatload.c | 1 +
linux-user/mmap.c | 1 +
linux-user/syscall.c | 1 +
target/arm/helper.c | 1 +
12 files changed, 43 insertions(+), 22 deletions(-)
create mode 100644 include/exec/mmap-lock.h
diff --git a/accel/tcg/internal-target.h b/accel/tcg/internal-target.h
index 2cdf11c905..c88f007ffb 100644
--- a/accel/tcg/internal-target.h
+++ b/accel/tcg/internal-target.h
@@ -13,6 +13,7 @@
#include "exec/translation-block.h"
#include "tb-internal.h"
#include "tcg-target-mo.h"
+#include "exec/mmap-lock.h"
/*
* Access to the various translations structures need to be serialised
diff --git a/include/exec/mmap-lock.h b/include/exec/mmap-lock.h
new file mode 100644
index 0000000000..eb02dd409c
--- /dev/null
+++ b/include/exec/mmap-lock.h
@@ -0,0 +1,33 @@
+/*
+ * QEMU user-only mmap lock, with stubs for system mode
+ *
+ * Copyright (c) 2003 Fabrice Bellard
+ *
+ * SPDX-License-Identifier: LGPL-2.1+
+ */
+#ifndef EXEC_MMAP_LOCK_H
+#define EXEC_MMAP_LOCK_H
+
+#ifdef CONFIG_USER_ONLY
+
+void TSA_NO_TSA mmap_lock(void);
+void TSA_NO_TSA mmap_unlock(void);
+bool have_mmap_lock(void);
+
+static inline void mmap_unlock_guard(void *unused)
+{
+ mmap_unlock();
+}
+
+#define WITH_MMAP_LOCK_GUARD() \
+ for (int _mmap_lock_iter __attribute__((cleanup(mmap_unlock_guard))) \
+ = (mmap_lock(), 0); _mmap_lock_iter == 0; _mmap_lock_iter = 1)
+
+#else
+
+static inline void mmap_lock(void) {}
+static inline void mmap_unlock(void) {}
+#define WITH_MMAP_LOCK_GUARD()
+
+#endif /* CONFIG_USER_ONLY */
+#endif /* EXEC_MMAP_LOCK_H */
diff --git a/include/exec/page-protection.h b/include/exec/page-protection.h
index 3e0a8a0333..c43231af8b 100644
--- a/include/exec/page-protection.h
+++ b/include/exec/page-protection.h
@@ -38,26 +38,4 @@
*/
#define PAGE_PASSTHROUGH 0x0800
-#ifdef CONFIG_USER_ONLY
-
-void TSA_NO_TSA mmap_lock(void);
-void TSA_NO_TSA mmap_unlock(void);
-bool have_mmap_lock(void);
-
-static inline void mmap_unlock_guard(void *unused)
-{
- mmap_unlock();
-}
-
-#define WITH_MMAP_LOCK_GUARD() \
- for (int _mmap_lock_iter __attribute__((cleanup(mmap_unlock_guard))) \
- = (mmap_lock(), 0); _mmap_lock_iter == 0; _mmap_lock_iter = 1)
-#else
-
-static inline void mmap_lock(void) {}
-static inline void mmap_unlock(void) {}
-#define WITH_MMAP_LOCK_GUARD()
-
-#endif /* !CONFIG_USER_ONLY */
-
#endif
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index ef3d967e3a..372b876604 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -27,6 +27,7 @@
#include "disas/disas.h"
#include "exec/cpu-common.h"
#include "exec/page-protection.h"
+#include "exec/mmap-lock.h"
#include "exec/translation-block.h"
#include "tcg/tcg.h"
#include "qemu/atomic.h"
diff --git a/accel/tcg/tb-maint.c b/accel/tcg/tb-maint.c
index 3f1bebf6ab..d5899ad047 100644
--- a/accel/tcg/tb-maint.c
+++ b/accel/tcg/tb-maint.c
@@ -24,6 +24,7 @@
#include "exec/log.h"
#include "exec/exec-all.h"
#include "exec/page-protection.h"
+#include "exec/mmap-lock.h"
#include "exec/tb-flush.h"
#include "tb-internal.h"
#include "system/tcg.h"
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index 82bc16bd53..16e5043597 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -45,6 +45,7 @@
#include "exec/cputlb.h"
#include "exec/page-protection.h"
+#include "exec/mmap-lock.h"
#include "tb-internal.h"
#include "exec/translator.h"
#include "exec/tb-flush.h"
diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c
index 10d8561f9b..cb6e17e50c 100644
--- a/linux-user/arm/cpu_loop.c
+++ b/linux-user/arm/cpu_loop.c
@@ -25,6 +25,7 @@
#include "signal-common.h"
#include "semihosting/common-semi.h"
#include "exec/page-protection.h"
+#include "exec/mmap-lock.h"
#include "user/page-protection.h"
#include "target/arm/syndrome.h"
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 8799e4ea27..f54054dce3 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -10,6 +10,7 @@
#include "user/tswap-target.h"
#include "user/page-protection.h"
#include "exec/page-protection.h"
+#include "exec/mmap-lock.h"
#include "exec/translation-block.h"
#include "user/guest-base.h"
#include "user-internals.h"
diff --git a/linux-user/flatload.c b/linux-user/flatload.c
index d5cb1830dd..4beb3ed1b9 100644
--- a/linux-user/flatload.c
+++ b/linux-user/flatload.c
@@ -35,6 +35,7 @@
#include "qemu.h"
#include "exec/page-protection.h"
+#include "exec/mmap-lock.h"
#include "user-internals.h"
#include "loader.h"
#include "user-mmap.h"
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index d1f36e6f16..f88a80c31e 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -21,6 +21,7 @@
#include "trace.h"
#include "exec/log.h"
#include "exec/page-protection.h"
+#include "exec/mmap-lock.h"
#include "exec/tb-flush.h"
#include "exec/translation-block.h"
#include "qemu.h"
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index b32de763f7..4928f0b080 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -26,6 +26,7 @@
#include "tcg/startup.h"
#include "target_mman.h"
#include "exec/page-protection.h"
+#include "exec/mmap-lock.h"
#include "exec/tb-flush.h"
#include "exec/translation-block.h"
#include <elf.h>
diff --git a/target/arm/helper.c b/target/arm/helper.c
index f0ead22937..8316beead3 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -14,6 +14,7 @@
#include "cpu-features.h"
#include "exec/helper-proto.h"
#include "exec/page-protection.h"
+#include "exec/mmap-lock.h"
#include "qemu/main-loop.h"
#include "qemu/timer.h"
#include "qemu/bitops.h"
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 13/37] include/exec: Split out mmap-lock.h
2025-03-13 3:44 ` [PATCH 13/37] include/exec: Split out mmap-lock.h Richard Henderson
@ 2025-03-13 9:58 ` Philippe Mathieu-Daudé
2025-03-14 1:40 ` Richard Henderson
2025-03-13 17:34 ` Pierrick Bouvier
1 sibling, 1 reply; 115+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-03-13 9:58 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pierrick.bouvier, pbonzini
On 13/3/25 04:44, Richard Henderson wrote:
> Split out mmap_lock, et al from page-protection.h
> to a new header.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> accel/tcg/internal-target.h | 1 +
> include/exec/mmap-lock.h | 33 +++++++++++++++++++++++++++++++++
What about include/accel/tcg/mmap-lock.h?
> include/exec/page-protection.h | 22 ----------------------
> accel/tcg/cpu-exec.c | 1 +
> accel/tcg/tb-maint.c | 1 +
> accel/tcg/translate-all.c | 1 +
> linux-user/arm/cpu_loop.c | 1 +
> linux-user/elfload.c | 1 +
> linux-user/flatload.c | 1 +
> linux-user/mmap.c | 1 +
> linux-user/syscall.c | 1 +
> target/arm/helper.c | 1 +
> 12 files changed, 43 insertions(+), 22 deletions(-)
> create mode 100644 include/exec/mmap-lock.h
^ permalink raw reply [flat|nested] 115+ messages in thread
* Re: [PATCH 13/37] include/exec: Split out mmap-lock.h
2025-03-13 9:58 ` Philippe Mathieu-Daudé
@ 2025-03-14 1:40 ` Richard Henderson
0 siblings, 0 replies; 115+ messages in thread
From: Richard Henderson @ 2025-03-14 1:40 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel; +Cc: pierrick.bouvier, pbonzini
On 3/13/25 02:58, Philippe Mathieu-Daudé wrote:
> On 13/3/25 04:44, Richard Henderson wrote:
>> Split out mmap_lock, et al from page-protection.h
>> to a new header.
>>
>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>> ---
>> accel/tcg/internal-target.h | 1 +
>> include/exec/mmap-lock.h | 33 +++++++++++++++++++++++++++++++++
>
> What about include/accel/tcg/mmap-lock.h?
I'm not especially keen on that, no.
I thought about include/user/mmap-lock.h, dropping the system stubs.
The only user outside accel/tcg/ appears to be target/arm/helper.c.
So I could probably come up with something...
r~
^ permalink raw reply [flat|nested] 115+ messages in thread
* Re: [PATCH 13/37] include/exec: Split out mmap-lock.h
2025-03-13 3:44 ` [PATCH 13/37] include/exec: Split out mmap-lock.h Richard Henderson
2025-03-13 9:58 ` Philippe Mathieu-Daudé
@ 2025-03-13 17:34 ` Pierrick Bouvier
1 sibling, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 17:34 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> Split out mmap_lock, et al from page-protection.h
> to a new header.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> accel/tcg/internal-target.h | 1 +
> include/exec/mmap-lock.h | 33 +++++++++++++++++++++++++++++++++
> include/exec/page-protection.h | 22 ----------------------
> accel/tcg/cpu-exec.c | 1 +
> accel/tcg/tb-maint.c | 1 +
> accel/tcg/translate-all.c | 1 +
> linux-user/arm/cpu_loop.c | 1 +
> linux-user/elfload.c | 1 +
> linux-user/flatload.c | 1 +
> linux-user/mmap.c | 1 +
> linux-user/syscall.c | 1 +
> target/arm/helper.c | 1 +
> 12 files changed, 43 insertions(+), 22 deletions(-)
> create mode 100644 include/exec/mmap-lock.h
>
> diff --git a/accel/tcg/internal-target.h b/accel/tcg/internal-target.h
> index 2cdf11c905..c88f007ffb 100644
> --- a/accel/tcg/internal-target.h
> +++ b/accel/tcg/internal-target.h
> @@ -13,6 +13,7 @@
> #include "exec/translation-block.h"
> #include "tb-internal.h"
> #include "tcg-target-mo.h"
> +#include "exec/mmap-lock.h"
>
> /*
> * Access to the various translations structures need to be serialised
> diff --git a/include/exec/mmap-lock.h b/include/exec/mmap-lock.h
> new file mode 100644
> index 0000000000..eb02dd409c
> --- /dev/null
> +++ b/include/exec/mmap-lock.h
> @@ -0,0 +1,33 @@
> +/*
> + * QEMU user-only mmap lock, with stubs for system mode
> + *
> + * Copyright (c) 2003 Fabrice Bellard
> + *
> + * SPDX-License-Identifier: LGPL-2.1+
> + */
> +#ifndef EXEC_MMAP_LOCK_H
> +#define EXEC_MMAP_LOCK_H
> +
> +#ifdef CONFIG_USER_ONLY
> +
> +void TSA_NO_TSA mmap_lock(void);
> +void TSA_NO_TSA mmap_unlock(void);
> +bool have_mmap_lock(void);
> +
> +static inline void mmap_unlock_guard(void *unused)
> +{
> + mmap_unlock();
> +}
> +
> +#define WITH_MMAP_LOCK_GUARD() \
> + for (int _mmap_lock_iter __attribute__((cleanup(mmap_unlock_guard))) \
> + = (mmap_lock(), 0); _mmap_lock_iter == 0; _mmap_lock_iter = 1)
> +
> +#else
> +
> +static inline void mmap_lock(void) {}
> +static inline void mmap_unlock(void) {}
> +#define WITH_MMAP_LOCK_GUARD()
> +
> +#endif /* CONFIG_USER_ONLY */
> +#endif /* EXEC_MMAP_LOCK_H */
> diff --git a/include/exec/page-protection.h b/include/exec/page-protection.h
> index 3e0a8a0333..c43231af8b 100644
> --- a/include/exec/page-protection.h
> +++ b/include/exec/page-protection.h
> @@ -38,26 +38,4 @@
> */
> #define PAGE_PASSTHROUGH 0x0800
>
> -#ifdef CONFIG_USER_ONLY
> -
> -void TSA_NO_TSA mmap_lock(void);
> -void TSA_NO_TSA mmap_unlock(void);
> -bool have_mmap_lock(void);
> -
> -static inline void mmap_unlock_guard(void *unused)
> -{
> - mmap_unlock();
> -}
> -
> -#define WITH_MMAP_LOCK_GUARD() \
> - for (int _mmap_lock_iter __attribute__((cleanup(mmap_unlock_guard))) \
> - = (mmap_lock(), 0); _mmap_lock_iter == 0; _mmap_lock_iter = 1)
> -#else
> -
> -static inline void mmap_lock(void) {}
> -static inline void mmap_unlock(void) {}
> -#define WITH_MMAP_LOCK_GUARD()
> -
> -#endif /* !CONFIG_USER_ONLY */
> -
> #endif
> diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
> index ef3d967e3a..372b876604 100644
> --- a/accel/tcg/cpu-exec.c
> +++ b/accel/tcg/cpu-exec.c
> @@ -27,6 +27,7 @@
> #include "disas/disas.h"
> #include "exec/cpu-common.h"
> #include "exec/page-protection.h"
> +#include "exec/mmap-lock.h"
> #include "exec/translation-block.h"
> #include "tcg/tcg.h"
> #include "qemu/atomic.h"
> diff --git a/accel/tcg/tb-maint.c b/accel/tcg/tb-maint.c
> index 3f1bebf6ab..d5899ad047 100644
> --- a/accel/tcg/tb-maint.c
> +++ b/accel/tcg/tb-maint.c
> @@ -24,6 +24,7 @@
> #include "exec/log.h"
> #include "exec/exec-all.h"
> #include "exec/page-protection.h"
> +#include "exec/mmap-lock.h"
> #include "exec/tb-flush.h"
> #include "tb-internal.h"
> #include "system/tcg.h"
> diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
> index 82bc16bd53..16e5043597 100644
> --- a/accel/tcg/translate-all.c
> +++ b/accel/tcg/translate-all.c
> @@ -45,6 +45,7 @@
>
> #include "exec/cputlb.h"
> #include "exec/page-protection.h"
> +#include "exec/mmap-lock.h"
> #include "tb-internal.h"
> #include "exec/translator.h"
> #include "exec/tb-flush.h"
> diff --git a/linux-user/arm/cpu_loop.c b/linux-user/arm/cpu_loop.c
> index 10d8561f9b..cb6e17e50c 100644
> --- a/linux-user/arm/cpu_loop.c
> +++ b/linux-user/arm/cpu_loop.c
> @@ -25,6 +25,7 @@
> #include "signal-common.h"
> #include "semihosting/common-semi.h"
> #include "exec/page-protection.h"
> +#include "exec/mmap-lock.h"
> #include "user/page-protection.h"
> #include "target/arm/syndrome.h"
>
> diff --git a/linux-user/elfload.c b/linux-user/elfload.c
> index 8799e4ea27..f54054dce3 100644
> --- a/linux-user/elfload.c
> +++ b/linux-user/elfload.c
> @@ -10,6 +10,7 @@
> #include "user/tswap-target.h"
> #include "user/page-protection.h"
> #include "exec/page-protection.h"
> +#include "exec/mmap-lock.h"
> #include "exec/translation-block.h"
> #include "user/guest-base.h"
> #include "user-internals.h"
> diff --git a/linux-user/flatload.c b/linux-user/flatload.c
> index d5cb1830dd..4beb3ed1b9 100644
> --- a/linux-user/flatload.c
> +++ b/linux-user/flatload.c
> @@ -35,6 +35,7 @@
>
> #include "qemu.h"
> #include "exec/page-protection.h"
> +#include "exec/mmap-lock.h"
> #include "user-internals.h"
> #include "loader.h"
> #include "user-mmap.h"
> diff --git a/linux-user/mmap.c b/linux-user/mmap.c
> index d1f36e6f16..f88a80c31e 100644
> --- a/linux-user/mmap.c
> +++ b/linux-user/mmap.c
> @@ -21,6 +21,7 @@
> #include "trace.h"
> #include "exec/log.h"
> #include "exec/page-protection.h"
> +#include "exec/mmap-lock.h"
> #include "exec/tb-flush.h"
> #include "exec/translation-block.h"
> #include "qemu.h"
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index b32de763f7..4928f0b080 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -26,6 +26,7 @@
> #include "tcg/startup.h"
> #include "target_mman.h"
> #include "exec/page-protection.h"
> +#include "exec/mmap-lock.h"
> #include "exec/tb-flush.h"
> #include "exec/translation-block.h"
> #include <elf.h>
> diff --git a/target/arm/helper.c b/target/arm/helper.c
> index f0ead22937..8316beead3 100644
> --- a/target/arm/helper.c
> +++ b/target/arm/helper.c
> @@ -14,6 +14,7 @@
> #include "cpu-features.h"
> #include "exec/helper-proto.h"
> #include "exec/page-protection.h"
> +#include "exec/mmap-lock.h"
> #include "qemu/main-loop.h"
> #include "qemu/timer.h"
> #include "qemu/bitops.h"
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 14/37] include/system: Move exec/memory.h to system/memory.h
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (12 preceding siblings ...)
2025-03-13 3:44 ` [PATCH 13/37] include/exec: Split out mmap-lock.h Richard Henderson
@ 2025-03-13 3:44 ` Richard Henderson
2025-03-13 10:00 ` Philippe Mathieu-Daudé
2025-03-13 17:34 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 15/37] include/system: Move exec/address-spaces.h to system/address-spaces.h Richard Henderson
` (24 subsequent siblings)
38 siblings, 2 replies; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
Convert the existing includes with
sed -i ,exec/memory.h,system/memory.h,g
Move the include within cpu-all.h into a !CONFIG_USER_ONLY block.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
hw/arm/strongarm.h | 2 +-
hw/display/apple-gfx.h | 2 +-
hw/display/framebuffer.h | 2 +-
hw/display/vga_int.h | 2 +-
hw/hyperv/hv-balloon-our_range_memslots.h | 2 +-
hw/intc/ioapic_internal.h | 2 +-
hw/net/i82596.h | 2 +-
hw/net/pcnet.h | 2 +-
hw/tpm/tpm_ppi.h | 2 +-
hw/usb/hcd-uhci.h | 2 +-
hw/vfio/pci.h | 2 +-
hw/virtio/vhost-iova-tree.h | 2 +-
include/exec/cpu-all.h | 3 +--
include/exec/ioport.h | 2 +-
include/hw/acpi/acpi.h | 2 +-
include/hw/acpi/ich9_tco.h | 2 +-
include/hw/arm/fsl-imx25.h | 2 +-
include/hw/arm/fsl-imx31.h | 2 +-
include/hw/arm/fsl-imx6.h | 2 +-
include/hw/arm/fsl-imx6ul.h | 2 +-
include/hw/arm/omap.h | 2 +-
include/hw/arm/stm32l4x5_soc.h | 2 +-
include/hw/boards.h | 2 +-
include/hw/char/parallel.h | 2 +-
include/hw/char/riscv_htif.h | 2 +-
include/hw/char/serial-mm.h | 2 +-
include/hw/char/serial.h | 2 +-
include/hw/display/macfb.h | 2 +-
include/hw/fsi/aspeed_apb2opb.h | 2 +-
include/hw/fsi/cfam.h | 2 +-
include/hw/fsi/fsi-master.h | 2 +-
include/hw/fsi/fsi.h | 2 +-
include/hw/fsi/lbus.h | 2 +-
include/hw/gpio/npcm7xx_gpio.h | 2 +-
include/hw/i2c/npcm7xx_smbus.h | 2 +-
include/hw/i2c/pm_smbus.h | 2 +-
include/hw/i386/apic_internal.h | 2 +-
include/hw/i386/x86.h | 2 +-
include/hw/ide/ahci.h | 2 +-
include/hw/ipmi/ipmi.h | 2 +-
include/hw/isa/apm.h | 2 +-
include/hw/isa/isa.h | 2 +-
include/hw/m68k/q800.h | 2 +-
include/hw/mem/npcm7xx_mc.h | 2 +-
include/hw/mem/pc-dimm.h | 2 +-
include/hw/mips/mips.h | 2 +-
include/hw/misc/auxbus.h | 2 +-
include/hw/misc/ivshmem-flat.h | 2 +-
include/hw/misc/mac_via.h | 2 +-
include/hw/misc/npcm7xx_mft.h | 2 +-
include/hw/misc/npcm_clk.h | 2 +-
include/hw/misc/npcm_gcr.h | 2 +-
include/hw/misc/pvpanic.h | 2 +-
include/hw/net/dp8393x.h | 2 +-
include/hw/net/msf2-emac.h | 2 +-
include/hw/nvram/mac_nvram.h | 2 +-
include/hw/nvram/npcm7xx_otp.h | 2 +-
include/hw/pci-host/fsl_imx8m_phy.h | 2 +-
include/hw/pci-host/pam.h | 2 +-
include/hw/pci-host/remote.h | 2 +-
include/hw/pci/pci.h | 2 +-
include/hw/pci/pcie_host.h | 2 +-
include/hw/pci/shpc.h | 2 +-
include/hw/ppc/mac_dbdma.h | 2 +-
include/hw/ppc/pnv_lpc.h | 2 +-
include/hw/ppc/pnv_occ.h | 2 +-
include/hw/ppc/pnv_sbe.h | 2 +-
include/hw/ppc/pnv_xscom.h | 2 +-
include/hw/ppc/ppc4xx.h | 2 +-
include/hw/ppc/vof.h | 2 +-
include/hw/ppc/xics.h | 2 +-
include/hw/register.h | 2 +-
include/hw/remote/proxy-memory-listener.h | 2 +-
include/hw/sh4/sh_intc.h | 2 +-
include/hw/southbridge/ich9.h | 2 +-
include/hw/sysbus.h | 2 +-
include/hw/timer/npcm7xx_timer.h | 2 +-
include/hw/tricore/tricore.h | 2 +-
include/hw/usb.h | 2 +-
include/hw/vfio/vfio-common.h | 2 +-
include/hw/vfio/vfio-container-base.h | 2 +-
include/hw/virtio/vhost-backend.h | 2 +-
include/hw/virtio/vhost.h | 2 +-
include/hw/virtio/virtio.h | 2 +-
include/hw/xen/xen-pvh-common.h | 2 +-
include/hw/xtensa/mx_pic.h | 2 +-
include/qemu/iova-tree.h | 2 +-
include/qemu/reserved-region.h | 2 +-
include/system/dma.h | 2 +-
include/system/hostmem.h | 2 +-
include/system/kvm_int.h | 2 +-
include/{exec => system}/memory.h | 8 ++------
include/system/vhost-user-backend.h | 2 +-
migration/rdma.h | 2 +-
rust/wrapper.h | 2 +-
target/loongarch/cpu.h | 2 +-
target/mips/cpu.h | 2 +-
accel/kvm/kvm-all.c | 2 +-
accel/tcg/cputlb.c | 2 +-
backends/tpm/tpm_util.c | 2 +-
block/blkio.c | 4 ++--
disas/disas-mon.c | 2 +-
hw/acpi/erst.c | 2 +-
hw/avr/atmega.c | 2 +-
hw/block/fdc-sysbus.c | 2 +-
hw/core/cpu-system.c | 2 +-
hw/core/loader-fit.c | 2 +-
hw/core/loader.c | 2 +-
hw/display/edid-region.c | 2 +-
hw/hyperv/hyperv.c | 2 +-
hw/i386/acpi-common.c | 2 +-
hw/i386/acpi-microvm.c | 2 +-
hw/i386/pc_piix.c | 2 +-
hw/intc/mips_gic.c | 2 +-
hw/intc/ompic.c | 2 +-
hw/net/ne2000.c | 2 +-
hw/pci-bridge/pci_bridge_dev.c | 2 +-
hw/pci-host/remote.c | 2 +-
hw/ppc/pnv_homer.c | 2 +-
hw/ppc/sam460ex.c | 2 +-
hw/remote/iommu.c | 2 +-
hw/remote/machine.c | 2 +-
hw/remote/proxy-memory-listener.c | 2 +-
hw/remote/vfio-user-obj.c | 2 +-
hw/s390x/s390-pci-inst.c | 2 +-
hw/timer/sh_timer.c | 2 +-
hw/vfio/common.c | 2 +-
hw/vfio/container.c | 2 +-
hw/vfio/platform.c | 2 +-
hw/xtensa/sim.c | 2 +-
hw/xtensa/virt.c | 2 +-
hw/xtensa/xtensa_memory.c | 2 +-
hw/xtensa/xtfpga.c | 2 +-
migration/dirtyrate.c | 2 +-
migration/rdma.c | 2 +-
migration/savevm.c | 2 +-
monitor/hmp-cmds-target.c | 2 +-
stubs/ram-block.c | 2 +-
system/dirtylimit.c | 2 +-
system/ioport.c | 2 +-
system/memory.c | 2 +-
system/memory_mapping.c | 2 +-
system/physmem.c | 2 +-
system/qtest.c | 2 +-
target/xtensa/cpu.c | 2 +-
tests/qtest/fuzz/generic_fuzz.c | 2 +-
tests/qtest/fuzz/qos_fuzz.c | 2 +-
tests/unit/test-resv-mem.c | 2 +-
ui/console.c | 2 +-
util/vfio-helpers.c | 2 +-
MAINTAINERS | 2 +-
docs/devel/memory.rst | 2 +-
scripts/analyze-inclusions | 2 +-
153 files changed, 155 insertions(+), 160 deletions(-)
rename include/{exec => system}/memory.h (99%)
diff --git a/hw/arm/strongarm.h b/hw/arm/strongarm.h
index 192821f6aa..b11b3a3379 100644
--- a/hw/arm/strongarm.h
+++ b/hw/arm/strongarm.h
@@ -1,7 +1,7 @@
#ifndef STRONGARM_H
#define STRONGARM_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "target/arm/cpu-qom.h"
#define SA_CS0 0x00000000
diff --git a/hw/display/apple-gfx.h b/hw/display/apple-gfx.h
index 3900cdbabb..a8b1d1efc0 100644
--- a/hw/display/apple-gfx.h
+++ b/hw/display/apple-gfx.h
@@ -9,7 +9,7 @@
#define QEMU_APPLE_GFX_H
#include "qemu/queue.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/qdev-properties.h"
#include "ui/surface.h"
diff --git a/hw/display/framebuffer.h b/hw/display/framebuffer.h
index 38fa0dcec6..29a828ce7a 100644
--- a/hw/display/framebuffer.h
+++ b/hw/display/framebuffer.h
@@ -1,7 +1,7 @@
#ifndef QEMU_FRAMEBUFFER_H
#define QEMU_FRAMEBUFFER_H
-#include "exec/memory.h"
+#include "system/memory.h"
/* Framebuffer device helper routines. */
diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h
index f77c1c1145..60ad26e03e 100644
--- a/hw/display/vga_int.h
+++ b/hw/display/vga_int.h
@@ -27,7 +27,7 @@
#include "ui/console.h"
#include "exec/ioport.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/display/bochs-vbe.h"
#include "hw/acpi/acpi_aml_interface.h"
diff --git a/hw/hyperv/hv-balloon-our_range_memslots.h b/hw/hyperv/hv-balloon-our_range_memslots.h
index df3b686bc7..b1f19d77da 100644
--- a/hw/hyperv/hv-balloon-our_range_memslots.h
+++ b/hw/hyperv/hv-balloon-our_range_memslots.h
@@ -11,7 +11,7 @@
#define HW_HYPERV_HV_BALLOON_OUR_RANGE_MEMSLOTS_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qom/object.h"
#include "hv-balloon-page_range_tree.h"
diff --git a/hw/intc/ioapic_internal.h b/hw/intc/ioapic_internal.h
index 37b8565539..51205767f4 100644
--- a/hw/intc/ioapic_internal.h
+++ b/hw/intc/ioapic_internal.h
@@ -22,7 +22,7 @@
#ifndef HW_INTC_IOAPIC_INTERNAL_H
#define HW_INTC_IOAPIC_INTERNAL_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/intc/ioapic.h"
#include "hw/sysbus.h"
#include "qemu/notify.h"
diff --git a/hw/net/i82596.h b/hw/net/i82596.h
index f0bbe810eb..4bdfcaf856 100644
--- a/hw/net/i82596.h
+++ b/hw/net/i82596.h
@@ -3,7 +3,7 @@
#define I82596_IOPORT_SIZE 0x20
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/address-spaces.h"
#define PORT_RESET 0x00 /* reset 82596 */
diff --git a/hw/net/pcnet.h b/hw/net/pcnet.h
index eb7f46aab3..a94356ec30 100644
--- a/hw/net/pcnet.h
+++ b/hw/net/pcnet.h
@@ -7,7 +7,7 @@
#define PCNET_LOOPTEST_CRC 1
#define PCNET_LOOPTEST_NOCRC 2
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/irq.h"
/* BUS CONFIGURATION REGISTERS */
diff --git a/hw/tpm/tpm_ppi.h b/hw/tpm/tpm_ppi.h
index bf5d4a300f..88f316ee95 100644
--- a/hw/tpm/tpm_ppi.h
+++ b/hw/tpm/tpm_ppi.h
@@ -12,7 +12,7 @@
#ifndef TPM_TPM_PPI_H
#define TPM_TPM_PPI_H
-#include "exec/memory.h"
+#include "system/memory.h"
typedef struct TPMPPI {
MemoryRegion ram;
diff --git a/hw/usb/hcd-uhci.h b/hw/usb/hcd-uhci.h
index 6d26b94e92..d4664297cf 100644
--- a/hw/usb/hcd-uhci.h
+++ b/hw/usb/hcd-uhci.h
@@ -28,7 +28,7 @@
#ifndef HW_USB_HCD_UHCI_H
#define HW_USB_HCD_UHCI_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qemu/timer.h"
#include "hw/pci/pci_device.h"
#include "hw/usb.h"
diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
index d638c781f6..837d7aaed3 100644
--- a/hw/vfio/pci.h
+++ b/hw/vfio/pci.h
@@ -12,7 +12,7 @@
#ifndef HW_VFIO_VFIO_PCI_H
#define HW_VFIO_VFIO_PCI_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/pci/pci_device.h"
#include "hw/vfio/vfio-common.h"
#include "qemu/event_notifier.h"
diff --git a/hw/virtio/vhost-iova-tree.h b/hw/virtio/vhost-iova-tree.h
index 0c4ba5abd5..08f63b61cd 100644
--- a/hw/virtio/vhost-iova-tree.h
+++ b/hw/virtio/vhost-iova-tree.h
@@ -11,7 +11,7 @@
#define HW_VIRTIO_VHOST_IOVA_TREE_H
#include "qemu/iova-tree.h"
-#include "exec/memory.h"
+#include "system/memory.h"
typedef struct VhostIOVATree VhostIOVATree;
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index 8cd6c00cf8..d72c28a5d2 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -22,7 +22,6 @@
#include "exec/page-protection.h"
#include "exec/cpu-common.h"
#include "exec/cpu-interrupt.h"
-#include "exec/memory.h"
#include "exec/tswap.h"
#include "hw/core/cpu.h"
@@ -66,7 +65,7 @@
/* MMU memory access macros */
#if !defined(CONFIG_USER_ONLY)
-
+#include "system/memory.h"
#include "exec/hwaddr.h"
#define SUFFIX
diff --git a/include/exec/ioport.h b/include/exec/ioport.h
index 4397f12f93..ecea3575bc 100644
--- a/include/exec/ioport.h
+++ b/include/exec/ioport.h
@@ -24,7 +24,7 @@
#ifndef IOPORT_H
#define IOPORT_H
-#include "exec/memory.h"
+#include "system/memory.h"
#define MAX_IOPORTS (64 * 1024)
#define IOPORTS_MASK (MAX_IOPORTS - 1)
diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h
index e0e51e85b4..96642b233f 100644
--- a/include/hw/acpi/acpi.h
+++ b/include/hw/acpi/acpi.h
@@ -21,7 +21,7 @@
*/
#include "qemu/notify.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/acpi/acpi_dev_interface.h"
/*
diff --git a/include/hw/acpi/ich9_tco.h b/include/hw/acpi/ich9_tco.h
index 2562a7cf39..b3c3f69451 100644
--- a/include/hw/acpi/ich9_tco.h
+++ b/include/hw/acpi/ich9_tco.h
@@ -10,7 +10,7 @@
#ifndef HW_ACPI_TCO_H
#define HW_ACPI_TCO_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "migration/vmstate.h"
/* As per ICH9 spec, the internal timer has an error of ~0.6s on every tick */
diff --git a/include/hw/arm/fsl-imx25.h b/include/hw/arm/fsl-imx25.h
index df2f83980f..b68d4334a0 100644
--- a/include/hw/arm/fsl-imx25.h
+++ b/include/hw/arm/fsl-imx25.h
@@ -29,7 +29,7 @@
#include "hw/sd/sdhci.h"
#include "hw/usb/chipidea.h"
#include "hw/watchdog/wdt_imx2.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "target/arm/cpu.h"
#include "qom/object.h"
diff --git a/include/hw/arm/fsl-imx31.h b/include/hw/arm/fsl-imx31.h
index 40c593a5cf..41232a2237 100644
--- a/include/hw/arm/fsl-imx31.h
+++ b/include/hw/arm/fsl-imx31.h
@@ -25,7 +25,7 @@
#include "hw/i2c/imx_i2c.h"
#include "hw/gpio/imx_gpio.h"
#include "hw/watchdog/wdt_imx2.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "target/arm/cpu.h"
#include "qom/object.h"
diff --git a/include/hw/arm/fsl-imx6.h b/include/hw/arm/fsl-imx6.h
index 9da32fc189..124bbd478f 100644
--- a/include/hw/arm/fsl-imx6.h
+++ b/include/hw/arm/fsl-imx6.h
@@ -34,7 +34,7 @@
#include "hw/usb/imx-usb-phy.h"
#include "hw/pci-host/designware.h"
#include "hw/or-irq.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "cpu.h"
#include "qom/object.h"
diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h
index 8277b0e8b2..4e3209b25b 100644
--- a/include/hw/arm/fsl-imx6ul.h
+++ b/include/hw/arm/fsl-imx6ul.h
@@ -33,7 +33,7 @@
#include "hw/net/imx_fec.h"
#include "hw/usb/chipidea.h"
#include "hw/usb/imx-usb-phy.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "cpu.h"
#include "qom/object.h"
#include "qemu/units.h"
diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h
index 7cb87ea89c..6185507373 100644
--- a/include/hw/arm/omap.h
+++ b/include/hw/arm/omap.h
@@ -20,7 +20,7 @@
#ifndef HW_ARM_OMAP_H
#define HW_ARM_OMAP_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "target/arm/cpu-qom.h"
#include "qemu/log.h"
#include "qom/object.h"
diff --git a/include/hw/arm/stm32l4x5_soc.h b/include/hw/arm/stm32l4x5_soc.h
index c243fb0e7f..c2fae6e23f 100644
--- a/include/hw/arm/stm32l4x5_soc.h
+++ b/include/hw/arm/stm32l4x5_soc.h
@@ -24,7 +24,7 @@
#ifndef HW_ARM_STM32L4x5_SOC_H
#define HW_ARM_STM32L4x5_SOC_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/arm/armv7m.h"
#include "hw/or-irq.h"
#include "hw/misc/stm32l4x5_syscfg.h"
diff --git a/include/hw/boards.h b/include/hw/boards.h
index f22b2e7fc7..02f43ac5d4 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -3,7 +3,7 @@
#ifndef HW_BOARDS_H
#define HW_BOARDS_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "system/hostmem.h"
#include "system/blockdev.h"
#include "qapi/qapi-types-machine.h"
diff --git a/include/hw/char/parallel.h b/include/hw/char/parallel.h
index cfb97cc7cc..7b04478226 100644
--- a/include/hw/char/parallel.h
+++ b/include/hw/char/parallel.h
@@ -1,7 +1,7 @@
#ifndef HW_PARALLEL_H
#define HW_PARALLEL_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/isa/isa.h"
#include "hw/irq.h"
#include "chardev/char-fe.h"
diff --git a/include/hw/char/riscv_htif.h b/include/hw/char/riscv_htif.h
index df493fdf6b..ee0ca29902 100644
--- a/include/hw/char/riscv_htif.h
+++ b/include/hw/char/riscv_htif.h
@@ -22,7 +22,7 @@
#include "chardev/char.h"
#include "chardev/char-fe.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#define TYPE_HTIF_UART "riscv.htif.uart"
diff --git a/include/hw/char/serial-mm.h b/include/hw/char/serial-mm.h
index 62a8489d69..77abd098e0 100644
--- a/include/hw/char/serial-mm.h
+++ b/include/hw/char/serial-mm.h
@@ -27,7 +27,7 @@
#define HW_SERIAL_MM_H
#include "hw/char/serial.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "chardev/char.h"
#include "hw/sysbus.h"
#include "qom/object.h"
diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h
index 942b372df6..4bf90a46f3 100644
--- a/include/hw/char/serial.h
+++ b/include/hw/char/serial.h
@@ -27,7 +27,7 @@
#define HW_SERIAL_H
#include "chardev/char-fe.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qemu/fifo8.h"
#include "qom/object.h"
diff --git a/include/hw/display/macfb.h b/include/hw/display/macfb.h
index 27cebefc9e..0fae1f33a6 100644
--- a/include/hw/display/macfb.h
+++ b/include/hw/display/macfb.h
@@ -13,7 +13,7 @@
#ifndef MACFB_H
#define MACFB_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/irq.h"
#include "hw/nubus/nubus.h"
#include "hw/sysbus.h"
diff --git a/include/hw/fsi/aspeed_apb2opb.h b/include/hw/fsi/aspeed_apb2opb.h
index f6a2387abf..878619eafa 100644
--- a/include/hw/fsi/aspeed_apb2opb.h
+++ b/include/hw/fsi/aspeed_apb2opb.h
@@ -8,7 +8,7 @@
#ifndef FSI_ASPEED_APB2OPB_H
#define FSI_ASPEED_APB2OPB_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/fsi/fsi-master.h"
#include "hw/sysbus.h"
diff --git a/include/hw/fsi/cfam.h b/include/hw/fsi/cfam.h
index 7abc3b287b..cceb4bd6f1 100644
--- a/include/hw/fsi/cfam.h
+++ b/include/hw/fsi/cfam.h
@@ -7,7 +7,7 @@
#ifndef FSI_CFAM_H
#define FSI_CFAM_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/fsi/fsi.h"
#include "hw/fsi/lbus.h"
diff --git a/include/hw/fsi/fsi-master.h b/include/hw/fsi/fsi-master.h
index 68e5f56db2..b634ecd393 100644
--- a/include/hw/fsi/fsi-master.h
+++ b/include/hw/fsi/fsi-master.h
@@ -7,7 +7,7 @@
#ifndef FSI_FSI_MASTER_H
#define FSI_FSI_MASTER_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/qdev-core.h"
#include "hw/fsi/fsi.h"
#include "hw/fsi/cfam.h"
diff --git a/include/hw/fsi/fsi.h b/include/hw/fsi/fsi.h
index e00f6ef078..f34765ed80 100644
--- a/include/hw/fsi/fsi.h
+++ b/include/hw/fsi/fsi.h
@@ -7,7 +7,7 @@
#ifndef FSI_FSI_H
#define FSI_FSI_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/qdev-core.h"
#include "hw/fsi/lbus.h"
#include "qemu/bitops.h"
diff --git a/include/hw/fsi/lbus.h b/include/hw/fsi/lbus.h
index 558268c013..12519073cd 100644
--- a/include/hw/fsi/lbus.h
+++ b/include/hw/fsi/lbus.h
@@ -9,7 +9,7 @@
#include "hw/qdev-core.h"
#include "qemu/units.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#define TYPE_FSI_LBUS_DEVICE "fsi.lbus.device"
OBJECT_DECLARE_SIMPLE_TYPE(FSILBusDevice, FSI_LBUS_DEVICE)
diff --git a/include/hw/gpio/npcm7xx_gpio.h b/include/hw/gpio/npcm7xx_gpio.h
index b1d771bd77..7c0bf61a96 100644
--- a/include/hw/gpio/npcm7xx_gpio.h
+++ b/include/hw/gpio/npcm7xx_gpio.h
@@ -15,7 +15,7 @@
#ifndef NPCM7XX_GPIO_H
#define NPCM7XX_GPIO_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/sysbus.h"
/* Number of pins managed by each controller. */
diff --git a/include/hw/i2c/npcm7xx_smbus.h b/include/hw/i2c/npcm7xx_smbus.h
index dc45963c0e..9c544c561b 100644
--- a/include/hw/i2c/npcm7xx_smbus.h
+++ b/include/hw/i2c/npcm7xx_smbus.h
@@ -16,7 +16,7 @@
#ifndef NPCM7XX_SMBUS_H
#define NPCM7XX_SMBUS_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/i2c/i2c.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
diff --git a/include/hw/i2c/pm_smbus.h b/include/hw/i2c/pm_smbus.h
index 0d74207efb..dafe0df4f6 100644
--- a/include/hw/i2c/pm_smbus.h
+++ b/include/hw/i2c/pm_smbus.h
@@ -1,7 +1,7 @@
#ifndef PM_SMBUS_H
#define PM_SMBUS_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/i2c/smbus_master.h"
#define PM_SMBUS_MAX_MSG_SIZE 32
diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h
index d6e85833da..429278da61 100644
--- a/include/hw/i386/apic_internal.h
+++ b/include/hw/i386/apic_internal.h
@@ -22,7 +22,7 @@
#define QEMU_APIC_INTERNAL_H
#include "cpu.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qemu/timer.h"
#include "target/i386/cpu-qom.h"
#include "qom/object.h"
diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h
index d43cb3908e..258b1343a1 100644
--- a/include/hw/i386/x86.h
+++ b/include/hw/i386/x86.h
@@ -18,7 +18,7 @@
#define HW_I386_X86_H
#include "exec/hwaddr.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/boards.h"
#include "hw/i386/topology.h"
diff --git a/include/hw/ide/ahci.h b/include/hw/ide/ahci.h
index ac0292c634..cd07b87811 100644
--- a/include/hw/ide/ahci.h
+++ b/include/hw/ide/ahci.h
@@ -24,7 +24,7 @@
#ifndef HW_IDE_AHCI_H
#define HW_IDE_AHCI_H
-#include "exec/memory.h"
+#include "system/memory.h"
typedef struct AHCIDevice AHCIDevice;
diff --git a/include/hw/ipmi/ipmi.h b/include/hw/ipmi/ipmi.h
index 77a7213ed9..2882eb7f3d 100644
--- a/include/hw/ipmi/ipmi.h
+++ b/include/hw/ipmi/ipmi.h
@@ -25,7 +25,7 @@
#ifndef HW_IPMI_H
#define HW_IPMI_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/qdev-core.h"
#include "qom/object.h"
diff --git a/include/hw/isa/apm.h b/include/hw/isa/apm.h
index b6e070c00e..0834539045 100644
--- a/include/hw/isa/apm.h
+++ b/include/hw/isa/apm.h
@@ -1,7 +1,7 @@
#ifndef APM_H
#define APM_H
-#include "exec/memory.h"
+#include "system/memory.h"
#define APM_CNT_IOPORT 0xb2
#define ACPI_PORT_SMI_CMD APM_CNT_IOPORT
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index 40d6224a4e..1d852011b3 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -3,7 +3,7 @@
/* ISA bus */
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/ioport.h"
#include "hw/qdev-core.h"
#include "qom/object.h"
diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
index 34365c9860..9caaed9692 100644
--- a/include/hw/m68k/q800.h
+++ b/include/hw/m68k/q800.h
@@ -26,7 +26,7 @@
#include "hw/boards.h"
#include "qom/object.h"
#include "target/m68k/cpu-qom.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/m68k/q800-glue.h"
#include "hw/misc/mac_via.h"
#include "hw/net/dp8393x.h"
diff --git a/include/hw/mem/npcm7xx_mc.h b/include/hw/mem/npcm7xx_mc.h
index 7ed38be243..568cc35fdd 100644
--- a/include/hw/mem/npcm7xx_mc.h
+++ b/include/hw/mem/npcm7xx_mc.h
@@ -16,7 +16,7 @@
#ifndef NPCM7XX_MC_H
#define NPCM7XX_MC_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/sysbus.h"
/**
diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h
index fe0f3ea963..e0dbdd43dc 100644
--- a/include/hw/mem/pc-dimm.h
+++ b/include/hw/mem/pc-dimm.h
@@ -16,7 +16,7 @@
#ifndef QEMU_PC_DIMM_H
#define QEMU_PC_DIMM_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/qdev-core.h"
#include "qom/object.h"
diff --git a/include/hw/mips/mips.h b/include/hw/mips/mips.h
index 101799f7d3..1f3672ba5f 100644
--- a/include/hw/mips/mips.h
+++ b/include/hw/mips/mips.h
@@ -7,7 +7,7 @@
/* Kernels can be configured with 64KB pages */
#define INITRD_PAGE_SIZE (64 * KiB)
-#include "exec/memory.h"
+#include "system/memory.h"
/* bonito.c */
PCIBus *bonito_init(qemu_irq *pic);
diff --git a/include/hw/misc/auxbus.h b/include/hw/misc/auxbus.h
index 03cacdee42..ccd18ce209 100644
--- a/include/hw/misc/auxbus.h
+++ b/include/hw/misc/auxbus.h
@@ -25,7 +25,7 @@
#ifndef HW_MISC_AUXBUS_H
#define HW_MISC_AUXBUS_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/qdev-core.h"
#include "qom/object.h"
diff --git a/include/hw/misc/ivshmem-flat.h b/include/hw/misc/ivshmem-flat.h
index 0c2b015781..09bc3abcad 100644
--- a/include/hw/misc/ivshmem-flat.h
+++ b/include/hw/misc/ivshmem-flat.h
@@ -14,7 +14,7 @@
#include "qemu/queue.h"
#include "qemu/event_notifier.h"
#include "chardev/char-fe.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qom/object.h"
#include "hw/sysbus.h"
diff --git a/include/hw/misc/mac_via.h b/include/hw/misc/mac_via.h
index 63cdcf7c69..6a15228150 100644
--- a/include/hw/misc/mac_via.h
+++ b/include/hw/misc/mac_via.h
@@ -9,7 +9,7 @@
#ifndef HW_MISC_MAC_VIA_H
#define HW_MISC_MAC_VIA_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/sysbus.h"
#include "hw/misc/mos6522.h"
#include "hw/input/adb.h"
diff --git a/include/hw/misc/npcm7xx_mft.h b/include/hw/misc/npcm7xx_mft.h
index d6384382ce..e4b997a6ad 100644
--- a/include/hw/misc/npcm7xx_mft.h
+++ b/include/hw/misc/npcm7xx_mft.h
@@ -16,7 +16,7 @@
#ifndef NPCM7XX_MFT_H
#define NPCM7XX_MFT_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/clock.h"
#include "hw/irq.h"
#include "hw/sysbus.h"
diff --git a/include/hw/misc/npcm_clk.h b/include/hw/misc/npcm_clk.h
index 8fa1e14bdd..52e972f460 100644
--- a/include/hw/misc/npcm_clk.h
+++ b/include/hw/misc/npcm_clk.h
@@ -16,7 +16,7 @@
#ifndef NPCM_CLK_H
#define NPCM_CLK_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/clock.h"
#include "hw/sysbus.h"
diff --git a/include/hw/misc/npcm_gcr.h b/include/hw/misc/npcm_gcr.h
index d81bb9afb2..702e7fddb1 100644
--- a/include/hw/misc/npcm_gcr.h
+++ b/include/hw/misc/npcm_gcr.h
@@ -16,7 +16,7 @@
#ifndef NPCM_GCR_H
#define NPCM_GCR_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/sysbus.h"
#include "qom/object.h"
diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h
index 049a94c112..5098693437 100644
--- a/include/hw/misc/pvpanic.h
+++ b/include/hw/misc/pvpanic.h
@@ -15,7 +15,7 @@
#ifndef HW_MISC_PVPANIC_H
#define HW_MISC_PVPANIC_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qom/object.h"
#include "standard-headers/misc/pvpanic.h"
diff --git a/include/hw/net/dp8393x.h b/include/hw/net/dp8393x.h
index 4a3f7478be..24273dc1f4 100644
--- a/include/hw/net/dp8393x.h
+++ b/include/hw/net/dp8393x.h
@@ -22,7 +22,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#define SONIC_REG_COUNT 0x40
diff --git a/include/hw/net/msf2-emac.h b/include/hw/net/msf2-emac.h
index 846ba6e6dc..b5d9127e46 100644
--- a/include/hw/net/msf2-emac.h
+++ b/include/hw/net/msf2-emac.h
@@ -23,7 +23,7 @@
*/
#include "hw/sysbus.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "net/net.h"
#include "net/eth.h"
#include "qom/object.h"
diff --git a/include/hw/nvram/mac_nvram.h b/include/hw/nvram/mac_nvram.h
index 0c4dfaeff6..e9d8398f84 100644
--- a/include/hw/nvram/mac_nvram.h
+++ b/include/hw/nvram/mac_nvram.h
@@ -26,7 +26,7 @@
#ifndef MAC_NVRAM_H
#define MAC_NVRAM_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/sysbus.h"
#define MACIO_NVRAM_SIZE 0x2000
diff --git a/include/hw/nvram/npcm7xx_otp.h b/include/hw/nvram/npcm7xx_otp.h
index ea4b5d0731..77b05f8b82 100644
--- a/include/hw/nvram/npcm7xx_otp.h
+++ b/include/hw/nvram/npcm7xx_otp.h
@@ -16,7 +16,7 @@
#ifndef NPCM7XX_OTP_H
#define NPCM7XX_OTP_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/sysbus.h"
/* Each OTP module holds 8192 bits of one-time programmable storage */
diff --git a/include/hw/pci-host/fsl_imx8m_phy.h b/include/hw/pci-host/fsl_imx8m_phy.h
index 4f4875b37d..5f1b212fd9 100644
--- a/include/hw/pci-host/fsl_imx8m_phy.h
+++ b/include/hw/pci-host/fsl_imx8m_phy.h
@@ -11,7 +11,7 @@
#include "hw/sysbus.h"
#include "qom/object.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#define TYPE_FSL_IMX8M_PCIE_PHY "fsl-imx8m-pcie-phy"
OBJECT_DECLARE_SIMPLE_TYPE(FslImx8mPciePhyState, FSL_IMX8M_PCIE_PHY)
diff --git a/include/hw/pci-host/pam.h b/include/hw/pci-host/pam.h
index 005916f826..44f3908160 100644
--- a/include/hw/pci-host/pam.h
+++ b/include/hw/pci-host/pam.h
@@ -50,7 +50,7 @@
* 0xf0000 - 0xfffff System BIOS Area Memory Segments
*/
-#include "exec/memory.h"
+#include "system/memory.h"
#define SMRAM_C_BASE 0xa0000
#define SMRAM_C_END 0xc0000
diff --git a/include/hw/pci-host/remote.h b/include/hw/pci-host/remote.h
index 690a01f0fe..5264c35936 100644
--- a/include/hw/pci-host/remote.h
+++ b/include/hw/pci-host/remote.h
@@ -11,7 +11,7 @@
#ifndef PCI_HOST_REMOTE_H
#define PCI_HOST_REMOTE_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/pci/pcie_host.h"
#define TYPE_REMOTE_PCIHOST "remote-pcihost"
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 822fbacdf0..c2fe6caa2c 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -1,7 +1,7 @@
#ifndef QEMU_PCI_H
#define QEMU_PCI_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "system/dma.h"
#include "system/host_iommu_device.h"
diff --git a/include/hw/pci/pcie_host.h b/include/hw/pci/pcie_host.h
index 82d92177da..f09de76bfe 100644
--- a/include/hw/pci/pcie_host.h
+++ b/include/hw/pci/pcie_host.h
@@ -22,7 +22,7 @@
#define PCIE_HOST_H
#include "hw/pci/pci_host.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qom/object.h"
#define TYPE_PCIE_HOST_BRIDGE "pcie-host-bridge"
diff --git a/include/hw/pci/shpc.h b/include/hw/pci/shpc.h
index a0789df153..ad1089567a 100644
--- a/include/hw/pci/shpc.h
+++ b/include/hw/pci/shpc.h
@@ -1,7 +1,7 @@
#ifndef SHPC_H
#define SHPC_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/hotplug.h"
#include "hw/pci/pci_device.h"
#include "migration/vmstate.h"
diff --git a/include/hw/ppc/mac_dbdma.h b/include/hw/ppc/mac_dbdma.h
index 672c2be471..896ee4a2b1 100644
--- a/include/hw/ppc/mac_dbdma.h
+++ b/include/hw/ppc/mac_dbdma.h
@@ -23,7 +23,7 @@
#ifndef HW_MAC_DBDMA_H
#define HW_MAC_DBDMA_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qemu/iov.h"
#include "system/dma.h"
#include "hw/sysbus.h"
diff --git a/include/hw/ppc/pnv_lpc.h b/include/hw/ppc/pnv_lpc.h
index 174add4c53..266d56214f 100644
--- a/include/hw/ppc/pnv_lpc.h
+++ b/include/hw/ppc/pnv_lpc.h
@@ -20,7 +20,7 @@
#ifndef PPC_PNV_LPC_H
#define PPC_PNV_LPC_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/ppc/pnv.h"
#include "hw/qdev-core.h"
#include "hw/isa/isa.h" /* For ISA_NUM_IRQS */
diff --git a/include/hw/ppc/pnv_occ.h b/include/hw/ppc/pnv_occ.h
index df321244e3..b811a3ee95 100644
--- a/include/hw/ppc/pnv_occ.h
+++ b/include/hw/ppc/pnv_occ.h
@@ -20,7 +20,7 @@
#ifndef PPC_PNV_OCC_H
#define PPC_PNV_OCC_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/qdev-core.h"
#define TYPE_PNV_OCC "pnv-occ"
diff --git a/include/hw/ppc/pnv_sbe.h b/include/hw/ppc/pnv_sbe.h
index b6b378ad14..48a8b86a80 100644
--- a/include/hw/ppc/pnv_sbe.h
+++ b/include/hw/ppc/pnv_sbe.h
@@ -20,7 +20,7 @@
#ifndef PPC_PNV_SBE_H
#define PPC_PNV_SBE_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/qdev-core.h"
#define TYPE_PNV_SBE "pnv-sbe"
diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h
index 648388a599..9e607d7c45 100644
--- a/include/hw/ppc/pnv_xscom.h
+++ b/include/hw/ppc/pnv_xscom.h
@@ -20,7 +20,7 @@
#ifndef PPC_PNV_XSCOM_H
#define PPC_PNV_XSCOM_H
-#include "exec/memory.h"
+#include "system/memory.h"
typedef struct PnvXScomInterface PnvXScomInterface;
typedef struct PnvChip PnvChip;
diff --git a/include/hw/ppc/ppc4xx.h b/include/hw/ppc/ppc4xx.h
index 1bd9b8821b..2e94b00673 100644
--- a/include/hw/ppc/ppc4xx.h
+++ b/include/hw/ppc/ppc4xx.h
@@ -26,7 +26,7 @@
#define PPC4XX_H
#include "hw/ppc/ppc.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/sysbus.h"
/*
diff --git a/include/hw/ppc/vof.h b/include/hw/ppc/vof.h
index d3f293da8b..2918aaab12 100644
--- a/include/hw/ppc/vof.h
+++ b/include/hw/ppc/vof.h
@@ -8,7 +8,7 @@
#include "qom/object.h"
#include "exec/address-spaces.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/cpu-defs.h"
typedef struct Vof {
diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
index e94d53405f..097fcdf00f 100644
--- a/include/hw/ppc/xics.h
+++ b/include/hw/ppc/xics.h
@@ -28,7 +28,7 @@
#ifndef XICS_H
#define XICS_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/qdev-core.h"
#include "qom/object.h"
diff --git a/include/hw/register.h b/include/hw/register.h
index 6a076cfcdf..a913c52aee 100644
--- a/include/hw/register.h
+++ b/include/hw/register.h
@@ -12,7 +12,7 @@
#define REGISTER_H
#include "hw/qdev-core.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/registerfields.h"
#include "qom/object.h"
diff --git a/include/hw/remote/proxy-memory-listener.h b/include/hw/remote/proxy-memory-listener.h
index c4f3efb928..ec516d8267 100644
--- a/include/hw/remote/proxy-memory-listener.h
+++ b/include/hw/remote/proxy-memory-listener.h
@@ -9,7 +9,7 @@
#ifndef PROXY_MEMORY_LISTENER_H
#define PROXY_MEMORY_LISTENER_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "io/channel.h"
typedef struct ProxyMemoryListener {
diff --git a/include/hw/sh4/sh_intc.h b/include/hw/sh4/sh_intc.h
index f62d5c5e13..94f183121e 100644
--- a/include/hw/sh4/sh_intc.h
+++ b/include/hw/sh4/sh_intc.h
@@ -1,7 +1,7 @@
#ifndef SH_INTC_H
#define SH_INTC_H
-#include "exec/memory.h"
+#include "system/memory.h"
typedef unsigned char intc_enum;
diff --git a/include/hw/southbridge/ich9.h b/include/hw/southbridge/ich9.h
index 6c60017024..1e231e89c9 100644
--- a/include/hw/southbridge/ich9.h
+++ b/include/hw/southbridge/ich9.h
@@ -7,7 +7,7 @@
#include "hw/pci/pci.h"
#include "hw/pci/pci_device.h"
#include "hw/rtc/mc146818rtc.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qemu/notify.h"
#include "qom/object.h"
diff --git a/include/hw/sysbus.h b/include/hw/sysbus.h
index 81bbda10d3..7dc88aaa27 100644
--- a/include/hw/sysbus.h
+++ b/include/hw/sysbus.h
@@ -4,7 +4,7 @@
/* Devices attached directly to the main system bus. */
#include "hw/qdev-core.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qom/object.h"
#define QDEV_MAX_MMIO 32
diff --git a/include/hw/timer/npcm7xx_timer.h b/include/hw/timer/npcm7xx_timer.h
index d45c051b56..e287375dce 100644
--- a/include/hw/timer/npcm7xx_timer.h
+++ b/include/hw/timer/npcm7xx_timer.h
@@ -16,7 +16,7 @@
#ifndef NPCM7XX_TIMER_H
#define NPCM7XX_TIMER_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/sysbus.h"
#include "qemu/timer.h"
diff --git a/include/hw/tricore/tricore.h b/include/hw/tricore/tricore.h
index c19ed3f013..4ffc0fe1d6 100644
--- a/include/hw/tricore/tricore.h
+++ b/include/hw/tricore/tricore.h
@@ -1,7 +1,7 @@
#ifndef HW_TRICORE_H
#define HW_TRICORE_H
-#include "exec/memory.h"
+#include "system/memory.h"
struct tricore_boot_info {
uint64_t ram_size;
diff --git a/include/hw/usb.h b/include/hw/usb.h
index e410693d0c..26a9f3ecde 100644
--- a/include/hw/usb.h
+++ b/include/hw/usb.h
@@ -25,7 +25,7 @@
* THE SOFTWARE.
*/
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/qdev-core.h"
#include "qemu/iov.h"
#include "qemu/queue.h"
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
index 04b123a6c9..f5b3f45a43 100644
--- a/include/hw/vfio/vfio-common.h
+++ b/include/hw/vfio/vfio-common.h
@@ -21,7 +21,7 @@
#ifndef HW_VFIO_VFIO_COMMON_H
#define HW_VFIO_VFIO_COMMON_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qemu/queue.h"
#include "qemu/notify.h"
#include "ui/console.h"
diff --git a/include/hw/vfio/vfio-container-base.h b/include/hw/vfio/vfio-container-base.h
index 4cff9943ab..6aca02fb3d 100644
--- a/include/hw/vfio/vfio-container-base.h
+++ b/include/hw/vfio/vfio-container-base.h
@@ -13,7 +13,7 @@
#ifndef HW_VFIO_VFIO_CONTAINER_BASE_H
#define HW_VFIO_VFIO_CONTAINER_BASE_H
-#include "exec/memory.h"
+#include "system/memory.h"
typedef struct VFIODevice VFIODevice;
typedef struct VFIOIOMMUClass VFIOIOMMUClass;
diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-backend.h
index 70c2e8ffee..d6df209a2f 100644
--- a/include/hw/virtio/vhost-backend.h
+++ b/include/hw/virtio/vhost-backend.h
@@ -11,7 +11,7 @@
#ifndef VHOST_BACKEND_H
#define VHOST_BACKEND_H
-#include "exec/memory.h"
+#include "system/memory.h"
typedef enum VhostBackendType {
VHOST_BACKEND_TYPE_NONE = 0,
diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h
index a9469d50bc..bb4b58e115 100644
--- a/include/hw/virtio/vhost.h
+++ b/include/hw/virtio/vhost.h
@@ -3,7 +3,7 @@
#include "hw/virtio/vhost-backend.h"
#include "hw/virtio/virtio.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#define VHOST_F_DEVICE_IOTLB 63
#define VHOST_USER_F_PROTOCOL_FEATURES 30
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 6386910280..7e0c471ea4 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -14,7 +14,7 @@
#ifndef QEMU_VIRTIO_H
#define QEMU_VIRTIO_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/qdev-core.h"
#include "net/net.h"
#include "migration/vmstate.h"
diff --git a/include/hw/xen/xen-pvh-common.h b/include/hw/xen/xen-pvh-common.h
index 17c5a58a5a..5db83d88ec 100644
--- a/include/hw/xen/xen-pvh-common.h
+++ b/include/hw/xen/xen-pvh-common.h
@@ -9,7 +9,7 @@
#ifndef XEN_PVH_COMMON_H__
#define XEN_PVH_COMMON_H__
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qom/object.h"
#include "hw/boards.h"
#include "hw/pci-host/gpex.h"
diff --git a/include/hw/xtensa/mx_pic.h b/include/hw/xtensa/mx_pic.h
index 500424c8d3..cd316d86eb 100644
--- a/include/hw/xtensa/mx_pic.h
+++ b/include/hw/xtensa/mx_pic.h
@@ -28,7 +28,7 @@
#ifndef XTENSA_MX_PIC_H
#define XTENSA_MX_PIC_H
-#include "exec/memory.h"
+#include "system/memory.h"
struct XtensaMxPic;
typedef struct XtensaMxPic XtensaMxPic;
diff --git a/include/qemu/iova-tree.h b/include/qemu/iova-tree.h
index 16d354a814..14e82a22d5 100644
--- a/include/qemu/iova-tree.h
+++ b/include/qemu/iova-tree.h
@@ -23,7 +23,7 @@
* for the thread safety issue.
*/
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/hwaddr.h"
#define IOVA_OK (0)
diff --git a/include/qemu/reserved-region.h b/include/qemu/reserved-region.h
index 8e6f0a97e2..9026cf08fd 100644
--- a/include/qemu/reserved-region.h
+++ b/include/qemu/reserved-region.h
@@ -20,7 +20,7 @@
#ifndef QEMU_RESERVED_REGION_H
#define QEMU_RESERVED_REGION_H
-#include "exec/memory.h"
+#include "system/memory.h"
/*
* Insert a new region into a sorted list of reserved regions. In case
diff --git a/include/system/dma.h b/include/system/dma.h
index 5a49a30628..0a2f0ad2dd 100644
--- a/include/system/dma.h
+++ b/include/system/dma.h
@@ -10,7 +10,7 @@
#ifndef DMA_H
#define DMA_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/address-spaces.h"
#include "block/block.h"
#include "block/accounting.h"
diff --git a/include/system/hostmem.h b/include/system/hostmem.h
index 5c21ca55c0..17dd1cede5 100644
--- a/include/system/hostmem.h
+++ b/include/system/hostmem.h
@@ -16,7 +16,7 @@
#include "system/numa.h"
#include "qapi/qapi-types-machine.h"
#include "qom/object.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qemu/bitmap.h"
#include "qemu/thread-context.h"
diff --git a/include/system/kvm_int.h b/include/system/kvm_int.h
index 4de6106869..756a3c0a25 100644
--- a/include/system/kvm_int.h
+++ b/include/system/kvm_int.h
@@ -9,7 +9,7 @@
#ifndef QEMU_KVM_INT_H
#define QEMU_KVM_INT_H
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qapi/qapi-types-common.h"
#include "qemu/accel.h"
#include "qemu/queue.h"
diff --git a/include/exec/memory.h b/include/system/memory.h
similarity index 99%
rename from include/exec/memory.h
rename to include/system/memory.h
index d09af58c97..649dbb006f 100644
--- a/include/exec/memory.h
+++ b/include/system/memory.h
@@ -11,10 +11,8 @@
*
*/
-#ifndef MEMORY_H
-#define MEMORY_H
-
-#ifndef CONFIG_USER_ONLY
+#ifndef SYSTEM_MEMORY_H
+#define SYSTEM_MEMORY_H
#include "exec/cpu-common.h"
#include "exec/hwaddr.h"
@@ -3207,5 +3205,3 @@ void ram_block_add_cpr_blocker(RAMBlock *rb, Error **errp);
void ram_block_del_cpr_blocker(RAMBlock *rb);
#endif
-
-#endif
diff --git a/include/system/vhost-user-backend.h b/include/system/vhost-user-backend.h
index 327b0b84f1..5ed953cd53 100644
--- a/include/system/vhost-user-backend.h
+++ b/include/system/vhost-user-backend.h
@@ -13,7 +13,7 @@
#define QEMU_VHOST_USER_BACKEND_H
#include "qom/object.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qemu/option.h"
#include "qemu/bitmap.h"
#include "hw/virtio/vhost.h"
diff --git a/migration/rdma.h b/migration/rdma.h
index f55f28bbed..4d3386b84a 100644
--- a/migration/rdma.h
+++ b/migration/rdma.h
@@ -19,7 +19,7 @@
#ifndef QEMU_MIGRATION_RDMA_H
#define QEMU_MIGRATION_RDMA_H
-#include "exec/memory.h"
+#include "system/memory.h"
void rdma_start_outgoing_migration(void *opaque, InetSocketAddress *host_port,
Error **errp);
diff --git a/rust/wrapper.h b/rust/wrapper.h
index d927ad6799..3bc4a6c899 100644
--- a/rust/wrapper.h
+++ b/rust/wrapper.h
@@ -52,7 +52,7 @@ typedef enum memory_order {
#include "qemu-io.h"
#include "system/system.h"
#include "hw/sysbus.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "chardev/char-fe.h"
#include "hw/clock.h"
#include "hw/qdev-clock.h"
diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
index eae874c67b..1916716547 100644
--- a/target/loongarch/cpu.h
+++ b/target/loongarch/cpu.h
@@ -14,7 +14,7 @@
#include "hw/registerfields.h"
#include "qemu/timer.h"
#ifndef CONFIG_USER_ONLY
-#include "exec/memory.h"
+#include "system/memory.h"
#endif
#include "cpu-csr.h"
#include "cpu-qom.h"
diff --git a/target/mips/cpu.h b/target/mips/cpu.h
index f6877ece8b..9ef72a95d7 100644
--- a/target/mips/cpu.h
+++ b/target/mips/cpu.h
@@ -4,7 +4,7 @@
#include "cpu-qom.h"
#include "exec/cpu-defs.h"
#ifndef CONFIG_USER_ONLY
-#include "exec/memory.h"
+#include "system/memory.h"
#endif
#include "fpu/softfloat-types.h"
#include "hw/clock.h"
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index f89568bfa3..0d47bb0d9b 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -33,7 +33,7 @@
#include "system/cpus.h"
#include "system/accel-blocker.h"
#include "qemu/bswap.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/ram_addr.h"
#include "qemu/event_notifier.h"
#include "qemu/main-loop.h"
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 2817c9dbdd..6f0ea9067b 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -22,7 +22,7 @@
#include "accel/tcg/cpu-ops.h"
#include "exec/exec-all.h"
#include "exec/page-protection.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/cpu_ldst.h"
#include "exec/cputlb.h"
#include "exec/tb-flush.h"
diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c
index f07a2656ce..f2d1739e33 100644
--- a/backends/tpm/tpm_util.c
+++ b/backends/tpm/tpm_util.c
@@ -25,7 +25,7 @@
#include "qapi/error.h"
#include "qapi/visitor.h"
#include "tpm_int.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/qdev-properties.h"
#include "system/tpm_backend.h"
#include "system/tpm_util.h"
diff --git a/block/blkio.c b/block/blkio.c
index 5f4fce2b1b..4142673984 100644
--- a/block/blkio.c
+++ b/block/blkio.c
@@ -11,7 +11,7 @@
#include "qemu/osdep.h"
#include <blkio.h>
#include "block/block_int.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/cpu-common.h" /* for qemu_ram_get_fd() */
#include "qemu/defer-call.h"
#include "qapi/error.h"
@@ -19,7 +19,7 @@
#include "qobject/qdict.h"
#include "qemu/module.h"
#include "system/block-backend.h"
-#include "exec/memory.h" /* for ram_block_discard_disable() */
+#include "system/memory.h" /* for ram_block_discard_disable() */
#include "block/block-io.h"
diff --git a/disas/disas-mon.c b/disas/disas-mon.c
index 37bf16ac79..9c693618c2 100644
--- a/disas/disas-mon.c
+++ b/disas/disas-mon.c
@@ -7,7 +7,7 @@
#include "qemu/osdep.h"
#include "disas-internal.h"
#include "disas/disas.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/core/cpu.h"
#include "monitor/monitor.h"
diff --git a/hw/acpi/erst.c b/hw/acpi/erst.c
index ec64f92893..5c4c1dc638 100644
--- a/hw/acpi/erst.c
+++ b/hw/acpi/erst.c
@@ -12,7 +12,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "hw/qdev-core.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qom/object.h"
#include "hw/pci/pci_device.h"
#include "qom/object_interfaces.h"
diff --git a/hw/avr/atmega.c b/hw/avr/atmega.c
index f6844bf118..59c0160283 100644
--- a/hw/avr/atmega.c
+++ b/hw/avr/atmega.c
@@ -12,7 +12,7 @@
#include "qemu/module.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/address-spaces.h"
#include "system/system.h"
#include "hw/qdev-properties.h"
diff --git a/hw/block/fdc-sysbus.c b/hw/block/fdc-sysbus.c
index 381b492aec..4955e478cd 100644
--- a/hw/block/fdc-sysbus.c
+++ b/hw/block/fdc-sysbus.c
@@ -26,7 +26,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qom/object.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/sysbus.h"
#include "hw/block/fdc.h"
#include "migration/vmstate.h"
diff --git a/hw/core/cpu-system.c b/hw/core/cpu-system.c
index aed5076ec7..5ef8c24b5b 100644
--- a/hw/core/cpu-system.c
+++ b/hw/core/cpu-system.c
@@ -22,7 +22,7 @@
#include "qapi/error.h"
#include "exec/address-spaces.h"
#include "exec/cputlb.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/tb-flush.h"
#include "exec/tswap.h"
#include "hw/qdev-core.h"
diff --git a/hw/core/loader-fit.c b/hw/core/loader-fit.c
index 6eb66406b0..2dea485ae0 100644
--- a/hw/core/loader-fit.c
+++ b/hw/core/loader-fit.c
@@ -20,7 +20,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/units.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/loader.h"
#include "hw/loader-fit.h"
#include "qemu/cutils.h"
diff --git a/hw/core/loader.c b/hw/core/loader.c
index 332b879a0b..f96cc2c0a5 100644
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -58,7 +58,7 @@
#include "uboot_image.h"
#include "hw/loader.h"
#include "hw/nvram/fw_cfg.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/boards.h"
#include "qemu/cutils.h"
#include "system/runstate.h"
diff --git a/hw/display/edid-region.c b/hw/display/edid-region.c
index 675429dc18..f1596fba9a 100644
--- a/hw/display/edid-region.c
+++ b/hw/display/edid-region.c
@@ -1,5 +1,5 @@
#include "qemu/osdep.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/display/edid.h"
static uint64_t edid_region_read(void *ptr, hwaddr addr, unsigned size)
diff --git a/hw/hyperv/hyperv.c b/hw/hyperv/hyperv.c
index 831e04f214..382c62d668 100644
--- a/hw/hyperv/hyperv.c
+++ b/hw/hyperv/hyperv.c
@@ -12,7 +12,7 @@
#include "qemu/module.h"
#include "qapi/error.h"
#include "exec/address-spaces.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "system/kvm.h"
#include "qemu/bitops.h"
#include "qemu/error-report.h"
diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c
index 0cc2919bb8..7bd08067a7 100644
--- a/hw/i386/acpi-common.c
+++ b/hw/i386/acpi-common.c
@@ -23,7 +23,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/acpi/acpi.h"
#include "hw/acpi/aml-build.h"
#include "hw/acpi/utils.h"
diff --git a/hw/i386/acpi-microvm.c b/hw/i386/acpi-microvm.c
index 279da6b4aa..bc6571778c 100644
--- a/hw/i386/acpi-microvm.c
+++ b/hw/i386/acpi-microvm.c
@@ -24,7 +24,7 @@
#include "qemu/cutils.h"
#include "qapi/error.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/acpi/acpi.h"
#include "hw/acpi/acpi_aml_interface.h"
#include "hw/acpi/aml-build.h"
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 6c91e2d292..e9dbbe086a 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -47,7 +47,7 @@
#include "hw/i386/kvm/clock.h"
#include "hw/sysbus.h"
#include "hw/i2c/smbus_eeprom.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/acpi/acpi.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c
index 5e3cbeabec..12d3908938 100644
--- a/hw/intc/mips_gic.c
+++ b/hw/intc/mips_gic.c
@@ -14,7 +14,7 @@
#include "qemu/module.h"
#include "qapi/error.h"
#include "hw/sysbus.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "system/kvm.h"
#include "system/reset.h"
#include "kvm_mips.h"
diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c
index 42af4567c6..169baf2ded 100644
--- a/hw/intc/ompic.c
+++ b/hw/intc/ompic.c
@@ -13,7 +13,7 @@
#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qom/object.h"
#define TYPE_OR1K_OMPIC "or1k-ompic"
diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
index b482c5f3af..b1923c8c3e 100644
--- a/hw/net/ne2000.c
+++ b/hw/net/ne2000.c
@@ -25,7 +25,7 @@
#include "qemu/osdep.h"
#include "net/eth.h"
#include "qemu/module.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/irq.h"
#include "migration/vmstate.h"
#include "ne2000.h"
diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c
index 0a91a8ae6c..4931ea24f6 100644
--- a/hw/pci-bridge/pci_bridge_dev.c
+++ b/hw/pci-bridge/pci_bridge_dev.c
@@ -28,7 +28,7 @@
#include "hw/pci/shpc.h"
#include "hw/pci/slotid_cap.h"
#include "hw/qdev-properties.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/pci/pci_bus.h"
#include "hw/hotplug.h"
#include "qom/object.h"
diff --git a/hw/pci-host/remote.c b/hw/pci-host/remote.c
index bfb25ef6af..be077d075e 100644
--- a/hw/pci-host/remote.c
+++ b/hw/pci-host/remote.c
@@ -28,7 +28,7 @@
#include "hw/pci/pcie_host.h"
#include "hw/qdev-properties.h"
#include "hw/pci-host/remote.h"
-#include "exec/memory.h"
+#include "system/memory.h"
static const char *remote_pcihost_root_bus_path(PCIHostState *host_bridge,
PCIBus *rootbus)
diff --git a/hw/ppc/pnv_homer.c b/hw/ppc/pnv_homer.c
index a1d83c8149..574ee80119 100644
--- a/hw/ppc/pnv_homer.c
+++ b/hw/ppc/pnv_homer.c
@@ -20,7 +20,7 @@
#include "qemu/log.h"
#include "qapi/error.h"
#include "exec/hwaddr.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "system/cpus.h"
#include "hw/qdev-core.h"
#include "hw/qdev-properties.h"
diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
index 3ecae6a950..567d9e78ac 100644
--- a/hw/ppc/sam460ex.c
+++ b/hw/ppc/sam460ex.c
@@ -24,7 +24,7 @@
#include "exec/page-protection.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "ppc440.h"
#include "hw/pci-host/ppc4xx.h"
#include "hw/block/flash.h"
diff --git a/hw/remote/iommu.c b/hw/remote/iommu.c
index 7c56aad0fc..ec845d1f58 100644
--- a/hw/remote/iommu.c
+++ b/hw/remote/iommu.c
@@ -13,7 +13,7 @@
#include "hw/remote/iommu.h"
#include "hw/pci/pci_bus.h"
#include "hw/pci/pci.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/address-spaces.h"
#include "trace.h"
diff --git a/hw/remote/machine.c b/hw/remote/machine.c
index fdc6c441bb..d4616025e8 100644
--- a/hw/remote/machine.c
+++ b/hw/remote/machine.c
@@ -16,7 +16,7 @@
#include "qemu/osdep.h"
#include "hw/remote/machine.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qapi/error.h"
#include "hw/pci/pci_host.h"
#include "hw/remote/iohub.h"
diff --git a/hw/remote/proxy-memory-listener.c b/hw/remote/proxy-memory-listener.c
index a926f61ebe..ce7f5b9bfb 100644
--- a/hw/remote/proxy-memory-listener.c
+++ b/hw/remote/proxy-memory-listener.c
@@ -10,7 +10,7 @@
#include "qemu/int128.h"
#include "qemu/range.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/cpu-common.h"
#include "exec/ram_addr.h"
#include "qapi/error.h"
diff --git a/hw/remote/vfio-user-obj.c b/hw/remote/vfio-user-obj.c
index 6e51a92856..9bdd0a465b 100644
--- a/hw/remote/vfio-user-obj.c
+++ b/hw/remote/vfio-user-obj.c
@@ -57,7 +57,7 @@
#include "hw/qdev-core.h"
#include "hw/pci/pci.h"
#include "qemu/timer.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "hw/pci/msi.h"
#include "hw/pci/msix.h"
#include "hw/remote/vfio-user-obj.h"
diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c
index 8cdeb6cb7f..b4e003c19c 100644
--- a/hw/s390x/s390-pci-inst.c
+++ b/hw/s390x/s390-pci-inst.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "exec/memop.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qemu/error-report.h"
#include "system/hw_accel.h"
#include "hw/boards.h"
diff --git a/hw/timer/sh_timer.c b/hw/timer/sh_timer.c
index 7788939766..d4fa32c9d6 100644
--- a/hw/timer/sh_timer.c
+++ b/hw/timer/sh_timer.c
@@ -9,7 +9,7 @@
*/
#include "qemu/osdep.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qemu/log.h"
#include "hw/irq.h"
#include "hw/sh4/sh.h"
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 7a4010ef4e..cdcec21c08 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -28,7 +28,7 @@
#include "hw/vfio/vfio-common.h"
#include "hw/vfio/pci.h"
#include "exec/address-spaces.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/ram_addr.h"
#include "hw/hw.h"
#include "qemu/error-report.h"
diff --git a/hw/vfio/container.c b/hw/vfio/container.c
index 7c57bdd27b..1d1c5f9a77 100644
--- a/hw/vfio/container.c
+++ b/hw/vfio/container.c
@@ -24,7 +24,7 @@
#include "hw/vfio/vfio-common.h"
#include "exec/address-spaces.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/ram_addr.h"
#include "qemu/error-report.h"
#include "qemu/range.h"
diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index 67bc57409c..96c6bf5654 100644
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -28,7 +28,7 @@
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "qemu/range.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/address-spaces.h"
#include "qemu/queue.h"
#include "hw/sysbus.h"
diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c
index 1cea29c66d..49d17e7bb2 100644
--- a/hw/xtensa/sim.c
+++ b/hw/xtensa/sim.c
@@ -32,7 +32,7 @@
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qemu/error-report.h"
#include "xtensa_memory.h"
#include "xtensa_sim.h"
diff --git a/hw/xtensa/virt.c b/hw/xtensa/virt.c
index b08404fc17..b10866ccd8 100644
--- a/hw/xtensa/virt.c
+++ b/hw/xtensa/virt.c
@@ -33,7 +33,7 @@
#include "hw/pci-host/gpex.h"
#include "net/net.h"
#include "elf.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qemu/error-report.h"
#include "xtensa_memory.h"
#include "xtensa_sim.h"
diff --git a/hw/xtensa/xtensa_memory.c b/hw/xtensa/xtensa_memory.c
index 2c1095f017..13a6077d86 100644
--- a/hw/xtensa/xtensa_memory.c
+++ b/hw/xtensa/xtensa_memory.c
@@ -27,7 +27,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qemu/error-report.h"
#include "xtensa_memory.h"
diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index 3f3677f1c9..3bd0ef8268 100644
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -34,7 +34,7 @@
#include "hw/loader.h"
#include "hw/qdev-properties.h"
#include "elf.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/tswap.h"
#include "hw/char/serial-mm.h"
#include "net/net.h"
diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c
index 4cd14779d6..09caf92f87 100644
--- a/migration/dirtyrate.c
+++ b/migration/dirtyrate.c
@@ -27,7 +27,7 @@
#include "qobject/qdict.h"
#include "system/kvm.h"
#include "system/runstate.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qemu/xxhash.h"
#include "migration.h"
diff --git a/migration/rdma.c b/migration/rdma.c
index 76fb034923..d9603ab603 100644
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -30,7 +30,7 @@
#include "qemu/sockets.h"
#include "qemu/bitmap.h"
#include "qemu/coroutine.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include <sys/socket.h>
#include <netdb.h>
#include <arpa/inet.h>
diff --git a/migration/savevm.c b/migration/savevm.c
index ce158c3512..c33200a33f 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -48,7 +48,7 @@
#include "qapi/qapi-builtin-visit.h"
#include "qemu/error-report.h"
#include "system/cpus.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/target_page.h"
#include "trace.h"
#include "qemu/iov.h"
diff --git a/monitor/hmp-cmds-target.c b/monitor/hmp-cmds-target.c
index 239c2a61a4..6654d31406 100644
--- a/monitor/hmp-cmds-target.c
+++ b/monitor/hmp-cmds-target.c
@@ -25,7 +25,7 @@
#include "qemu/osdep.h"
#include "disas/disas.h"
#include "exec/address-spaces.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "monitor/hmp-target.h"
#include "monitor/monitor-internal.h"
#include "qapi/error.h"
diff --git a/stubs/ram-block.c b/stubs/ram-block.c
index 108197683b..e88fab31a5 100644
--- a/stubs/ram-block.c
+++ b/stubs/ram-block.c
@@ -1,7 +1,7 @@
#include "qemu/osdep.h"
#include "exec/ramlist.h"
#include "exec/cpu-common.h"
-#include "exec/memory.h"
+#include "system/memory.h"
void *qemu_ram_get_host_addr(RAMBlock *rb)
{
diff --git a/system/dirtylimit.c b/system/dirtylimit.c
index 7dedef8dd4..30cd09f3d1 100644
--- a/system/dirtylimit.c
+++ b/system/dirtylimit.c
@@ -19,7 +19,7 @@
#include "system/dirtylimit.h"
#include "monitor/hmp.h"
#include "monitor/monitor.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/target_page.h"
#include "hw/boards.h"
#include "system/kvm.h"
diff --git a/system/ioport.c b/system/ioport.c
index 55c2a75239..5f8718486c 100644
--- a/system/ioport.c
+++ b/system/ioport.c
@@ -28,7 +28,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/ioport.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/address-spaces.h"
#include "trace.h"
diff --git a/system/memory.c b/system/memory.c
index 4c829793a0..6d6b33b366 100644
--- a/system/memory.c
+++ b/system/memory.c
@@ -16,7 +16,7 @@
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "qapi/error.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qapi/visitor.h"
#include "qemu/bitops.h"
#include "qemu/error-report.h"
diff --git a/system/memory_mapping.c b/system/memory_mapping.c
index 37d3325f77..8538a8241e 100644
--- a/system/memory_mapping.c
+++ b/system/memory_mapping.c
@@ -16,7 +16,7 @@
#include "qapi/error.h"
#include "system/memory_mapping.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/address-spaces.h"
#include "hw/core/cpu.h"
diff --git a/system/physmem.c b/system/physmem.c
index e97de3ef65..be92969a4a 100644
--- a/system/physmem.c
+++ b/system/physmem.c
@@ -50,7 +50,7 @@
#include "qemu/log.h"
#include "qemu/memalign.h"
#include "qemu/memfd.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/ioport.h"
#include "system/dma.h"
#include "system/hostmem.h"
diff --git a/system/qtest.c b/system/qtest.c
index 12152efbcd..5407289154 100644
--- a/system/qtest.c
+++ b/system/qtest.c
@@ -17,7 +17,7 @@
#include "system/runstate.h"
#include "chardev/char-fe.h"
#include "exec/ioport.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/tswap.h"
#include "hw/qdev-core.h"
#include "hw/irq.h"
diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c
index 7663b62d01..ec6a0a8b66 100644
--- a/target/xtensa/cpu.c
+++ b/target/xtensa/cpu.c
@@ -36,7 +36,7 @@
#include "migration/vmstate.h"
#include "hw/qdev-clock.h"
#ifndef CONFIG_USER_ONLY
-#include "exec/memory.h"
+#include "system/memory.h"
#endif
diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c
index d107a496da..239be9372d 100644
--- a/tests/qtest/fuzz/generic_fuzz.c
+++ b/tests/qtest/fuzz/generic_fuzz.c
@@ -20,7 +20,7 @@
#include "tests/qtest/libqos/pci-pc.h"
#include "fuzz.h"
#include "string.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "exec/ramblock.h"
#include "hw/qdev-core.h"
#include "hw/pci/pci.h"
diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c
index d3839bf999..9afe8bf6d8 100644
--- a/tests/qtest/fuzz/qos_fuzz.c
+++ b/tests/qtest/fuzz/qos_fuzz.c
@@ -19,7 +19,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qemu/main-loop.h"
#include "tests/qtest/libqtest.h"
diff --git a/tests/unit/test-resv-mem.c b/tests/unit/test-resv-mem.c
index cd8f7318cc..4de2d042d1 100644
--- a/tests/unit/test-resv-mem.c
+++ b/tests/unit/test-resv-mem.c
@@ -10,7 +10,7 @@
#include "qemu/osdep.h"
#include "qemu/range.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qemu/reserved-region.h"
#define DEBUG 0
diff --git a/ui/console.c b/ui/console.c
index 6456e8dd90..6cd122cf40 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -35,7 +35,7 @@
#include "qemu/option.h"
#include "chardev/char.h"
#include "trace.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "qom/object.h"
#include "qemu/memfd.h"
diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c
index f8bab46c68..fdff042ab4 100644
--- a/util/vfio-helpers.c
+++ b/util/vfio-helpers.c
@@ -16,7 +16,7 @@
#include "qapi/error.h"
#include "exec/ramlist.h"
#include "exec/cpu-common.h"
-#include "exec/memory.h"
+#include "system/memory.h"
#include "trace.h"
#include "qemu/error-report.h"
#include "standard-headers/linux/pci_regs.h"
diff --git a/MAINTAINERS b/MAINTAINERS
index 0e5db7a574..b5f1e81771 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3109,7 +3109,7 @@ R: Philippe Mathieu-Daudé <philmd@linaro.org>
S: Supported
F: include/exec/ioport.h
F: include/exec/memop.h
-F: include/exec/memory.h
+F: include/system/memory.h
F: include/exec/ram_addr.h
F: include/exec/ramblock.h
F: include/system/memory_mapping.h
diff --git a/docs/devel/memory.rst b/docs/devel/memory.rst
index 69c5e3f914..57fb2aec76 100644
--- a/docs/devel/memory.rst
+++ b/docs/devel/memory.rst
@@ -369,4 +369,4 @@ callbacks are called:
API Reference
-------------
-.. kernel-doc:: include/exec/memory.h
+.. kernel-doc:: include/system/memory.h
diff --git a/scripts/analyze-inclusions b/scripts/analyze-inclusions
index b6280f25c8..d2c566667d 100644
--- a/scripts/analyze-inclusions
+++ b/scripts/analyze-inclusions
@@ -53,7 +53,7 @@ echo $(grep_include -F 'trace/generated-tracers.h') files include generated-trac
echo $(grep_include -F 'qapi/error.h') files include qapi/error.h
echo $(grep_include -F 'qom/object.h') files include qom/object.h
echo $(grep_include -F 'block/aio.h') files include block/aio.h
-echo $(grep_include -F 'exec/memory.h') files include exec/memory.h
+echo $(grep_include -F 'system/memory.h') files include system/memory.h
echo $(grep_include -F 'fpu/softfloat.h') files include fpu/softfloat.h
echo $(grep_include -F 'qemu/bswap.h') files include qemu/bswap.h
echo
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 14/37] include/system: Move exec/memory.h to system/memory.h
2025-03-13 3:44 ` [PATCH 14/37] include/system: Move exec/memory.h to system/memory.h Richard Henderson
@ 2025-03-13 10:00 ` Philippe Mathieu-Daudé
2025-03-13 17:34 ` Pierrick Bouvier
1 sibling, 0 replies; 115+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-03-13 10:00 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pierrick.bouvier, pbonzini
On 13/3/25 04:44, Richard Henderson wrote:
> Convert the existing includes with
>
> sed -i ,exec/memory.h,system/memory.h,g
>
> Move the include within cpu-all.h into a !CONFIG_USER_ONLY block.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> hw/arm/strongarm.h | 2 +-
> hw/display/apple-gfx.h | 2 +-
> hw/display/framebuffer.h | 2 +-
> hw/display/vga_int.h | 2 +-
> hw/hyperv/hv-balloon-our_range_memslots.h | 2 +-
> hw/intc/ioapic_internal.h | 2 +-
> hw/net/i82596.h | 2 +-
> hw/net/pcnet.h | 2 +-
> hw/tpm/tpm_ppi.h | 2 +-
> hw/usb/hcd-uhci.h | 2 +-
> hw/vfio/pci.h | 2 +-
> hw/virtio/vhost-iova-tree.h | 2 +-
> include/exec/cpu-all.h | 3 +--
> include/exec/ioport.h | 2 +-
> include/hw/acpi/acpi.h | 2 +-
> include/hw/acpi/ich9_tco.h | 2 +-
> include/hw/arm/fsl-imx25.h | 2 +-
> include/hw/arm/fsl-imx31.h | 2 +-
> include/hw/arm/fsl-imx6.h | 2 +-
> include/hw/arm/fsl-imx6ul.h | 2 +-
> include/hw/arm/omap.h | 2 +-
> include/hw/arm/stm32l4x5_soc.h | 2 +-
> include/hw/boards.h | 2 +-
> include/hw/char/parallel.h | 2 +-
> include/hw/char/riscv_htif.h | 2 +-
> include/hw/char/serial-mm.h | 2 +-
> include/hw/char/serial.h | 2 +-
> include/hw/display/macfb.h | 2 +-
> include/hw/fsi/aspeed_apb2opb.h | 2 +-
> include/hw/fsi/cfam.h | 2 +-
> include/hw/fsi/fsi-master.h | 2 +-
> include/hw/fsi/fsi.h | 2 +-
> include/hw/fsi/lbus.h | 2 +-
> include/hw/gpio/npcm7xx_gpio.h | 2 +-
> include/hw/i2c/npcm7xx_smbus.h | 2 +-
> include/hw/i2c/pm_smbus.h | 2 +-
> include/hw/i386/apic_internal.h | 2 +-
> include/hw/i386/x86.h | 2 +-
> include/hw/ide/ahci.h | 2 +-
> include/hw/ipmi/ipmi.h | 2 +-
> include/hw/isa/apm.h | 2 +-
> include/hw/isa/isa.h | 2 +-
> include/hw/m68k/q800.h | 2 +-
> include/hw/mem/npcm7xx_mc.h | 2 +-
> include/hw/mem/pc-dimm.h | 2 +-
> include/hw/mips/mips.h | 2 +-
> include/hw/misc/auxbus.h | 2 +-
> include/hw/misc/ivshmem-flat.h | 2 +-
> include/hw/misc/mac_via.h | 2 +-
> include/hw/misc/npcm7xx_mft.h | 2 +-
> include/hw/misc/npcm_clk.h | 2 +-
> include/hw/misc/npcm_gcr.h | 2 +-
> include/hw/misc/pvpanic.h | 2 +-
> include/hw/net/dp8393x.h | 2 +-
> include/hw/net/msf2-emac.h | 2 +-
> include/hw/nvram/mac_nvram.h | 2 +-
> include/hw/nvram/npcm7xx_otp.h | 2 +-
> include/hw/pci-host/fsl_imx8m_phy.h | 2 +-
> include/hw/pci-host/pam.h | 2 +-
> include/hw/pci-host/remote.h | 2 +-
> include/hw/pci/pci.h | 2 +-
> include/hw/pci/pcie_host.h | 2 +-
> include/hw/pci/shpc.h | 2 +-
> include/hw/ppc/mac_dbdma.h | 2 +-
> include/hw/ppc/pnv_lpc.h | 2 +-
> include/hw/ppc/pnv_occ.h | 2 +-
> include/hw/ppc/pnv_sbe.h | 2 +-
> include/hw/ppc/pnv_xscom.h | 2 +-
> include/hw/ppc/ppc4xx.h | 2 +-
> include/hw/ppc/vof.h | 2 +-
> include/hw/ppc/xics.h | 2 +-
> include/hw/register.h | 2 +-
> include/hw/remote/proxy-memory-listener.h | 2 +-
> include/hw/sh4/sh_intc.h | 2 +-
> include/hw/southbridge/ich9.h | 2 +-
> include/hw/sysbus.h | 2 +-
> include/hw/timer/npcm7xx_timer.h | 2 +-
> include/hw/tricore/tricore.h | 2 +-
> include/hw/usb.h | 2 +-
> include/hw/vfio/vfio-common.h | 2 +-
> include/hw/vfio/vfio-container-base.h | 2 +-
> include/hw/virtio/vhost-backend.h | 2 +-
> include/hw/virtio/vhost.h | 2 +-
> include/hw/virtio/virtio.h | 2 +-
> include/hw/xen/xen-pvh-common.h | 2 +-
> include/hw/xtensa/mx_pic.h | 2 +-
> include/qemu/iova-tree.h | 2 +-
> include/qemu/reserved-region.h | 2 +-
> include/system/dma.h | 2 +-
> include/system/hostmem.h | 2 +-
> include/system/kvm_int.h | 2 +-
> include/{exec => system}/memory.h | 8 ++------
> include/system/vhost-user-backend.h | 2 +-
> migration/rdma.h | 2 +-
> rust/wrapper.h | 2 +-
> target/loongarch/cpu.h | 2 +-
> target/mips/cpu.h | 2 +-
> accel/kvm/kvm-all.c | 2 +-
> accel/tcg/cputlb.c | 2 +-
> backends/tpm/tpm_util.c | 2 +-
> block/blkio.c | 4 ++--
> disas/disas-mon.c | 2 +-
> hw/acpi/erst.c | 2 +-
> hw/avr/atmega.c | 2 +-
> hw/block/fdc-sysbus.c | 2 +-
> hw/core/cpu-system.c | 2 +-
> hw/core/loader-fit.c | 2 +-
> hw/core/loader.c | 2 +-
> hw/display/edid-region.c | 2 +-
> hw/hyperv/hyperv.c | 2 +-
> hw/i386/acpi-common.c | 2 +-
> hw/i386/acpi-microvm.c | 2 +-
> hw/i386/pc_piix.c | 2 +-
> hw/intc/mips_gic.c | 2 +-
> hw/intc/ompic.c | 2 +-
> hw/net/ne2000.c | 2 +-
> hw/pci-bridge/pci_bridge_dev.c | 2 +-
> hw/pci-host/remote.c | 2 +-
> hw/ppc/pnv_homer.c | 2 +-
> hw/ppc/sam460ex.c | 2 +-
> hw/remote/iommu.c | 2 +-
> hw/remote/machine.c | 2 +-
> hw/remote/proxy-memory-listener.c | 2 +-
> hw/remote/vfio-user-obj.c | 2 +-
> hw/s390x/s390-pci-inst.c | 2 +-
> hw/timer/sh_timer.c | 2 +-
> hw/vfio/common.c | 2 +-
> hw/vfio/container.c | 2 +-
> hw/vfio/platform.c | 2 +-
> hw/xtensa/sim.c | 2 +-
> hw/xtensa/virt.c | 2 +-
> hw/xtensa/xtensa_memory.c | 2 +-
> hw/xtensa/xtfpga.c | 2 +-
> migration/dirtyrate.c | 2 +-
> migration/rdma.c | 2 +-
> migration/savevm.c | 2 +-
> monitor/hmp-cmds-target.c | 2 +-
> stubs/ram-block.c | 2 +-
> system/dirtylimit.c | 2 +-
> system/ioport.c | 2 +-
> system/memory.c | 2 +-
> system/memory_mapping.c | 2 +-
> system/physmem.c | 2 +-
> system/qtest.c | 2 +-
> target/xtensa/cpu.c | 2 +-
> tests/qtest/fuzz/generic_fuzz.c | 2 +-
> tests/qtest/fuzz/qos_fuzz.c | 2 +-
> tests/unit/test-resv-mem.c | 2 +-
> ui/console.c | 2 +-
> util/vfio-helpers.c | 2 +-
> MAINTAINERS | 2 +-
> docs/devel/memory.rst | 2 +-
> scripts/analyze-inclusions | 2 +-
> 153 files changed, 155 insertions(+), 160 deletions(-)
> rename include/{exec => system}/memory.h (99%)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 14/37] include/system: Move exec/memory.h to system/memory.h
2025-03-13 3:44 ` [PATCH 14/37] include/system: Move exec/memory.h to system/memory.h Richard Henderson
2025-03-13 10:00 ` Philippe Mathieu-Daudé
@ 2025-03-13 17:34 ` Pierrick Bouvier
1 sibling, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 17:34 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> Convert the existing includes with
>
> sed -i ,exec/memory.h,system/memory.h,g
>
> Move the include within cpu-all.h into a !CONFIG_USER_ONLY block.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> hw/arm/strongarm.h | 2 +-
> hw/display/apple-gfx.h | 2 +-
> hw/display/framebuffer.h | 2 +-
> hw/display/vga_int.h | 2 +-
> hw/hyperv/hv-balloon-our_range_memslots.h | 2 +-
> hw/intc/ioapic_internal.h | 2 +-
> hw/net/i82596.h | 2 +-
> hw/net/pcnet.h | 2 +-
> hw/tpm/tpm_ppi.h | 2 +-
> hw/usb/hcd-uhci.h | 2 +-
> hw/vfio/pci.h | 2 +-
> hw/virtio/vhost-iova-tree.h | 2 +-
> include/exec/cpu-all.h | 3 +--
> include/exec/ioport.h | 2 +-
> include/hw/acpi/acpi.h | 2 +-
> include/hw/acpi/ich9_tco.h | 2 +-
> include/hw/arm/fsl-imx25.h | 2 +-
> include/hw/arm/fsl-imx31.h | 2 +-
> include/hw/arm/fsl-imx6.h | 2 +-
> include/hw/arm/fsl-imx6ul.h | 2 +-
> include/hw/arm/omap.h | 2 +-
> include/hw/arm/stm32l4x5_soc.h | 2 +-
> include/hw/boards.h | 2 +-
> include/hw/char/parallel.h | 2 +-
> include/hw/char/riscv_htif.h | 2 +-
> include/hw/char/serial-mm.h | 2 +-
> include/hw/char/serial.h | 2 +-
> include/hw/display/macfb.h | 2 +-
> include/hw/fsi/aspeed_apb2opb.h | 2 +-
> include/hw/fsi/cfam.h | 2 +-
> include/hw/fsi/fsi-master.h | 2 +-
> include/hw/fsi/fsi.h | 2 +-
> include/hw/fsi/lbus.h | 2 +-
> include/hw/gpio/npcm7xx_gpio.h | 2 +-
> include/hw/i2c/npcm7xx_smbus.h | 2 +-
> include/hw/i2c/pm_smbus.h | 2 +-
> include/hw/i386/apic_internal.h | 2 +-
> include/hw/i386/x86.h | 2 +-
> include/hw/ide/ahci.h | 2 +-
> include/hw/ipmi/ipmi.h | 2 +-
> include/hw/isa/apm.h | 2 +-
> include/hw/isa/isa.h | 2 +-
> include/hw/m68k/q800.h | 2 +-
> include/hw/mem/npcm7xx_mc.h | 2 +-
> include/hw/mem/pc-dimm.h | 2 +-
> include/hw/mips/mips.h | 2 +-
> include/hw/misc/auxbus.h | 2 +-
> include/hw/misc/ivshmem-flat.h | 2 +-
> include/hw/misc/mac_via.h | 2 +-
> include/hw/misc/npcm7xx_mft.h | 2 +-
> include/hw/misc/npcm_clk.h | 2 +-
> include/hw/misc/npcm_gcr.h | 2 +-
> include/hw/misc/pvpanic.h | 2 +-
> include/hw/net/dp8393x.h | 2 +-
> include/hw/net/msf2-emac.h | 2 +-
> include/hw/nvram/mac_nvram.h | 2 +-
> include/hw/nvram/npcm7xx_otp.h | 2 +-
> include/hw/pci-host/fsl_imx8m_phy.h | 2 +-
> include/hw/pci-host/pam.h | 2 +-
> include/hw/pci-host/remote.h | 2 +-
> include/hw/pci/pci.h | 2 +-
> include/hw/pci/pcie_host.h | 2 +-
> include/hw/pci/shpc.h | 2 +-
> include/hw/ppc/mac_dbdma.h | 2 +-
> include/hw/ppc/pnv_lpc.h | 2 +-
> include/hw/ppc/pnv_occ.h | 2 +-
> include/hw/ppc/pnv_sbe.h | 2 +-
> include/hw/ppc/pnv_xscom.h | 2 +-
> include/hw/ppc/ppc4xx.h | 2 +-
> include/hw/ppc/vof.h | 2 +-
> include/hw/ppc/xics.h | 2 +-
> include/hw/register.h | 2 +-
> include/hw/remote/proxy-memory-listener.h | 2 +-
> include/hw/sh4/sh_intc.h | 2 +-
> include/hw/southbridge/ich9.h | 2 +-
> include/hw/sysbus.h | 2 +-
> include/hw/timer/npcm7xx_timer.h | 2 +-
> include/hw/tricore/tricore.h | 2 +-
> include/hw/usb.h | 2 +-
> include/hw/vfio/vfio-common.h | 2 +-
> include/hw/vfio/vfio-container-base.h | 2 +-
> include/hw/virtio/vhost-backend.h | 2 +-
> include/hw/virtio/vhost.h | 2 +-
> include/hw/virtio/virtio.h | 2 +-
> include/hw/xen/xen-pvh-common.h | 2 +-
> include/hw/xtensa/mx_pic.h | 2 +-
> include/qemu/iova-tree.h | 2 +-
> include/qemu/reserved-region.h | 2 +-
> include/system/dma.h | 2 +-
> include/system/hostmem.h | 2 +-
> include/system/kvm_int.h | 2 +-
> include/{exec => system}/memory.h | 8 ++------
> include/system/vhost-user-backend.h | 2 +-
> migration/rdma.h | 2 +-
> rust/wrapper.h | 2 +-
> target/loongarch/cpu.h | 2 +-
> target/mips/cpu.h | 2 +-
> accel/kvm/kvm-all.c | 2 +-
> accel/tcg/cputlb.c | 2 +-
> backends/tpm/tpm_util.c | 2 +-
> block/blkio.c | 4 ++--
> disas/disas-mon.c | 2 +-
> hw/acpi/erst.c | 2 +-
> hw/avr/atmega.c | 2 +-
> hw/block/fdc-sysbus.c | 2 +-
> hw/core/cpu-system.c | 2 +-
> hw/core/loader-fit.c | 2 +-
> hw/core/loader.c | 2 +-
> hw/display/edid-region.c | 2 +-
> hw/hyperv/hyperv.c | 2 +-
> hw/i386/acpi-common.c | 2 +-
> hw/i386/acpi-microvm.c | 2 +-
> hw/i386/pc_piix.c | 2 +-
> hw/intc/mips_gic.c | 2 +-
> hw/intc/ompic.c | 2 +-
> hw/net/ne2000.c | 2 +-
> hw/pci-bridge/pci_bridge_dev.c | 2 +-
> hw/pci-host/remote.c | 2 +-
> hw/ppc/pnv_homer.c | 2 +-
> hw/ppc/sam460ex.c | 2 +-
> hw/remote/iommu.c | 2 +-
> hw/remote/machine.c | 2 +-
> hw/remote/proxy-memory-listener.c | 2 +-
> hw/remote/vfio-user-obj.c | 2 +-
> hw/s390x/s390-pci-inst.c | 2 +-
> hw/timer/sh_timer.c | 2 +-
> hw/vfio/common.c | 2 +-
> hw/vfio/container.c | 2 +-
> hw/vfio/platform.c | 2 +-
> hw/xtensa/sim.c | 2 +-
> hw/xtensa/virt.c | 2 +-
> hw/xtensa/xtensa_memory.c | 2 +-
> hw/xtensa/xtfpga.c | 2 +-
> migration/dirtyrate.c | 2 +-
> migration/rdma.c | 2 +-
> migration/savevm.c | 2 +-
> monitor/hmp-cmds-target.c | 2 +-
> stubs/ram-block.c | 2 +-
> system/dirtylimit.c | 2 +-
> system/ioport.c | 2 +-
> system/memory.c | 2 +-
> system/memory_mapping.c | 2 +-
> system/physmem.c | 2 +-
> system/qtest.c | 2 +-
> target/xtensa/cpu.c | 2 +-
> tests/qtest/fuzz/generic_fuzz.c | 2 +-
> tests/qtest/fuzz/qos_fuzz.c | 2 +-
> tests/unit/test-resv-mem.c | 2 +-
> ui/console.c | 2 +-
> util/vfio-helpers.c | 2 +-
> MAINTAINERS | 2 +-
> docs/devel/memory.rst | 2 +-
> scripts/analyze-inclusions | 2 +-
> 153 files changed, 155 insertions(+), 160 deletions(-)
> rename include/{exec => system}/memory.h (99%)
>
> diff --git a/hw/arm/strongarm.h b/hw/arm/strongarm.h
> index 192821f6aa..b11b3a3379 100644
> --- a/hw/arm/strongarm.h
> +++ b/hw/arm/strongarm.h
> @@ -1,7 +1,7 @@
> #ifndef STRONGARM_H
> #define STRONGARM_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "target/arm/cpu-qom.h"
>
> #define SA_CS0 0x00000000
> diff --git a/hw/display/apple-gfx.h b/hw/display/apple-gfx.h
> index 3900cdbabb..a8b1d1efc0 100644
> --- a/hw/display/apple-gfx.h
> +++ b/hw/display/apple-gfx.h
> @@ -9,7 +9,7 @@
> #define QEMU_APPLE_GFX_H
>
> #include "qemu/queue.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/qdev-properties.h"
> #include "ui/surface.h"
>
> diff --git a/hw/display/framebuffer.h b/hw/display/framebuffer.h
> index 38fa0dcec6..29a828ce7a 100644
> --- a/hw/display/framebuffer.h
> +++ b/hw/display/framebuffer.h
> @@ -1,7 +1,7 @@
> #ifndef QEMU_FRAMEBUFFER_H
> #define QEMU_FRAMEBUFFER_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> /* Framebuffer device helper routines. */
>
> diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h
> index f77c1c1145..60ad26e03e 100644
> --- a/hw/display/vga_int.h
> +++ b/hw/display/vga_int.h
> @@ -27,7 +27,7 @@
>
> #include "ui/console.h"
> #include "exec/ioport.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> #include "hw/display/bochs-vbe.h"
> #include "hw/acpi/acpi_aml_interface.h"
> diff --git a/hw/hyperv/hv-balloon-our_range_memslots.h b/hw/hyperv/hv-balloon-our_range_memslots.h
> index df3b686bc7..b1f19d77da 100644
> --- a/hw/hyperv/hv-balloon-our_range_memslots.h
> +++ b/hw/hyperv/hv-balloon-our_range_memslots.h
> @@ -11,7 +11,7 @@
> #define HW_HYPERV_HV_BALLOON_OUR_RANGE_MEMSLOTS_H
>
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qom/object.h"
> #include "hv-balloon-page_range_tree.h"
>
> diff --git a/hw/intc/ioapic_internal.h b/hw/intc/ioapic_internal.h
> index 37b8565539..51205767f4 100644
> --- a/hw/intc/ioapic_internal.h
> +++ b/hw/intc/ioapic_internal.h
> @@ -22,7 +22,7 @@
> #ifndef HW_INTC_IOAPIC_INTERNAL_H
> #define HW_INTC_IOAPIC_INTERNAL_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/intc/ioapic.h"
> #include "hw/sysbus.h"
> #include "qemu/notify.h"
> diff --git a/hw/net/i82596.h b/hw/net/i82596.h
> index f0bbe810eb..4bdfcaf856 100644
> --- a/hw/net/i82596.h
> +++ b/hw/net/i82596.h
> @@ -3,7 +3,7 @@
>
> #define I82596_IOPORT_SIZE 0x20
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/address-spaces.h"
>
> #define PORT_RESET 0x00 /* reset 82596 */
> diff --git a/hw/net/pcnet.h b/hw/net/pcnet.h
> index eb7f46aab3..a94356ec30 100644
> --- a/hw/net/pcnet.h
> +++ b/hw/net/pcnet.h
> @@ -7,7 +7,7 @@
> #define PCNET_LOOPTEST_CRC 1
> #define PCNET_LOOPTEST_NOCRC 2
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/irq.h"
>
> /* BUS CONFIGURATION REGISTERS */
> diff --git a/hw/tpm/tpm_ppi.h b/hw/tpm/tpm_ppi.h
> index bf5d4a300f..88f316ee95 100644
> --- a/hw/tpm/tpm_ppi.h
> +++ b/hw/tpm/tpm_ppi.h
> @@ -12,7 +12,7 @@
> #ifndef TPM_TPM_PPI_H
> #define TPM_TPM_PPI_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> typedef struct TPMPPI {
> MemoryRegion ram;
> diff --git a/hw/usb/hcd-uhci.h b/hw/usb/hcd-uhci.h
> index 6d26b94e92..d4664297cf 100644
> --- a/hw/usb/hcd-uhci.h
> +++ b/hw/usb/hcd-uhci.h
> @@ -28,7 +28,7 @@
> #ifndef HW_USB_HCD_UHCI_H
> #define HW_USB_HCD_UHCI_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qemu/timer.h"
> #include "hw/pci/pci_device.h"
> #include "hw/usb.h"
> diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
> index d638c781f6..837d7aaed3 100644
> --- a/hw/vfio/pci.h
> +++ b/hw/vfio/pci.h
> @@ -12,7 +12,7 @@
> #ifndef HW_VFIO_VFIO_PCI_H
> #define HW_VFIO_VFIO_PCI_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/pci/pci_device.h"
> #include "hw/vfio/vfio-common.h"
> #include "qemu/event_notifier.h"
> diff --git a/hw/virtio/vhost-iova-tree.h b/hw/virtio/vhost-iova-tree.h
> index 0c4ba5abd5..08f63b61cd 100644
> --- a/hw/virtio/vhost-iova-tree.h
> +++ b/hw/virtio/vhost-iova-tree.h
> @@ -11,7 +11,7 @@
> #define HW_VIRTIO_VHOST_IOVA_TREE_H
>
> #include "qemu/iova-tree.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> typedef struct VhostIOVATree VhostIOVATree;
>
> diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
> index 8cd6c00cf8..d72c28a5d2 100644
> --- a/include/exec/cpu-all.h
> +++ b/include/exec/cpu-all.h
> @@ -22,7 +22,6 @@
> #include "exec/page-protection.h"
> #include "exec/cpu-common.h"
> #include "exec/cpu-interrupt.h"
> -#include "exec/memory.h"
> #include "exec/tswap.h"
> #include "hw/core/cpu.h"
>
> @@ -66,7 +65,7 @@
> /* MMU memory access macros */
>
> #if !defined(CONFIG_USER_ONLY)
> -
> +#include "system/memory.h"
> #include "exec/hwaddr.h"
>
> #define SUFFIX
> diff --git a/include/exec/ioport.h b/include/exec/ioport.h
> index 4397f12f93..ecea3575bc 100644
> --- a/include/exec/ioport.h
> +++ b/include/exec/ioport.h
> @@ -24,7 +24,7 @@
> #ifndef IOPORT_H
> #define IOPORT_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> #define MAX_IOPORTS (64 * 1024)
> #define IOPORTS_MASK (MAX_IOPORTS - 1)
> diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h
> index e0e51e85b4..96642b233f 100644
> --- a/include/hw/acpi/acpi.h
> +++ b/include/hw/acpi/acpi.h
> @@ -21,7 +21,7 @@
> */
>
> #include "qemu/notify.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/acpi/acpi_dev_interface.h"
>
> /*
> diff --git a/include/hw/acpi/ich9_tco.h b/include/hw/acpi/ich9_tco.h
> index 2562a7cf39..b3c3f69451 100644
> --- a/include/hw/acpi/ich9_tco.h
> +++ b/include/hw/acpi/ich9_tco.h
> @@ -10,7 +10,7 @@
> #ifndef HW_ACPI_TCO_H
> #define HW_ACPI_TCO_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "migration/vmstate.h"
>
> /* As per ICH9 spec, the internal timer has an error of ~0.6s on every tick */
> diff --git a/include/hw/arm/fsl-imx25.h b/include/hw/arm/fsl-imx25.h
> index df2f83980f..b68d4334a0 100644
> --- a/include/hw/arm/fsl-imx25.h
> +++ b/include/hw/arm/fsl-imx25.h
> @@ -29,7 +29,7 @@
> #include "hw/sd/sdhci.h"
> #include "hw/usb/chipidea.h"
> #include "hw/watchdog/wdt_imx2.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "target/arm/cpu.h"
> #include "qom/object.h"
>
> diff --git a/include/hw/arm/fsl-imx31.h b/include/hw/arm/fsl-imx31.h
> index 40c593a5cf..41232a2237 100644
> --- a/include/hw/arm/fsl-imx31.h
> +++ b/include/hw/arm/fsl-imx31.h
> @@ -25,7 +25,7 @@
> #include "hw/i2c/imx_i2c.h"
> #include "hw/gpio/imx_gpio.h"
> #include "hw/watchdog/wdt_imx2.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "target/arm/cpu.h"
> #include "qom/object.h"
>
> diff --git a/include/hw/arm/fsl-imx6.h b/include/hw/arm/fsl-imx6.h
> index 9da32fc189..124bbd478f 100644
> --- a/include/hw/arm/fsl-imx6.h
> +++ b/include/hw/arm/fsl-imx6.h
> @@ -34,7 +34,7 @@
> #include "hw/usb/imx-usb-phy.h"
> #include "hw/pci-host/designware.h"
> #include "hw/or-irq.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "cpu.h"
> #include "qom/object.h"
>
> diff --git a/include/hw/arm/fsl-imx6ul.h b/include/hw/arm/fsl-imx6ul.h
> index 8277b0e8b2..4e3209b25b 100644
> --- a/include/hw/arm/fsl-imx6ul.h
> +++ b/include/hw/arm/fsl-imx6ul.h
> @@ -33,7 +33,7 @@
> #include "hw/net/imx_fec.h"
> #include "hw/usb/chipidea.h"
> #include "hw/usb/imx-usb-phy.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "cpu.h"
> #include "qom/object.h"
> #include "qemu/units.h"
> diff --git a/include/hw/arm/omap.h b/include/hw/arm/omap.h
> index 7cb87ea89c..6185507373 100644
> --- a/include/hw/arm/omap.h
> +++ b/include/hw/arm/omap.h
> @@ -20,7 +20,7 @@
> #ifndef HW_ARM_OMAP_H
> #define HW_ARM_OMAP_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "target/arm/cpu-qom.h"
> #include "qemu/log.h"
> #include "qom/object.h"
> diff --git a/include/hw/arm/stm32l4x5_soc.h b/include/hw/arm/stm32l4x5_soc.h
> index c243fb0e7f..c2fae6e23f 100644
> --- a/include/hw/arm/stm32l4x5_soc.h
> +++ b/include/hw/arm/stm32l4x5_soc.h
> @@ -24,7 +24,7 @@
> #ifndef HW_ARM_STM32L4x5_SOC_H
> #define HW_ARM_STM32L4x5_SOC_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/arm/armv7m.h"
> #include "hw/or-irq.h"
> #include "hw/misc/stm32l4x5_syscfg.h"
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index f22b2e7fc7..02f43ac5d4 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -3,7 +3,7 @@
> #ifndef HW_BOARDS_H
> #define HW_BOARDS_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "system/hostmem.h"
> #include "system/blockdev.h"
> #include "qapi/qapi-types-machine.h"
> diff --git a/include/hw/char/parallel.h b/include/hw/char/parallel.h
> index cfb97cc7cc..7b04478226 100644
> --- a/include/hw/char/parallel.h
> +++ b/include/hw/char/parallel.h
> @@ -1,7 +1,7 @@
> #ifndef HW_PARALLEL_H
> #define HW_PARALLEL_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/isa/isa.h"
> #include "hw/irq.h"
> #include "chardev/char-fe.h"
> diff --git a/include/hw/char/riscv_htif.h b/include/hw/char/riscv_htif.h
> index df493fdf6b..ee0ca29902 100644
> --- a/include/hw/char/riscv_htif.h
> +++ b/include/hw/char/riscv_htif.h
> @@ -22,7 +22,7 @@
>
> #include "chardev/char.h"
> #include "chardev/char-fe.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> #define TYPE_HTIF_UART "riscv.htif.uart"
>
> diff --git a/include/hw/char/serial-mm.h b/include/hw/char/serial-mm.h
> index 62a8489d69..77abd098e0 100644
> --- a/include/hw/char/serial-mm.h
> +++ b/include/hw/char/serial-mm.h
> @@ -27,7 +27,7 @@
> #define HW_SERIAL_MM_H
>
> #include "hw/char/serial.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "chardev/char.h"
> #include "hw/sysbus.h"
> #include "qom/object.h"
> diff --git a/include/hw/char/serial.h b/include/hw/char/serial.h
> index 942b372df6..4bf90a46f3 100644
> --- a/include/hw/char/serial.h
> +++ b/include/hw/char/serial.h
> @@ -27,7 +27,7 @@
> #define HW_SERIAL_H
>
> #include "chardev/char-fe.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qemu/fifo8.h"
> #include "qom/object.h"
>
> diff --git a/include/hw/display/macfb.h b/include/hw/display/macfb.h
> index 27cebefc9e..0fae1f33a6 100644
> --- a/include/hw/display/macfb.h
> +++ b/include/hw/display/macfb.h
> @@ -13,7 +13,7 @@
> #ifndef MACFB_H
> #define MACFB_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/irq.h"
> #include "hw/nubus/nubus.h"
> #include "hw/sysbus.h"
> diff --git a/include/hw/fsi/aspeed_apb2opb.h b/include/hw/fsi/aspeed_apb2opb.h
> index f6a2387abf..878619eafa 100644
> --- a/include/hw/fsi/aspeed_apb2opb.h
> +++ b/include/hw/fsi/aspeed_apb2opb.h
> @@ -8,7 +8,7 @@
> #ifndef FSI_ASPEED_APB2OPB_H
> #define FSI_ASPEED_APB2OPB_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/fsi/fsi-master.h"
> #include "hw/sysbus.h"
>
> diff --git a/include/hw/fsi/cfam.h b/include/hw/fsi/cfam.h
> index 7abc3b287b..cceb4bd6f1 100644
> --- a/include/hw/fsi/cfam.h
> +++ b/include/hw/fsi/cfam.h
> @@ -7,7 +7,7 @@
> #ifndef FSI_CFAM_H
> #define FSI_CFAM_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> #include "hw/fsi/fsi.h"
> #include "hw/fsi/lbus.h"
> diff --git a/include/hw/fsi/fsi-master.h b/include/hw/fsi/fsi-master.h
> index 68e5f56db2..b634ecd393 100644
> --- a/include/hw/fsi/fsi-master.h
> +++ b/include/hw/fsi/fsi-master.h
> @@ -7,7 +7,7 @@
> #ifndef FSI_FSI_MASTER_H
> #define FSI_FSI_MASTER_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/qdev-core.h"
> #include "hw/fsi/fsi.h"
> #include "hw/fsi/cfam.h"
> diff --git a/include/hw/fsi/fsi.h b/include/hw/fsi/fsi.h
> index e00f6ef078..f34765ed80 100644
> --- a/include/hw/fsi/fsi.h
> +++ b/include/hw/fsi/fsi.h
> @@ -7,7 +7,7 @@
> #ifndef FSI_FSI_H
> #define FSI_FSI_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/qdev-core.h"
> #include "hw/fsi/lbus.h"
> #include "qemu/bitops.h"
> diff --git a/include/hw/fsi/lbus.h b/include/hw/fsi/lbus.h
> index 558268c013..12519073cd 100644
> --- a/include/hw/fsi/lbus.h
> +++ b/include/hw/fsi/lbus.h
> @@ -9,7 +9,7 @@
>
> #include "hw/qdev-core.h"
> #include "qemu/units.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> #define TYPE_FSI_LBUS_DEVICE "fsi.lbus.device"
> OBJECT_DECLARE_SIMPLE_TYPE(FSILBusDevice, FSI_LBUS_DEVICE)
> diff --git a/include/hw/gpio/npcm7xx_gpio.h b/include/hw/gpio/npcm7xx_gpio.h
> index b1d771bd77..7c0bf61a96 100644
> --- a/include/hw/gpio/npcm7xx_gpio.h
> +++ b/include/hw/gpio/npcm7xx_gpio.h
> @@ -15,7 +15,7 @@
> #ifndef NPCM7XX_GPIO_H
> #define NPCM7XX_GPIO_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/sysbus.h"
>
> /* Number of pins managed by each controller. */
> diff --git a/include/hw/i2c/npcm7xx_smbus.h b/include/hw/i2c/npcm7xx_smbus.h
> index dc45963c0e..9c544c561b 100644
> --- a/include/hw/i2c/npcm7xx_smbus.h
> +++ b/include/hw/i2c/npcm7xx_smbus.h
> @@ -16,7 +16,7 @@
> #ifndef NPCM7XX_SMBUS_H
> #define NPCM7XX_SMBUS_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/i2c/i2c.h"
> #include "hw/irq.h"
> #include "hw/sysbus.h"
> diff --git a/include/hw/i2c/pm_smbus.h b/include/hw/i2c/pm_smbus.h
> index 0d74207efb..dafe0df4f6 100644
> --- a/include/hw/i2c/pm_smbus.h
> +++ b/include/hw/i2c/pm_smbus.h
> @@ -1,7 +1,7 @@
> #ifndef PM_SMBUS_H
> #define PM_SMBUS_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/i2c/smbus_master.h"
>
> #define PM_SMBUS_MAX_MSG_SIZE 32
> diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h
> index d6e85833da..429278da61 100644
> --- a/include/hw/i386/apic_internal.h
> +++ b/include/hw/i386/apic_internal.h
> @@ -22,7 +22,7 @@
> #define QEMU_APIC_INTERNAL_H
>
> #include "cpu.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qemu/timer.h"
> #include "target/i386/cpu-qom.h"
> #include "qom/object.h"
> diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h
> index d43cb3908e..258b1343a1 100644
> --- a/include/hw/i386/x86.h
> +++ b/include/hw/i386/x86.h
> @@ -18,7 +18,7 @@
> #define HW_I386_X86_H
>
> #include "exec/hwaddr.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> #include "hw/boards.h"
> #include "hw/i386/topology.h"
> diff --git a/include/hw/ide/ahci.h b/include/hw/ide/ahci.h
> index ac0292c634..cd07b87811 100644
> --- a/include/hw/ide/ahci.h
> +++ b/include/hw/ide/ahci.h
> @@ -24,7 +24,7 @@
> #ifndef HW_IDE_AHCI_H
> #define HW_IDE_AHCI_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> typedef struct AHCIDevice AHCIDevice;
>
> diff --git a/include/hw/ipmi/ipmi.h b/include/hw/ipmi/ipmi.h
> index 77a7213ed9..2882eb7f3d 100644
> --- a/include/hw/ipmi/ipmi.h
> +++ b/include/hw/ipmi/ipmi.h
> @@ -25,7 +25,7 @@
> #ifndef HW_IPMI_H
> #define HW_IPMI_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/qdev-core.h"
> #include "qom/object.h"
>
> diff --git a/include/hw/isa/apm.h b/include/hw/isa/apm.h
> index b6e070c00e..0834539045 100644
> --- a/include/hw/isa/apm.h
> +++ b/include/hw/isa/apm.h
> @@ -1,7 +1,7 @@
> #ifndef APM_H
> #define APM_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> #define APM_CNT_IOPORT 0xb2
> #define ACPI_PORT_SMI_CMD APM_CNT_IOPORT
> diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
> index 40d6224a4e..1d852011b3 100644
> --- a/include/hw/isa/isa.h
> +++ b/include/hw/isa/isa.h
> @@ -3,7 +3,7 @@
>
> /* ISA bus */
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/ioport.h"
> #include "hw/qdev-core.h"
> #include "qom/object.h"
> diff --git a/include/hw/m68k/q800.h b/include/hw/m68k/q800.h
> index 34365c9860..9caaed9692 100644
> --- a/include/hw/m68k/q800.h
> +++ b/include/hw/m68k/q800.h
> @@ -26,7 +26,7 @@
> #include "hw/boards.h"
> #include "qom/object.h"
> #include "target/m68k/cpu-qom.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/m68k/q800-glue.h"
> #include "hw/misc/mac_via.h"
> #include "hw/net/dp8393x.h"
> diff --git a/include/hw/mem/npcm7xx_mc.h b/include/hw/mem/npcm7xx_mc.h
> index 7ed38be243..568cc35fdd 100644
> --- a/include/hw/mem/npcm7xx_mc.h
> +++ b/include/hw/mem/npcm7xx_mc.h
> @@ -16,7 +16,7 @@
> #ifndef NPCM7XX_MC_H
> #define NPCM7XX_MC_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/sysbus.h"
>
> /**
> diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h
> index fe0f3ea963..e0dbdd43dc 100644
> --- a/include/hw/mem/pc-dimm.h
> +++ b/include/hw/mem/pc-dimm.h
> @@ -16,7 +16,7 @@
> #ifndef QEMU_PC_DIMM_H
> #define QEMU_PC_DIMM_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/qdev-core.h"
> #include "qom/object.h"
>
> diff --git a/include/hw/mips/mips.h b/include/hw/mips/mips.h
> index 101799f7d3..1f3672ba5f 100644
> --- a/include/hw/mips/mips.h
> +++ b/include/hw/mips/mips.h
> @@ -7,7 +7,7 @@
> /* Kernels can be configured with 64KB pages */
> #define INITRD_PAGE_SIZE (64 * KiB)
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> /* bonito.c */
> PCIBus *bonito_init(qemu_irq *pic);
> diff --git a/include/hw/misc/auxbus.h b/include/hw/misc/auxbus.h
> index 03cacdee42..ccd18ce209 100644
> --- a/include/hw/misc/auxbus.h
> +++ b/include/hw/misc/auxbus.h
> @@ -25,7 +25,7 @@
> #ifndef HW_MISC_AUXBUS_H
> #define HW_MISC_AUXBUS_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/qdev-core.h"
> #include "qom/object.h"
>
> diff --git a/include/hw/misc/ivshmem-flat.h b/include/hw/misc/ivshmem-flat.h
> index 0c2b015781..09bc3abcad 100644
> --- a/include/hw/misc/ivshmem-flat.h
> +++ b/include/hw/misc/ivshmem-flat.h
> @@ -14,7 +14,7 @@
> #include "qemu/queue.h"
> #include "qemu/event_notifier.h"
> #include "chardev/char-fe.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qom/object.h"
> #include "hw/sysbus.h"
>
> diff --git a/include/hw/misc/mac_via.h b/include/hw/misc/mac_via.h
> index 63cdcf7c69..6a15228150 100644
> --- a/include/hw/misc/mac_via.h
> +++ b/include/hw/misc/mac_via.h
> @@ -9,7 +9,7 @@
> #ifndef HW_MISC_MAC_VIA_H
> #define HW_MISC_MAC_VIA_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/sysbus.h"
> #include "hw/misc/mos6522.h"
> #include "hw/input/adb.h"
> diff --git a/include/hw/misc/npcm7xx_mft.h b/include/hw/misc/npcm7xx_mft.h
> index d6384382ce..e4b997a6ad 100644
> --- a/include/hw/misc/npcm7xx_mft.h
> +++ b/include/hw/misc/npcm7xx_mft.h
> @@ -16,7 +16,7 @@
> #ifndef NPCM7XX_MFT_H
> #define NPCM7XX_MFT_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/clock.h"
> #include "hw/irq.h"
> #include "hw/sysbus.h"
> diff --git a/include/hw/misc/npcm_clk.h b/include/hw/misc/npcm_clk.h
> index 8fa1e14bdd..52e972f460 100644
> --- a/include/hw/misc/npcm_clk.h
> +++ b/include/hw/misc/npcm_clk.h
> @@ -16,7 +16,7 @@
> #ifndef NPCM_CLK_H
> #define NPCM_CLK_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/clock.h"
> #include "hw/sysbus.h"
>
> diff --git a/include/hw/misc/npcm_gcr.h b/include/hw/misc/npcm_gcr.h
> index d81bb9afb2..702e7fddb1 100644
> --- a/include/hw/misc/npcm_gcr.h
> +++ b/include/hw/misc/npcm_gcr.h
> @@ -16,7 +16,7 @@
> #ifndef NPCM_GCR_H
> #define NPCM_GCR_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/sysbus.h"
> #include "qom/object.h"
>
> diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h
> index 049a94c112..5098693437 100644
> --- a/include/hw/misc/pvpanic.h
> +++ b/include/hw/misc/pvpanic.h
> @@ -15,7 +15,7 @@
> #ifndef HW_MISC_PVPANIC_H
> #define HW_MISC_PVPANIC_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qom/object.h"
>
> #include "standard-headers/misc/pvpanic.h"
> diff --git a/include/hw/net/dp8393x.h b/include/hw/net/dp8393x.h
> index 4a3f7478be..24273dc1f4 100644
> --- a/include/hw/net/dp8393x.h
> +++ b/include/hw/net/dp8393x.h
> @@ -22,7 +22,7 @@
>
> #include "hw/sysbus.h"
> #include "net/net.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> #define SONIC_REG_COUNT 0x40
>
> diff --git a/include/hw/net/msf2-emac.h b/include/hw/net/msf2-emac.h
> index 846ba6e6dc..b5d9127e46 100644
> --- a/include/hw/net/msf2-emac.h
> +++ b/include/hw/net/msf2-emac.h
> @@ -23,7 +23,7 @@
> */
>
> #include "hw/sysbus.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "net/net.h"
> #include "net/eth.h"
> #include "qom/object.h"
> diff --git a/include/hw/nvram/mac_nvram.h b/include/hw/nvram/mac_nvram.h
> index 0c4dfaeff6..e9d8398f84 100644
> --- a/include/hw/nvram/mac_nvram.h
> +++ b/include/hw/nvram/mac_nvram.h
> @@ -26,7 +26,7 @@
> #ifndef MAC_NVRAM_H
> #define MAC_NVRAM_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/sysbus.h"
>
> #define MACIO_NVRAM_SIZE 0x2000
> diff --git a/include/hw/nvram/npcm7xx_otp.h b/include/hw/nvram/npcm7xx_otp.h
> index ea4b5d0731..77b05f8b82 100644
> --- a/include/hw/nvram/npcm7xx_otp.h
> +++ b/include/hw/nvram/npcm7xx_otp.h
> @@ -16,7 +16,7 @@
> #ifndef NPCM7XX_OTP_H
> #define NPCM7XX_OTP_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/sysbus.h"
>
> /* Each OTP module holds 8192 bits of one-time programmable storage */
> diff --git a/include/hw/pci-host/fsl_imx8m_phy.h b/include/hw/pci-host/fsl_imx8m_phy.h
> index 4f4875b37d..5f1b212fd9 100644
> --- a/include/hw/pci-host/fsl_imx8m_phy.h
> +++ b/include/hw/pci-host/fsl_imx8m_phy.h
> @@ -11,7 +11,7 @@
>
> #include "hw/sysbus.h"
> #include "qom/object.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> #define TYPE_FSL_IMX8M_PCIE_PHY "fsl-imx8m-pcie-phy"
> OBJECT_DECLARE_SIMPLE_TYPE(FslImx8mPciePhyState, FSL_IMX8M_PCIE_PHY)
> diff --git a/include/hw/pci-host/pam.h b/include/hw/pci-host/pam.h
> index 005916f826..44f3908160 100644
> --- a/include/hw/pci-host/pam.h
> +++ b/include/hw/pci-host/pam.h
> @@ -50,7 +50,7 @@
> * 0xf0000 - 0xfffff System BIOS Area Memory Segments
> */
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> #define SMRAM_C_BASE 0xa0000
> #define SMRAM_C_END 0xc0000
> diff --git a/include/hw/pci-host/remote.h b/include/hw/pci-host/remote.h
> index 690a01f0fe..5264c35936 100644
> --- a/include/hw/pci-host/remote.h
> +++ b/include/hw/pci-host/remote.h
> @@ -11,7 +11,7 @@
> #ifndef PCI_HOST_REMOTE_H
> #define PCI_HOST_REMOTE_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/pci/pcie_host.h"
>
> #define TYPE_REMOTE_PCIHOST "remote-pcihost"
> diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
> index 822fbacdf0..c2fe6caa2c 100644
> --- a/include/hw/pci/pci.h
> +++ b/include/hw/pci/pci.h
> @@ -1,7 +1,7 @@
> #ifndef QEMU_PCI_H
> #define QEMU_PCI_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "system/dma.h"
> #include "system/host_iommu_device.h"
>
> diff --git a/include/hw/pci/pcie_host.h b/include/hw/pci/pcie_host.h
> index 82d92177da..f09de76bfe 100644
> --- a/include/hw/pci/pcie_host.h
> +++ b/include/hw/pci/pcie_host.h
> @@ -22,7 +22,7 @@
> #define PCIE_HOST_H
>
> #include "hw/pci/pci_host.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qom/object.h"
>
> #define TYPE_PCIE_HOST_BRIDGE "pcie-host-bridge"
> diff --git a/include/hw/pci/shpc.h b/include/hw/pci/shpc.h
> index a0789df153..ad1089567a 100644
> --- a/include/hw/pci/shpc.h
> +++ b/include/hw/pci/shpc.h
> @@ -1,7 +1,7 @@
> #ifndef SHPC_H
> #define SHPC_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/hotplug.h"
> #include "hw/pci/pci_device.h"
> #include "migration/vmstate.h"
> diff --git a/include/hw/ppc/mac_dbdma.h b/include/hw/ppc/mac_dbdma.h
> index 672c2be471..896ee4a2b1 100644
> --- a/include/hw/ppc/mac_dbdma.h
> +++ b/include/hw/ppc/mac_dbdma.h
> @@ -23,7 +23,7 @@
> #ifndef HW_MAC_DBDMA_H
> #define HW_MAC_DBDMA_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qemu/iov.h"
> #include "system/dma.h"
> #include "hw/sysbus.h"
> diff --git a/include/hw/ppc/pnv_lpc.h b/include/hw/ppc/pnv_lpc.h
> index 174add4c53..266d56214f 100644
> --- a/include/hw/ppc/pnv_lpc.h
> +++ b/include/hw/ppc/pnv_lpc.h
> @@ -20,7 +20,7 @@
> #ifndef PPC_PNV_LPC_H
> #define PPC_PNV_LPC_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/ppc/pnv.h"
> #include "hw/qdev-core.h"
> #include "hw/isa/isa.h" /* For ISA_NUM_IRQS */
> diff --git a/include/hw/ppc/pnv_occ.h b/include/hw/ppc/pnv_occ.h
> index df321244e3..b811a3ee95 100644
> --- a/include/hw/ppc/pnv_occ.h
> +++ b/include/hw/ppc/pnv_occ.h
> @@ -20,7 +20,7 @@
> #ifndef PPC_PNV_OCC_H
> #define PPC_PNV_OCC_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/qdev-core.h"
>
> #define TYPE_PNV_OCC "pnv-occ"
> diff --git a/include/hw/ppc/pnv_sbe.h b/include/hw/ppc/pnv_sbe.h
> index b6b378ad14..48a8b86a80 100644
> --- a/include/hw/ppc/pnv_sbe.h
> +++ b/include/hw/ppc/pnv_sbe.h
> @@ -20,7 +20,7 @@
> #ifndef PPC_PNV_SBE_H
> #define PPC_PNV_SBE_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/qdev-core.h"
>
> #define TYPE_PNV_SBE "pnv-sbe"
> diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h
> index 648388a599..9e607d7c45 100644
> --- a/include/hw/ppc/pnv_xscom.h
> +++ b/include/hw/ppc/pnv_xscom.h
> @@ -20,7 +20,7 @@
> #ifndef PPC_PNV_XSCOM_H
> #define PPC_PNV_XSCOM_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> typedef struct PnvXScomInterface PnvXScomInterface;
> typedef struct PnvChip PnvChip;
> diff --git a/include/hw/ppc/ppc4xx.h b/include/hw/ppc/ppc4xx.h
> index 1bd9b8821b..2e94b00673 100644
> --- a/include/hw/ppc/ppc4xx.h
> +++ b/include/hw/ppc/ppc4xx.h
> @@ -26,7 +26,7 @@
> #define PPC4XX_H
>
> #include "hw/ppc/ppc.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/sysbus.h"
>
> /*
> diff --git a/include/hw/ppc/vof.h b/include/hw/ppc/vof.h
> index d3f293da8b..2918aaab12 100644
> --- a/include/hw/ppc/vof.h
> +++ b/include/hw/ppc/vof.h
> @@ -8,7 +8,7 @@
>
> #include "qom/object.h"
> #include "exec/address-spaces.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/cpu-defs.h"
>
> typedef struct Vof {
> diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
> index e94d53405f..097fcdf00f 100644
> --- a/include/hw/ppc/xics.h
> +++ b/include/hw/ppc/xics.h
> @@ -28,7 +28,7 @@
> #ifndef XICS_H
> #define XICS_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/qdev-core.h"
> #include "qom/object.h"
>
> diff --git a/include/hw/register.h b/include/hw/register.h
> index 6a076cfcdf..a913c52aee 100644
> --- a/include/hw/register.h
> +++ b/include/hw/register.h
> @@ -12,7 +12,7 @@
> #define REGISTER_H
>
> #include "hw/qdev-core.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/registerfields.h"
> #include "qom/object.h"
>
> diff --git a/include/hw/remote/proxy-memory-listener.h b/include/hw/remote/proxy-memory-listener.h
> index c4f3efb928..ec516d8267 100644
> --- a/include/hw/remote/proxy-memory-listener.h
> +++ b/include/hw/remote/proxy-memory-listener.h
> @@ -9,7 +9,7 @@
> #ifndef PROXY_MEMORY_LISTENER_H
> #define PROXY_MEMORY_LISTENER_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "io/channel.h"
>
> typedef struct ProxyMemoryListener {
> diff --git a/include/hw/sh4/sh_intc.h b/include/hw/sh4/sh_intc.h
> index f62d5c5e13..94f183121e 100644
> --- a/include/hw/sh4/sh_intc.h
> +++ b/include/hw/sh4/sh_intc.h
> @@ -1,7 +1,7 @@
> #ifndef SH_INTC_H
> #define SH_INTC_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> typedef unsigned char intc_enum;
>
> diff --git a/include/hw/southbridge/ich9.h b/include/hw/southbridge/ich9.h
> index 6c60017024..1e231e89c9 100644
> --- a/include/hw/southbridge/ich9.h
> +++ b/include/hw/southbridge/ich9.h
> @@ -7,7 +7,7 @@
> #include "hw/pci/pci.h"
> #include "hw/pci/pci_device.h"
> #include "hw/rtc/mc146818rtc.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qemu/notify.h"
> #include "qom/object.h"
>
> diff --git a/include/hw/sysbus.h b/include/hw/sysbus.h
> index 81bbda10d3..7dc88aaa27 100644
> --- a/include/hw/sysbus.h
> +++ b/include/hw/sysbus.h
> @@ -4,7 +4,7 @@
> /* Devices attached directly to the main system bus. */
>
> #include "hw/qdev-core.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qom/object.h"
>
> #define QDEV_MAX_MMIO 32
> diff --git a/include/hw/timer/npcm7xx_timer.h b/include/hw/timer/npcm7xx_timer.h
> index d45c051b56..e287375dce 100644
> --- a/include/hw/timer/npcm7xx_timer.h
> +++ b/include/hw/timer/npcm7xx_timer.h
> @@ -16,7 +16,7 @@
> #ifndef NPCM7XX_TIMER_H
> #define NPCM7XX_TIMER_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/sysbus.h"
> #include "qemu/timer.h"
>
> diff --git a/include/hw/tricore/tricore.h b/include/hw/tricore/tricore.h
> index c19ed3f013..4ffc0fe1d6 100644
> --- a/include/hw/tricore/tricore.h
> +++ b/include/hw/tricore/tricore.h
> @@ -1,7 +1,7 @@
> #ifndef HW_TRICORE_H
> #define HW_TRICORE_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> struct tricore_boot_info {
> uint64_t ram_size;
> diff --git a/include/hw/usb.h b/include/hw/usb.h
> index e410693d0c..26a9f3ecde 100644
> --- a/include/hw/usb.h
> +++ b/include/hw/usb.h
> @@ -25,7 +25,7 @@
> * THE SOFTWARE.
> */
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/qdev-core.h"
> #include "qemu/iov.h"
> #include "qemu/queue.h"
> diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h
> index 04b123a6c9..f5b3f45a43 100644
> --- a/include/hw/vfio/vfio-common.h
> +++ b/include/hw/vfio/vfio-common.h
> @@ -21,7 +21,7 @@
> #ifndef HW_VFIO_VFIO_COMMON_H
> #define HW_VFIO_VFIO_COMMON_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qemu/queue.h"
> #include "qemu/notify.h"
> #include "ui/console.h"
> diff --git a/include/hw/vfio/vfio-container-base.h b/include/hw/vfio/vfio-container-base.h
> index 4cff9943ab..6aca02fb3d 100644
> --- a/include/hw/vfio/vfio-container-base.h
> +++ b/include/hw/vfio/vfio-container-base.h
> @@ -13,7 +13,7 @@
> #ifndef HW_VFIO_VFIO_CONTAINER_BASE_H
> #define HW_VFIO_VFIO_CONTAINER_BASE_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> typedef struct VFIODevice VFIODevice;
> typedef struct VFIOIOMMUClass VFIOIOMMUClass;
> diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-backend.h
> index 70c2e8ffee..d6df209a2f 100644
> --- a/include/hw/virtio/vhost-backend.h
> +++ b/include/hw/virtio/vhost-backend.h
> @@ -11,7 +11,7 @@
> #ifndef VHOST_BACKEND_H
> #define VHOST_BACKEND_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> typedef enum VhostBackendType {
> VHOST_BACKEND_TYPE_NONE = 0,
> diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h
> index a9469d50bc..bb4b58e115 100644
> --- a/include/hw/virtio/vhost.h
> +++ b/include/hw/virtio/vhost.h
> @@ -3,7 +3,7 @@
>
> #include "hw/virtio/vhost-backend.h"
> #include "hw/virtio/virtio.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> #define VHOST_F_DEVICE_IOTLB 63
> #define VHOST_USER_F_PROTOCOL_FEATURES 30
> diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
> index 6386910280..7e0c471ea4 100644
> --- a/include/hw/virtio/virtio.h
> +++ b/include/hw/virtio/virtio.h
> @@ -14,7 +14,7 @@
> #ifndef QEMU_VIRTIO_H
> #define QEMU_VIRTIO_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/qdev-core.h"
> #include "net/net.h"
> #include "migration/vmstate.h"
> diff --git a/include/hw/xen/xen-pvh-common.h b/include/hw/xen/xen-pvh-common.h
> index 17c5a58a5a..5db83d88ec 100644
> --- a/include/hw/xen/xen-pvh-common.h
> +++ b/include/hw/xen/xen-pvh-common.h
> @@ -9,7 +9,7 @@
> #ifndef XEN_PVH_COMMON_H__
> #define XEN_PVH_COMMON_H__
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qom/object.h"
> #include "hw/boards.h"
> #include "hw/pci-host/gpex.h"
> diff --git a/include/hw/xtensa/mx_pic.h b/include/hw/xtensa/mx_pic.h
> index 500424c8d3..cd316d86eb 100644
> --- a/include/hw/xtensa/mx_pic.h
> +++ b/include/hw/xtensa/mx_pic.h
> @@ -28,7 +28,7 @@
> #ifndef XTENSA_MX_PIC_H
> #define XTENSA_MX_PIC_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> struct XtensaMxPic;
> typedef struct XtensaMxPic XtensaMxPic;
> diff --git a/include/qemu/iova-tree.h b/include/qemu/iova-tree.h
> index 16d354a814..14e82a22d5 100644
> --- a/include/qemu/iova-tree.h
> +++ b/include/qemu/iova-tree.h
> @@ -23,7 +23,7 @@
> * for the thread safety issue.
> */
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/hwaddr.h"
>
> #define IOVA_OK (0)
> diff --git a/include/qemu/reserved-region.h b/include/qemu/reserved-region.h
> index 8e6f0a97e2..9026cf08fd 100644
> --- a/include/qemu/reserved-region.h
> +++ b/include/qemu/reserved-region.h
> @@ -20,7 +20,7 @@
> #ifndef QEMU_RESERVED_REGION_H
> #define QEMU_RESERVED_REGION_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> /*
> * Insert a new region into a sorted list of reserved regions. In case
> diff --git a/include/system/dma.h b/include/system/dma.h
> index 5a49a30628..0a2f0ad2dd 100644
> --- a/include/system/dma.h
> +++ b/include/system/dma.h
> @@ -10,7 +10,7 @@
> #ifndef DMA_H
> #define DMA_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/address-spaces.h"
> #include "block/block.h"
> #include "block/accounting.h"
> diff --git a/include/system/hostmem.h b/include/system/hostmem.h
> index 5c21ca55c0..17dd1cede5 100644
> --- a/include/system/hostmem.h
> +++ b/include/system/hostmem.h
> @@ -16,7 +16,7 @@
> #include "system/numa.h"
> #include "qapi/qapi-types-machine.h"
> #include "qom/object.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qemu/bitmap.h"
> #include "qemu/thread-context.h"
>
> diff --git a/include/system/kvm_int.h b/include/system/kvm_int.h
> index 4de6106869..756a3c0a25 100644
> --- a/include/system/kvm_int.h
> +++ b/include/system/kvm_int.h
> @@ -9,7 +9,7 @@
> #ifndef QEMU_KVM_INT_H
> #define QEMU_KVM_INT_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qapi/qapi-types-common.h"
> #include "qemu/accel.h"
> #include "qemu/queue.h"
> diff --git a/include/exec/memory.h b/include/system/memory.h
> similarity index 99%
> rename from include/exec/memory.h
> rename to include/system/memory.h
> index d09af58c97..649dbb006f 100644
> --- a/include/exec/memory.h
> +++ b/include/system/memory.h
> @@ -11,10 +11,8 @@
> *
> */
>
> -#ifndef MEMORY_H
> -#define MEMORY_H
> -
> -#ifndef CONFIG_USER_ONLY
> +#ifndef SYSTEM_MEMORY_H
> +#define SYSTEM_MEMORY_H
>
> #include "exec/cpu-common.h"
> #include "exec/hwaddr.h"
> @@ -3207,5 +3205,3 @@ void ram_block_add_cpr_blocker(RAMBlock *rb, Error **errp);
> void ram_block_del_cpr_blocker(RAMBlock *rb);
>
> #endif
> -
> -#endif
> diff --git a/include/system/vhost-user-backend.h b/include/system/vhost-user-backend.h
> index 327b0b84f1..5ed953cd53 100644
> --- a/include/system/vhost-user-backend.h
> +++ b/include/system/vhost-user-backend.h
> @@ -13,7 +13,7 @@
> #define QEMU_VHOST_USER_BACKEND_H
>
> #include "qom/object.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qemu/option.h"
> #include "qemu/bitmap.h"
> #include "hw/virtio/vhost.h"
> diff --git a/migration/rdma.h b/migration/rdma.h
> index f55f28bbed..4d3386b84a 100644
> --- a/migration/rdma.h
> +++ b/migration/rdma.h
> @@ -19,7 +19,7 @@
> #ifndef QEMU_MIGRATION_RDMA_H
> #define QEMU_MIGRATION_RDMA_H
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> void rdma_start_outgoing_migration(void *opaque, InetSocketAddress *host_port,
> Error **errp);
> diff --git a/rust/wrapper.h b/rust/wrapper.h
> index d927ad6799..3bc4a6c899 100644
> --- a/rust/wrapper.h
> +++ b/rust/wrapper.h
> @@ -52,7 +52,7 @@ typedef enum memory_order {
> #include "qemu-io.h"
> #include "system/system.h"
> #include "hw/sysbus.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "chardev/char-fe.h"
> #include "hw/clock.h"
> #include "hw/qdev-clock.h"
> diff --git a/target/loongarch/cpu.h b/target/loongarch/cpu.h
> index eae874c67b..1916716547 100644
> --- a/target/loongarch/cpu.h
> +++ b/target/loongarch/cpu.h
> @@ -14,7 +14,7 @@
> #include "hw/registerfields.h"
> #include "qemu/timer.h"
> #ifndef CONFIG_USER_ONLY
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #endif
> #include "cpu-csr.h"
> #include "cpu-qom.h"
> diff --git a/target/mips/cpu.h b/target/mips/cpu.h
> index f6877ece8b..9ef72a95d7 100644
> --- a/target/mips/cpu.h
> +++ b/target/mips/cpu.h
> @@ -4,7 +4,7 @@
> #include "cpu-qom.h"
> #include "exec/cpu-defs.h"
> #ifndef CONFIG_USER_ONLY
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #endif
> #include "fpu/softfloat-types.h"
> #include "hw/clock.h"
> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
> index f89568bfa3..0d47bb0d9b 100644
> --- a/accel/kvm/kvm-all.c
> +++ b/accel/kvm/kvm-all.c
> @@ -33,7 +33,7 @@
> #include "system/cpus.h"
> #include "system/accel-blocker.h"
> #include "qemu/bswap.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/ram_addr.h"
> #include "qemu/event_notifier.h"
> #include "qemu/main-loop.h"
> diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
> index 2817c9dbdd..6f0ea9067b 100644
> --- a/accel/tcg/cputlb.c
> +++ b/accel/tcg/cputlb.c
> @@ -22,7 +22,7 @@
> #include "accel/tcg/cpu-ops.h"
> #include "exec/exec-all.h"
> #include "exec/page-protection.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/cpu_ldst.h"
> #include "exec/cputlb.h"
> #include "exec/tb-flush.h"
> diff --git a/backends/tpm/tpm_util.c b/backends/tpm/tpm_util.c
> index f07a2656ce..f2d1739e33 100644
> --- a/backends/tpm/tpm_util.c
> +++ b/backends/tpm/tpm_util.c
> @@ -25,7 +25,7 @@
> #include "qapi/error.h"
> #include "qapi/visitor.h"
> #include "tpm_int.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/qdev-properties.h"
> #include "system/tpm_backend.h"
> #include "system/tpm_util.h"
> diff --git a/block/blkio.c b/block/blkio.c
> index 5f4fce2b1b..4142673984 100644
> --- a/block/blkio.c
> +++ b/block/blkio.c
> @@ -11,7 +11,7 @@
> #include "qemu/osdep.h"
> #include <blkio.h>
> #include "block/block_int.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/cpu-common.h" /* for qemu_ram_get_fd() */
> #include "qemu/defer-call.h"
> #include "qapi/error.h"
> @@ -19,7 +19,7 @@
> #include "qobject/qdict.h"
> #include "qemu/module.h"
> #include "system/block-backend.h"
> -#include "exec/memory.h" /* for ram_block_discard_disable() */
> +#include "system/memory.h" /* for ram_block_discard_disable() */
>
> #include "block/block-io.h"
>
> diff --git a/disas/disas-mon.c b/disas/disas-mon.c
> index 37bf16ac79..9c693618c2 100644
> --- a/disas/disas-mon.c
> +++ b/disas/disas-mon.c
> @@ -7,7 +7,7 @@
> #include "qemu/osdep.h"
> #include "disas-internal.h"
> #include "disas/disas.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/core/cpu.h"
> #include "monitor/monitor.h"
>
> diff --git a/hw/acpi/erst.c b/hw/acpi/erst.c
> index ec64f92893..5c4c1dc638 100644
> --- a/hw/acpi/erst.c
> +++ b/hw/acpi/erst.c
> @@ -12,7 +12,7 @@
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> #include "hw/qdev-core.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qom/object.h"
> #include "hw/pci/pci_device.h"
> #include "qom/object_interfaces.h"
> diff --git a/hw/avr/atmega.c b/hw/avr/atmega.c
> index f6844bf118..59c0160283 100644
> --- a/hw/avr/atmega.c
> +++ b/hw/avr/atmega.c
> @@ -12,7 +12,7 @@
> #include "qemu/module.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/address-spaces.h"
> #include "system/system.h"
> #include "hw/qdev-properties.h"
> diff --git a/hw/block/fdc-sysbus.c b/hw/block/fdc-sysbus.c
> index 381b492aec..4955e478cd 100644
> --- a/hw/block/fdc-sysbus.c
> +++ b/hw/block/fdc-sysbus.c
> @@ -26,7 +26,7 @@
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> #include "qom/object.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/sysbus.h"
> #include "hw/block/fdc.h"
> #include "migration/vmstate.h"
> diff --git a/hw/core/cpu-system.c b/hw/core/cpu-system.c
> index aed5076ec7..5ef8c24b5b 100644
> --- a/hw/core/cpu-system.c
> +++ b/hw/core/cpu-system.c
> @@ -22,7 +22,7 @@
> #include "qapi/error.h"
> #include "exec/address-spaces.h"
> #include "exec/cputlb.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/tb-flush.h"
> #include "exec/tswap.h"
> #include "hw/qdev-core.h"
> diff --git a/hw/core/loader-fit.c b/hw/core/loader-fit.c
> index 6eb66406b0..2dea485ae0 100644
> --- a/hw/core/loader-fit.c
> +++ b/hw/core/loader-fit.c
> @@ -20,7 +20,7 @@
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> #include "qemu/units.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/loader.h"
> #include "hw/loader-fit.h"
> #include "qemu/cutils.h"
> diff --git a/hw/core/loader.c b/hw/core/loader.c
> index 332b879a0b..f96cc2c0a5 100644
> --- a/hw/core/loader.c
> +++ b/hw/core/loader.c
> @@ -58,7 +58,7 @@
> #include "uboot_image.h"
> #include "hw/loader.h"
> #include "hw/nvram/fw_cfg.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/boards.h"
> #include "qemu/cutils.h"
> #include "system/runstate.h"
> diff --git a/hw/display/edid-region.c b/hw/display/edid-region.c
> index 675429dc18..f1596fba9a 100644
> --- a/hw/display/edid-region.c
> +++ b/hw/display/edid-region.c
> @@ -1,5 +1,5 @@
> #include "qemu/osdep.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/display/edid.h"
>
> static uint64_t edid_region_read(void *ptr, hwaddr addr, unsigned size)
> diff --git a/hw/hyperv/hyperv.c b/hw/hyperv/hyperv.c
> index 831e04f214..382c62d668 100644
> --- a/hw/hyperv/hyperv.c
> +++ b/hw/hyperv/hyperv.c
> @@ -12,7 +12,7 @@
> #include "qemu/module.h"
> #include "qapi/error.h"
> #include "exec/address-spaces.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "system/kvm.h"
> #include "qemu/bitops.h"
> #include "qemu/error-report.h"
> diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c
> index 0cc2919bb8..7bd08067a7 100644
> --- a/hw/i386/acpi-common.c
> +++ b/hw/i386/acpi-common.c
> @@ -23,7 +23,7 @@
> #include "qemu/osdep.h"
> #include "qapi/error.h"
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/acpi/acpi.h"
> #include "hw/acpi/aml-build.h"
> #include "hw/acpi/utils.h"
> diff --git a/hw/i386/acpi-microvm.c b/hw/i386/acpi-microvm.c
> index 279da6b4aa..bc6571778c 100644
> --- a/hw/i386/acpi-microvm.c
> +++ b/hw/i386/acpi-microvm.c
> @@ -24,7 +24,7 @@
> #include "qemu/cutils.h"
> #include "qapi/error.h"
>
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/acpi/acpi.h"
> #include "hw/acpi/acpi_aml_interface.h"
> #include "hw/acpi/aml-build.h"
> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
> index 6c91e2d292..e9dbbe086a 100644
> --- a/hw/i386/pc_piix.c
> +++ b/hw/i386/pc_piix.c
> @@ -47,7 +47,7 @@
> #include "hw/i386/kvm/clock.h"
> #include "hw/sysbus.h"
> #include "hw/i2c/smbus_eeprom.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/acpi/acpi.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> diff --git a/hw/intc/mips_gic.c b/hw/intc/mips_gic.c
> index 5e3cbeabec..12d3908938 100644
> --- a/hw/intc/mips_gic.c
> +++ b/hw/intc/mips_gic.c
> @@ -14,7 +14,7 @@
> #include "qemu/module.h"
> #include "qapi/error.h"
> #include "hw/sysbus.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "system/kvm.h"
> #include "system/reset.h"
> #include "kvm_mips.h"
> diff --git a/hw/intc/ompic.c b/hw/intc/ompic.c
> index 42af4567c6..169baf2ded 100644
> --- a/hw/intc/ompic.c
> +++ b/hw/intc/ompic.c
> @@ -13,7 +13,7 @@
> #include "hw/qdev-properties.h"
> #include "hw/sysbus.h"
> #include "migration/vmstate.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qom/object.h"
>
> #define TYPE_OR1K_OMPIC "or1k-ompic"
> diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c
> index b482c5f3af..b1923c8c3e 100644
> --- a/hw/net/ne2000.c
> +++ b/hw/net/ne2000.c
> @@ -25,7 +25,7 @@
> #include "qemu/osdep.h"
> #include "net/eth.h"
> #include "qemu/module.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/irq.h"
> #include "migration/vmstate.h"
> #include "ne2000.h"
> diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c
> index 0a91a8ae6c..4931ea24f6 100644
> --- a/hw/pci-bridge/pci_bridge_dev.c
> +++ b/hw/pci-bridge/pci_bridge_dev.c
> @@ -28,7 +28,7 @@
> #include "hw/pci/shpc.h"
> #include "hw/pci/slotid_cap.h"
> #include "hw/qdev-properties.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/pci/pci_bus.h"
> #include "hw/hotplug.h"
> #include "qom/object.h"
> diff --git a/hw/pci-host/remote.c b/hw/pci-host/remote.c
> index bfb25ef6af..be077d075e 100644
> --- a/hw/pci-host/remote.c
> +++ b/hw/pci-host/remote.c
> @@ -28,7 +28,7 @@
> #include "hw/pci/pcie_host.h"
> #include "hw/qdev-properties.h"
> #include "hw/pci-host/remote.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> static const char *remote_pcihost_root_bus_path(PCIHostState *host_bridge,
> PCIBus *rootbus)
> diff --git a/hw/ppc/pnv_homer.c b/hw/ppc/pnv_homer.c
> index a1d83c8149..574ee80119 100644
> --- a/hw/ppc/pnv_homer.c
> +++ b/hw/ppc/pnv_homer.c
> @@ -20,7 +20,7 @@
> #include "qemu/log.h"
> #include "qapi/error.h"
> #include "exec/hwaddr.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "system/cpus.h"
> #include "hw/qdev-core.h"
> #include "hw/qdev-properties.h"
> diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c
> index 3ecae6a950..567d9e78ac 100644
> --- a/hw/ppc/sam460ex.c
> +++ b/hw/ppc/sam460ex.c
> @@ -24,7 +24,7 @@
> #include "exec/page-protection.h"
> #include "hw/loader.h"
> #include "elf.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "ppc440.h"
> #include "hw/pci-host/ppc4xx.h"
> #include "hw/block/flash.h"
> diff --git a/hw/remote/iommu.c b/hw/remote/iommu.c
> index 7c56aad0fc..ec845d1f58 100644
> --- a/hw/remote/iommu.c
> +++ b/hw/remote/iommu.c
> @@ -13,7 +13,7 @@
> #include "hw/remote/iommu.h"
> #include "hw/pci/pci_bus.h"
> #include "hw/pci/pci.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/address-spaces.h"
> #include "trace.h"
>
> diff --git a/hw/remote/machine.c b/hw/remote/machine.c
> index fdc6c441bb..d4616025e8 100644
> --- a/hw/remote/machine.c
> +++ b/hw/remote/machine.c
> @@ -16,7 +16,7 @@
> #include "qemu/osdep.h"
>
> #include "hw/remote/machine.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qapi/error.h"
> #include "hw/pci/pci_host.h"
> #include "hw/remote/iohub.h"
> diff --git a/hw/remote/proxy-memory-listener.c b/hw/remote/proxy-memory-listener.c
> index a926f61ebe..ce7f5b9bfb 100644
> --- a/hw/remote/proxy-memory-listener.c
> +++ b/hw/remote/proxy-memory-listener.c
> @@ -10,7 +10,7 @@
>
> #include "qemu/int128.h"
> #include "qemu/range.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/cpu-common.h"
> #include "exec/ram_addr.h"
> #include "qapi/error.h"
> diff --git a/hw/remote/vfio-user-obj.c b/hw/remote/vfio-user-obj.c
> index 6e51a92856..9bdd0a465b 100644
> --- a/hw/remote/vfio-user-obj.c
> +++ b/hw/remote/vfio-user-obj.c
> @@ -57,7 +57,7 @@
> #include "hw/qdev-core.h"
> #include "hw/pci/pci.h"
> #include "qemu/timer.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "hw/pci/msi.h"
> #include "hw/pci/msix.h"
> #include "hw/remote/vfio-user-obj.h"
> diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c
> index 8cdeb6cb7f..b4e003c19c 100644
> --- a/hw/s390x/s390-pci-inst.c
> +++ b/hw/s390x/s390-pci-inst.c
> @@ -13,7 +13,7 @@
>
> #include "qemu/osdep.h"
> #include "exec/memop.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qemu/error-report.h"
> #include "system/hw_accel.h"
> #include "hw/boards.h"
> diff --git a/hw/timer/sh_timer.c b/hw/timer/sh_timer.c
> index 7788939766..d4fa32c9d6 100644
> --- a/hw/timer/sh_timer.c
> +++ b/hw/timer/sh_timer.c
> @@ -9,7 +9,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qemu/log.h"
> #include "hw/irq.h"
> #include "hw/sh4/sh.h"
> diff --git a/hw/vfio/common.c b/hw/vfio/common.c
> index 7a4010ef4e..cdcec21c08 100644
> --- a/hw/vfio/common.c
> +++ b/hw/vfio/common.c
> @@ -28,7 +28,7 @@
> #include "hw/vfio/vfio-common.h"
> #include "hw/vfio/pci.h"
> #include "exec/address-spaces.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/ram_addr.h"
> #include "hw/hw.h"
> #include "qemu/error-report.h"
> diff --git a/hw/vfio/container.c b/hw/vfio/container.c
> index 7c57bdd27b..1d1c5f9a77 100644
> --- a/hw/vfio/container.c
> +++ b/hw/vfio/container.c
> @@ -24,7 +24,7 @@
>
> #include "hw/vfio/vfio-common.h"
> #include "exec/address-spaces.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/ram_addr.h"
> #include "qemu/error-report.h"
> #include "qemu/range.h"
> diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
> index 67bc57409c..96c6bf5654 100644
> --- a/hw/vfio/platform.c
> +++ b/hw/vfio/platform.c
> @@ -28,7 +28,7 @@
> #include "qemu/main-loop.h"
> #include "qemu/module.h"
> #include "qemu/range.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/address-spaces.h"
> #include "qemu/queue.h"
> #include "hw/sysbus.h"
> diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c
> index 1cea29c66d..49d17e7bb2 100644
> --- a/hw/xtensa/sim.c
> +++ b/hw/xtensa/sim.c
> @@ -32,7 +32,7 @@
> #include "hw/boards.h"
> #include "hw/loader.h"
> #include "elf.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qemu/error-report.h"
> #include "xtensa_memory.h"
> #include "xtensa_sim.h"
> diff --git a/hw/xtensa/virt.c b/hw/xtensa/virt.c
> index b08404fc17..b10866ccd8 100644
> --- a/hw/xtensa/virt.c
> +++ b/hw/xtensa/virt.c
> @@ -33,7 +33,7 @@
> #include "hw/pci-host/gpex.h"
> #include "net/net.h"
> #include "elf.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qemu/error-report.h"
> #include "xtensa_memory.h"
> #include "xtensa_sim.h"
> diff --git a/hw/xtensa/xtensa_memory.c b/hw/xtensa/xtensa_memory.c
> index 2c1095f017..13a6077d86 100644
> --- a/hw/xtensa/xtensa_memory.c
> +++ b/hw/xtensa/xtensa_memory.c
> @@ -27,7 +27,7 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qemu/error-report.h"
> #include "xtensa_memory.h"
>
> diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
> index 3f3677f1c9..3bd0ef8268 100644
> --- a/hw/xtensa/xtfpga.c
> +++ b/hw/xtensa/xtfpga.c
> @@ -34,7 +34,7 @@
> #include "hw/loader.h"
> #include "hw/qdev-properties.h"
> #include "elf.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/tswap.h"
> #include "hw/char/serial-mm.h"
> #include "net/net.h"
> diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c
> index 4cd14779d6..09caf92f87 100644
> --- a/migration/dirtyrate.c
> +++ b/migration/dirtyrate.c
> @@ -27,7 +27,7 @@
> #include "qobject/qdict.h"
> #include "system/kvm.h"
> #include "system/runstate.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qemu/xxhash.h"
> #include "migration.h"
>
> diff --git a/migration/rdma.c b/migration/rdma.c
> index 76fb034923..d9603ab603 100644
> --- a/migration/rdma.c
> +++ b/migration/rdma.c
> @@ -30,7 +30,7 @@
> #include "qemu/sockets.h"
> #include "qemu/bitmap.h"
> #include "qemu/coroutine.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include <sys/socket.h>
> #include <netdb.h>
> #include <arpa/inet.h>
> diff --git a/migration/savevm.c b/migration/savevm.c
> index ce158c3512..c33200a33f 100644
> --- a/migration/savevm.c
> +++ b/migration/savevm.c
> @@ -48,7 +48,7 @@
> #include "qapi/qapi-builtin-visit.h"
> #include "qemu/error-report.h"
> #include "system/cpus.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/target_page.h"
> #include "trace.h"
> #include "qemu/iov.h"
> diff --git a/monitor/hmp-cmds-target.c b/monitor/hmp-cmds-target.c
> index 239c2a61a4..6654d31406 100644
> --- a/monitor/hmp-cmds-target.c
> +++ b/monitor/hmp-cmds-target.c
> @@ -25,7 +25,7 @@
> #include "qemu/osdep.h"
> #include "disas/disas.h"
> #include "exec/address-spaces.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "monitor/hmp-target.h"
> #include "monitor/monitor-internal.h"
> #include "qapi/error.h"
> diff --git a/stubs/ram-block.c b/stubs/ram-block.c
> index 108197683b..e88fab31a5 100644
> --- a/stubs/ram-block.c
> +++ b/stubs/ram-block.c
> @@ -1,7 +1,7 @@
> #include "qemu/osdep.h"
> #include "exec/ramlist.h"
> #include "exec/cpu-common.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
>
> void *qemu_ram_get_host_addr(RAMBlock *rb)
> {
> diff --git a/system/dirtylimit.c b/system/dirtylimit.c
> index 7dedef8dd4..30cd09f3d1 100644
> --- a/system/dirtylimit.c
> +++ b/system/dirtylimit.c
> @@ -19,7 +19,7 @@
> #include "system/dirtylimit.h"
> #include "monitor/hmp.h"
> #include "monitor/monitor.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/target_page.h"
> #include "hw/boards.h"
> #include "system/kvm.h"
> diff --git a/system/ioport.c b/system/ioport.c
> index 55c2a75239..5f8718486c 100644
> --- a/system/ioport.c
> +++ b/system/ioport.c
> @@ -28,7 +28,7 @@
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "exec/ioport.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/address-spaces.h"
> #include "trace.h"
>
> diff --git a/system/memory.c b/system/memory.c
> index 4c829793a0..6d6b33b366 100644
> --- a/system/memory.c
> +++ b/system/memory.c
> @@ -16,7 +16,7 @@
> #include "qemu/osdep.h"
> #include "qemu/log.h"
> #include "qapi/error.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qapi/visitor.h"
> #include "qemu/bitops.h"
> #include "qemu/error-report.h"
> diff --git a/system/memory_mapping.c b/system/memory_mapping.c
> index 37d3325f77..8538a8241e 100644
> --- a/system/memory_mapping.c
> +++ b/system/memory_mapping.c
> @@ -16,7 +16,7 @@
> #include "qapi/error.h"
>
> #include "system/memory_mapping.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/address-spaces.h"
> #include "hw/core/cpu.h"
>
> diff --git a/system/physmem.c b/system/physmem.c
> index e97de3ef65..be92969a4a 100644
> --- a/system/physmem.c
> +++ b/system/physmem.c
> @@ -50,7 +50,7 @@
> #include "qemu/log.h"
> #include "qemu/memalign.h"
> #include "qemu/memfd.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/ioport.h"
> #include "system/dma.h"
> #include "system/hostmem.h"
> diff --git a/system/qtest.c b/system/qtest.c
> index 12152efbcd..5407289154 100644
> --- a/system/qtest.c
> +++ b/system/qtest.c
> @@ -17,7 +17,7 @@
> #include "system/runstate.h"
> #include "chardev/char-fe.h"
> #include "exec/ioport.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/tswap.h"
> #include "hw/qdev-core.h"
> #include "hw/irq.h"
> diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c
> index 7663b62d01..ec6a0a8b66 100644
> --- a/target/xtensa/cpu.c
> +++ b/target/xtensa/cpu.c
> @@ -36,7 +36,7 @@
> #include "migration/vmstate.h"
> #include "hw/qdev-clock.h"
> #ifndef CONFIG_USER_ONLY
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #endif
>
>
> diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c
> index d107a496da..239be9372d 100644
> --- a/tests/qtest/fuzz/generic_fuzz.c
> +++ b/tests/qtest/fuzz/generic_fuzz.c
> @@ -20,7 +20,7 @@
> #include "tests/qtest/libqos/pci-pc.h"
> #include "fuzz.h"
> #include "string.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "exec/ramblock.h"
> #include "hw/qdev-core.h"
> #include "hw/pci/pci.h"
> diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c
> index d3839bf999..9afe8bf6d8 100644
> --- a/tests/qtest/fuzz/qos_fuzz.c
> +++ b/tests/qtest/fuzz/qos_fuzz.c
> @@ -19,7 +19,7 @@
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qemu/main-loop.h"
>
> #include "tests/qtest/libqtest.h"
> diff --git a/tests/unit/test-resv-mem.c b/tests/unit/test-resv-mem.c
> index cd8f7318cc..4de2d042d1 100644
> --- a/tests/unit/test-resv-mem.c
> +++ b/tests/unit/test-resv-mem.c
> @@ -10,7 +10,7 @@
>
> #include "qemu/osdep.h"
> #include "qemu/range.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qemu/reserved-region.h"
>
> #define DEBUG 0
> diff --git a/ui/console.c b/ui/console.c
> index 6456e8dd90..6cd122cf40 100644
> --- a/ui/console.c
> +++ b/ui/console.c
> @@ -35,7 +35,7 @@
> #include "qemu/option.h"
> #include "chardev/char.h"
> #include "trace.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "qom/object.h"
> #include "qemu/memfd.h"
>
> diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c
> index f8bab46c68..fdff042ab4 100644
> --- a/util/vfio-helpers.c
> +++ b/util/vfio-helpers.c
> @@ -16,7 +16,7 @@
> #include "qapi/error.h"
> #include "exec/ramlist.h"
> #include "exec/cpu-common.h"
> -#include "exec/memory.h"
> +#include "system/memory.h"
> #include "trace.h"
> #include "qemu/error-report.h"
> #include "standard-headers/linux/pci_regs.h"
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 0e5db7a574..b5f1e81771 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3109,7 +3109,7 @@ R: Philippe Mathieu-Daudé <philmd@linaro.org>
> S: Supported
> F: include/exec/ioport.h
> F: include/exec/memop.h
> -F: include/exec/memory.h
> +F: include/system/memory.h
> F: include/exec/ram_addr.h
> F: include/exec/ramblock.h
> F: include/system/memory_mapping.h
> diff --git a/docs/devel/memory.rst b/docs/devel/memory.rst
> index 69c5e3f914..57fb2aec76 100644
> --- a/docs/devel/memory.rst
> +++ b/docs/devel/memory.rst
> @@ -369,4 +369,4 @@ callbacks are called:
> API Reference
> -------------
>
> -.. kernel-doc:: include/exec/memory.h
> +.. kernel-doc:: include/system/memory.h
> diff --git a/scripts/analyze-inclusions b/scripts/analyze-inclusions
> index b6280f25c8..d2c566667d 100644
> --- a/scripts/analyze-inclusions
> +++ b/scripts/analyze-inclusions
> @@ -53,7 +53,7 @@ echo $(grep_include -F 'trace/generated-tracers.h') files include generated-trac
> echo $(grep_include -F 'qapi/error.h') files include qapi/error.h
> echo $(grep_include -F 'qom/object.h') files include qom/object.h
> echo $(grep_include -F 'block/aio.h') files include block/aio.h
> -echo $(grep_include -F 'exec/memory.h') files include exec/memory.h
> +echo $(grep_include -F 'system/memory.h') files include system/memory.h
> echo $(grep_include -F 'fpu/softfloat.h') files include fpu/softfloat.h
> echo $(grep_include -F 'qemu/bswap.h') files include qemu/bswap.h
> echo
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 15/37] include/system: Move exec/address-spaces.h to system/address-spaces.h
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (13 preceding siblings ...)
2025-03-13 3:44 ` [PATCH 14/37] include/system: Move exec/memory.h to system/memory.h Richard Henderson
@ 2025-03-13 3:44 ` Richard Henderson
2025-03-13 10:01 ` Philippe Mathieu-Daudé
2025-03-13 17:34 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 16/37] include/system: Move exec/ioport.h to system/ioport.h Richard Henderson
` (23 subsequent siblings)
38 siblings, 2 replies; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
Convert the existing includes with sed.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
hw/net/i82596.h | 2 +-
hw/s390x/ipl.h | 2 +-
include/hw/misc/lasi.h | 2 +-
include/hw/nubus/nubus.h | 2 +-
include/hw/ppc/vof.h | 2 +-
include/hw/tricore/triboard.h | 2 +-
include/{exec => system}/address-spaces.h | 8 ++------
include/system/dma.h | 2 +-
rust/wrapper.h | 2 +-
target/i386/hvf/vmx.h | 2 +-
accel/hvf/hvf-accel-ops.c | 2 +-
hw/acpi/erst.c | 2 +-
hw/arm/aspeed_ast10x0.c | 2 +-
hw/arm/bananapi_m2u.c | 2 +-
hw/arm/collie.c | 2 +-
hw/arm/exynos4_boards.c | 2 +-
hw/arm/fsl-imx31.c | 2 +-
hw/arm/fsl-imx8mp.c | 2 +-
hw/arm/imx8mp-evk.c | 2 +-
hw/arm/integratorcp.c | 2 +-
hw/arm/kzm.c | 2 +-
hw/arm/microbit.c | 2 +-
hw/arm/mps2-tz.c | 2 +-
hw/arm/mps2.c | 2 +-
hw/arm/mps3r.c | 2 +-
hw/arm/msf2-soc.c | 2 +-
hw/arm/msf2-som.c | 2 +-
hw/arm/musca.c | 2 +-
hw/arm/omap1.c | 2 +-
hw/arm/omap_sx1.c | 2 +-
hw/arm/orangepi.c | 2 +-
hw/arm/stellaris.c | 2 +-
hw/arm/stm32f100_soc.c | 2 +-
hw/arm/stm32f205_soc.c | 2 +-
hw/arm/stm32f405_soc.c | 2 +-
hw/arm/stm32l4x5_soc.c | 2 +-
hw/avr/atmega.c | 2 +-
hw/char/goldfish_tty.c | 2 +-
hw/char/omap_uart.c | 2 +-
hw/char/riscv_htif.c | 2 +-
hw/core/cpu-system.c | 2 +-
hw/core/null-machine.c | 2 +-
hw/core/sysbus.c | 2 +-
hw/dma/rc4030.c | 2 +-
hw/hyperv/hv-balloon.c | 2 +-
hw/hyperv/hyperv.c | 2 +-
hw/i386/kvm/xen_evtchn.c | 2 +-
hw/i386/kvm/xen_gnttab.c | 2 +-
hw/i386/kvm/xen_overlay.c | 2 +-
hw/i386/sgx-epc.c | 2 +-
hw/i386/sgx.c | 2 +-
hw/i386/vapic.c | 2 +-
hw/ide/ahci-sysbus.c | 2 +-
hw/input/lasips2.c | 2 +-
hw/intc/loongarch_extioi.c | 2 +-
hw/intc/riscv_aplic.c | 2 +-
hw/intc/riscv_imsic.c | 2 +-
hw/loongarch/virt.c | 2 +-
hw/mem/memory-device.c | 2 +-
hw/microblaze/petalogix_ml605_mmu.c | 2 +-
hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +-
hw/microblaze/xlnx-zynqmp-pmu.c | 2 +-
hw/mips/mipssim.c | 2 +-
hw/misc/allwinner-h3-dramc.c | 2 +-
hw/misc/allwinner-r40-dramc.c | 2 +-
hw/misc/ivshmem-flat.c | 2 +-
hw/misc/mac_via.c | 2 +-
hw/net/i82596.c | 2 +-
hw/nvram/fw_cfg.c | 2 +-
hw/openrisc/openrisc_sim.c | 2 +-
hw/openrisc/virt.c | 2 +-
hw/pci-host/mv64361.c | 2 +-
hw/ppc/pegasos2.c | 2 +-
hw/ppc/pnv_psi.c | 2 +-
hw/ppc/ppc405_uc.c | 2 +-
hw/ppc/ppc4xx_sdram.c | 2 +-
hw/ppc/prep_systemio.c | 2 +-
hw/ppc/rs6000_mc.c | 2 +-
hw/ppc/spapr_ovec.c | 2 +-
hw/ppc/vof.c | 2 +-
hw/remote/iommu.c | 2 +-
hw/riscv/microblaze-v-generic.c | 2 +-
hw/riscv/opentitan.c | 2 +-
hw/riscv/shakti_c.c | 2 +-
hw/s390x/css.c | 2 +-
hw/s390x/s390-skeys.c | 2 +-
hw/s390x/virtio-ccw.c | 2 +-
hw/sparc/sun4m_iommu.c | 2 +-
hw/sparc64/sun4u_iommu.c | 2 +-
hw/timer/hpet.c | 2 +-
hw/tpm/tpm_crb.c | 2 +-
hw/vfio/ap.c | 2 +-
hw/vfio/ccw.c | 2 +-
hw/vfio/common.c | 2 +-
hw/vfio/container.c | 2 +-
hw/vfio/platform.c | 2 +-
hw/vfio/spapr.c | 2 +-
hw/virtio/vhost-vdpa.c | 2 +-
hw/virtio/virtio-balloon.c | 2 +-
hw/virtio/virtio-bus.c | 2 +-
monitor/hmp-cmds-target.c | 2 +-
monitor/hmp-cmds.c | 2 +-
system/ioport.c | 2 +-
system/memory.c | 2 +-
system/memory_mapping.c | 2 +-
target/arm/hvf/hvf.c | 2 +-
target/arm/kvm.c | 2 +-
target/avr/helper.c | 2 +-
target/i386/cpu-apic.c | 2 +-
target/i386/cpu.c | 2 +-
target/i386/kvm/xen-emu.c | 2 +-
target/i386/nvmm/nvmm-all.c | 2 +-
target/i386/sev.c | 2 +-
target/i386/tcg/system/misc_helper.c | 2 +-
target/i386/tcg/system/tcg-cpu.c | 2 +-
target/i386/whpx/whpx-all.c | 2 +-
target/loongarch/kvm/kvm.c | 2 +-
target/riscv/kvm/kvm-cpu.c | 2 +-
target/s390x/mmu_helper.c | 2 +-
target/s390x/sigp.c | 2 +-
target/s390x/tcg/excp_helper.c | 2 +-
target/xtensa/dbg_helper.c | 2 +-
hw/display/apple-gfx.m | 2 +-
123 files changed, 124 insertions(+), 128 deletions(-)
rename include/{exec => system}/address-spaces.h (89%)
diff --git a/hw/net/i82596.h b/hw/net/i82596.h
index 4bdfcaf856..dc1fa1a1dc 100644
--- a/hw/net/i82596.h
+++ b/hw/net/i82596.h
@@ -4,7 +4,7 @@
#define I82596_IOPORT_SIZE 0x20
#include "system/memory.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#define PORT_RESET 0x00 /* reset 82596 */
#define PORT_SELFTEST 0x01 /* selftest */
diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h
index 8e3882d506..c6ecb3433c 100644
--- a/hw/s390x/ipl.h
+++ b/hw/s390x/ipl.h
@@ -14,7 +14,7 @@
#define HW_S390_IPL_H
#include "cpu.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/qdev-core.h"
#include "hw/s390x/ipl/qipl.h"
#include "qom/object.h"
diff --git a/include/hw/misc/lasi.h b/include/hw/misc/lasi.h
index f01c0f680a..0bdfb11b50 100644
--- a/include/hw/misc/lasi.h
+++ b/include/hw/misc/lasi.h
@@ -12,7 +12,7 @@
#ifndef LASI_H
#define LASI_H
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/pci/pci_host.h"
#include "hw/boards.h"
diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h
index fee79b71d1..7825840dca 100644
--- a/include/hw/nubus/nubus.h
+++ b/include/hw/nubus/nubus.h
@@ -11,7 +11,7 @@
#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qom/object.h"
#include "qemu/units.h"
diff --git a/include/hw/ppc/vof.h b/include/hw/ppc/vof.h
index 2918aaab12..3a0fbffe54 100644
--- a/include/hw/ppc/vof.h
+++ b/include/hw/ppc/vof.h
@@ -7,7 +7,7 @@
#define HW_VOF_H
#include "qom/object.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/memory.h"
#include "exec/cpu-defs.h"
diff --git a/include/hw/tricore/triboard.h b/include/hw/tricore/triboard.h
index 8250470643..ca49a0c752 100644
--- a/include/hw/tricore/triboard.h
+++ b/include/hw/tricore/triboard.h
@@ -21,7 +21,7 @@
#include "qapi/error.h"
#include "hw/boards.h"
#include "system/system.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qom/object.h"
#include "hw/tricore/tc27x_soc.h"
diff --git a/include/exec/address-spaces.h b/include/system/address-spaces.h
similarity index 89%
rename from include/exec/address-spaces.h
rename to include/system/address-spaces.h
index 0d0aa61d68..72d17afb0f 100644
--- a/include/exec/address-spaces.h
+++ b/include/system/address-spaces.h
@@ -11,16 +11,14 @@
*
*/
-#ifndef EXEC_ADDRESS_SPACES_H
-#define EXEC_ADDRESS_SPACES_H
+#ifndef SYSTEM_ADDRESS_SPACES_H
+#define SYSTEM_ADDRESS_SPACES_H
/*
* Internal interfaces between memory.c/exec.c/vl.c. Do not #include unless
* you're one of them.
*/
-#ifndef CONFIG_USER_ONLY
-
/* Get the root memory region. This interface should only be used temporarily
* until a proper bus interface is available.
*/
@@ -35,5 +33,3 @@ extern AddressSpace address_space_memory;
extern AddressSpace address_space_io;
#endif
-
-#endif
diff --git a/include/system/dma.h b/include/system/dma.h
index 0a2f0ad2dd..7178d4f610 100644
--- a/include/system/dma.h
+++ b/include/system/dma.h
@@ -11,7 +11,7 @@
#define DMA_H
#include "system/memory.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "block/block.h"
#include "block/accounting.h"
diff --git a/rust/wrapper.h b/rust/wrapper.h
index 3bc4a6c899..f80dbab24f 100644
--- a/rust/wrapper.h
+++ b/rust/wrapper.h
@@ -64,4 +64,4 @@ typedef enum memory_order {
#include "chardev/char-serial.h"
#include "exec/memattrs.h"
#include "qemu/timer.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
diff --git a/target/i386/hvf/vmx.h b/target/i386/hvf/vmx.h
index 80ce26279b..87a478f7fd 100644
--- a/target/i386/hvf/vmx.h
+++ b/target/i386/hvf/vmx.h
@@ -33,7 +33,7 @@
#include "system/hvf.h"
#include "system/hvf_int.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
static inline uint64_t rreg(hv_vcpuid_t vcpu, hv_x86_reg_t reg)
{
diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c
index 12fc30c276..601c3bc0ac 100644
--- a/accel/hvf/hvf-accel-ops.c
+++ b/accel/hvf/hvf-accel-ops.c
@@ -50,7 +50,7 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "exec/exec-all.h"
#include "gdbstub/enums.h"
#include "hw/boards.h"
diff --git a/hw/acpi/erst.c b/hw/acpi/erst.c
index 5c4c1dc638..2e49b551f2 100644
--- a/hw/acpi/erst.c
+++ b/hw/acpi/erst.c
@@ -23,7 +23,7 @@
#include "hw/acpi/acpi-defs.h"
#include "hw/acpi/aml-build.h"
#include "hw/acpi/bios-linker-loader.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/hostmem.h"
#include "hw/acpi/erst.h"
#include "trace.h"
diff --git a/hw/arm/aspeed_ast10x0.c b/hw/arm/aspeed_ast10x0.c
index ec329f4991..21ffab10f3 100644
--- a/hw/arm/aspeed_ast10x0.c
+++ b/hw/arm/aspeed_ast10x0.c
@@ -11,7 +11,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/system.h"
#include "hw/qdev-clock.h"
#include "hw/misc/unimp.h"
diff --git a/hw/arm/bananapi_m2u.c b/hw/arm/bananapi_m2u.c
index 4d84d10d24..b750a575f7 100644
--- a/hw/arm/bananapi_m2u.c
+++ b/hw/arm/bananapi_m2u.c
@@ -19,7 +19,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "hw/boards.h"
diff --git a/hw/arm/collie.c b/hw/arm/collie.c
index eaa5c52d45..e83aee58c6 100644
--- a/hw/arm/collie.c
+++ b/hw/arm/collie.c
@@ -16,7 +16,7 @@
#include "strongarm.h"
#include "hw/arm/boot.h"
#include "hw/block/flash.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qom/object.h"
#include "qemu/error-report.h"
diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index 43dc89d902..2d8f2d7326 100644
--- a/hw/arm/exynos4_boards.c
+++ b/hw/arm/exynos4_boards.c
@@ -28,7 +28,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/arm/boot.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/arm/exynos4210.h"
#include "hw/net/lan9118.h"
#include "hw/qdev-properties.h"
diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c
index 9de0f2148f..2a8ffb15f7 100644
--- a/hw/arm/fsl-imx31.c
+++ b/hw/arm/fsl-imx31.c
@@ -23,7 +23,7 @@
#include "qapi/error.h"
#include "hw/arm/fsl-imx31.h"
#include "system/system.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/qdev-properties.h"
#include "chardev/char.h"
#include "target/arm/cpu-qom.h"
diff --git a/hw/arm/fsl-imx8mp.c b/hw/arm/fsl-imx8mp.c
index 1ea98e1463..0b19e071cf 100644
--- a/hw/arm/fsl-imx8mp.c
+++ b/hw/arm/fsl-imx8mp.c
@@ -9,7 +9,7 @@
*/
#include "qemu/osdep.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/arm/bsa.h"
#include "hw/arm/fsl-imx8mp.h"
#include "hw/intc/arm_gicv3.h"
diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c
index e1a7892fd7..6e64ec4ea5 100644
--- a/hw/arm/imx8mp-evk.c
+++ b/hw/arm/imx8mp-evk.c
@@ -7,7 +7,7 @@
*/
#include "qemu/osdep.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/arm/boot.h"
#include "hw/arm/fsl-imx8mp.h"
#include "hw/boards.h"
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index 8aa2e6e98e..ac0c6c6096 100644
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -16,7 +16,7 @@
#include "hw/misc/arm_integrator_debug.h"
#include "hw/net/smc91c111.h"
#include "net/net.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/runstate.h"
#include "system/system.h"
#include "qemu/log.h"
diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
index 08d2b3025c..362c145409 100644
--- a/hw/arm/kzm.c
+++ b/hw/arm/kzm.c
@@ -19,7 +19,7 @@
#include "hw/arm/boot.h"
#include "hw/boards.h"
#include "qemu/error-report.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "net/net.h"
#include "hw/net/lan9118.h"
#include "hw/char/serial-mm.h"
diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c
index 3f56fb45ce..ade363daaa 100644
--- a/hw/arm/microbit.c
+++ b/hw/arm/microbit.c
@@ -13,7 +13,7 @@
#include "hw/boards.h"
#include "hw/arm/boot.h"
#include "system/system.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/arm/nrf51_soc.h"
#include "hw/i2c/microbit_i2c.h"
diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c
index 13ed868b6b..b0633a5a69 100644
--- a/hw/arm/mps2-tz.c
+++ b/hw/arm/mps2-tz.c
@@ -54,7 +54,7 @@
#include "hw/arm/armv7m.h"
#include "hw/or-irq.h"
#include "hw/boards.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/system.h"
#include "system/reset.h"
#include "hw/misc/unimp.h"
diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
index 3f8db0cab6..6958485a66 100644
--- a/hw/arm/mps2.c
+++ b/hw/arm/mps2.c
@@ -33,7 +33,7 @@
#include "hw/arm/armv7m.h"
#include "hw/or-irq.h"
#include "hw/boards.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/system.h"
#include "hw/qdev-properties.h"
#include "hw/misc/unimp.h"
diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c
index 1bddb5e822..4dd1e8a718 100644
--- a/hw/arm/mps3r.c
+++ b/hw/arm/mps3r.c
@@ -28,7 +28,7 @@
#include "qemu/units.h"
#include "qapi/error.h"
#include "qobject/qlist.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "cpu.h"
#include "system/system.h"
#include "hw/boards.h"
diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c
index e8a5b231ba..bc9b419e37 100644
--- a/hw/arm/msf2-soc.c
+++ b/hw/arm/msf2-soc.c
@@ -25,7 +25,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/char/serial-mm.h"
#include "hw/arm/msf2-soc.h"
#include "hw/misc/unimp.h"
diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c
index 9b20f1e2c9..29c76c6860 100644
--- a/hw/arm/msf2-som.c
+++ b/hw/arm/msf2-som.c
@@ -33,7 +33,7 @@
#include "hw/qdev-properties.h"
#include "hw/arm/boot.h"
#include "hw/qdev-clock.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/arm/msf2-soc.h"
#define DDR_BASE_ADDRESS 0xA0000000
diff --git a/hw/arm/musca.c b/hw/arm/musca.c
index e9c092abc3..a4f43f1992 100644
--- a/hw/arm/musca.c
+++ b/hw/arm/musca.c
@@ -22,7 +22,7 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/system.h"
#include "hw/arm/boot.h"
#include "hw/arm/armsse.h"
diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index 3ee10b4777..91d7e3f04b 100644
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -23,7 +23,7 @@
#include "qemu/main-loop.h"
#include "qapi/error.h"
#include "cpu.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/hw.h"
#include "hw/irq.h"
#include "hw/qdev-properties.h"
diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
index 24b4043183..aa1e96b3ad 100644
--- a/hw/arm/omap_sx1.c
+++ b/hw/arm/omap_sx1.c
@@ -34,7 +34,7 @@
#include "hw/arm/boot.h"
#include "hw/block/flash.h"
#include "system/qtest.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qemu/cutils.h"
#include "qemu/error-report.h"
diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c
index 634af9b0a1..e0956880d1 100644
--- a/hw/arm/orangepi.c
+++ b/hw/arm/orangepi.c
@@ -19,7 +19,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "hw/boards.h"
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index 3361111360..cbe914c93e 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -20,7 +20,7 @@
#include "net/net.h"
#include "hw/boards.h"
#include "qemu/log.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/system.h"
#include "hw/arm/armv7m.h"
#include "hw/char/pl011.h"
diff --git a/hw/arm/stm32f100_soc.c b/hw/arm/stm32f100_soc.c
index 53b5636452..0eabaf8d9b 100644
--- a/hw/arm/stm32f100_soc.c
+++ b/hw/arm/stm32f100_soc.c
@@ -27,7 +27,7 @@
#include "qapi/error.h"
#include "qemu/module.h"
#include "hw/arm/boot.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/arm/stm32f100_soc.h"
#include "hw/qdev-properties.h"
#include "hw/qdev-clock.h"
diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c
index 47a54e592b..32e96912f0 100644
--- a/hw/arm/stm32f205_soc.c
+++ b/hw/arm/stm32f205_soc.c
@@ -26,7 +26,7 @@
#include "qapi/error.h"
#include "qemu/module.h"
#include "hw/arm/boot.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/arm/stm32f205_soc.h"
#include "hw/qdev-properties.h"
#include "hw/qdev-clock.h"
diff --git a/hw/arm/stm32f405_soc.c b/hw/arm/stm32f405_soc.c
index 18d8824f29..bba9060daf 100644
--- a/hw/arm/stm32f405_soc.c
+++ b/hw/arm/stm32f405_soc.c
@@ -24,7 +24,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/system.h"
#include "hw/arm/stm32f405_soc.h"
#include "hw/qdev-clock.h"
diff --git a/hw/arm/stm32l4x5_soc.c b/hw/arm/stm32l4x5_soc.c
index dbf75329f7..6278d354c8 100644
--- a/hw/arm/stm32l4x5_soc.c
+++ b/hw/arm/stm32l4x5_soc.c
@@ -24,7 +24,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/system.h"
#include "hw/or-irq.h"
#include "hw/arm/stm32l4x5_soc.h"
diff --git a/hw/avr/atmega.c b/hw/avr/atmega.c
index 59c0160283..ee8747781e 100644
--- a/hw/avr/atmega.c
+++ b/hw/avr/atmega.c
@@ -13,7 +13,7 @@
#include "qemu/units.h"
#include "qapi/error.h"
#include "system/memory.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/system.h"
#include "hw/qdev-properties.h"
#include "hw/sysbus.h"
diff --git a/hw/char/goldfish_tty.c b/hw/char/goldfish_tty.c
index 7374561141..f0891ffa4d 100644
--- a/hw/char/goldfish_tty.c
+++ b/hw/char/goldfish_tty.c
@@ -15,7 +15,7 @@
#include "chardev/char-fe.h"
#include "qemu/log.h"
#include "trace.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/dma.h"
#include "hw/char/goldfish_tty.h"
diff --git a/hw/char/omap_uart.c b/hw/char/omap_uart.c
index 07fb868965..8cbf6ce803 100644
--- a/hw/char/omap_uart.c
+++ b/hw/char/omap_uart.c
@@ -21,7 +21,7 @@
#include "chardev/char.h"
#include "hw/arm/omap.h"
#include "hw/char/serial-mm.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
/* UARTs */
struct omap_uart_s {
diff --git a/hw/char/riscv_htif.c b/hw/char/riscv_htif.c
index ec5db5a597..c884be5d75 100644
--- a/hw/char/riscv_htif.c
+++ b/hw/char/riscv_htif.c
@@ -28,7 +28,7 @@
#include "chardev/char-fe.h"
#include "qemu/timer.h"
#include "qemu/error-report.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "exec/tswap.h"
#include "system/dma.h"
#include "system/runstate.h"
diff --git a/hw/core/cpu-system.c b/hw/core/cpu-system.c
index 5ef8c24b5b..82b68b8927 100644
--- a/hw/core/cpu-system.c
+++ b/hw/core/cpu-system.c
@@ -20,7 +20,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "exec/cputlb.h"
#include "system/memory.h"
#include "exec/tb-flush.h"
diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c
index 7f1fb562be..a6e477a2d8 100644
--- a/hw/core/null-machine.c
+++ b/hw/core/null-machine.c
@@ -14,7 +14,7 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
#include "hw/boards.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/core/cpu.h"
static void machine_none_init(MachineState *mch)
diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c
index 98819d5dc6..6eb4c0f15a 100644
--- a/hw/core/sysbus.c
+++ b/hw/core/sysbus.c
@@ -21,7 +21,7 @@
#include "qapi/error.h"
#include "hw/sysbus.h"
#include "monitor/monitor.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent);
static char *sysbus_get_fw_dev_path(DeviceState *dev);
diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c
index 5bf54347ed..6842e7d491 100644
--- a/hw/dma/rc4030.c
+++ b/hw/dma/rc4030.c
@@ -32,7 +32,7 @@
#include "qemu/timer.h"
#include "qemu/log.h"
#include "qemu/module.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "trace.h"
#include "qom/object.h"
diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c
index 6f33c3e741..0b1da723c8 100644
--- a/hw/hyperv/hv-balloon.c
+++ b/hw/hyperv/hv-balloon.c
@@ -10,7 +10,7 @@
#include "qemu/osdep.h"
#include "hv-balloon-internal.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "exec/cpu-common.h"
#include "exec/ramblock.h"
#include "hw/boards.h"
diff --git a/hw/hyperv/hyperv.c b/hw/hyperv/hyperv.c
index 382c62d668..d21e428eae 100644
--- a/hw/hyperv/hyperv.c
+++ b/hw/hyperv/hyperv.c
@@ -11,7 +11,7 @@
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/memory.h"
#include "system/kvm.h"
#include "qemu/bitops.h"
diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c
index 9b8b092bc2..f9223ef1a1 100644
--- a/hw/i386/kvm/xen_evtchn.c
+++ b/hw/i386/kvm/xen_evtchn.c
@@ -23,7 +23,7 @@
#include "qobject/qdict.h"
#include "qom/object.h"
#include "exec/target_page.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "migration/vmstate.h"
#include "trace.h"
diff --git a/hw/i386/kvm/xen_gnttab.c b/hw/i386/kvm/xen_gnttab.c
index 7b843a72b1..430ba62896 100644
--- a/hw/i386/kvm/xen_gnttab.c
+++ b/hw/i386/kvm/xen_gnttab.c
@@ -17,7 +17,7 @@
#include "qapi/error.h"
#include "qom/object.h"
#include "exec/target_page.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "migration/vmstate.h"
#include "hw/sysbus.h"
diff --git a/hw/i386/kvm/xen_overlay.c b/hw/i386/kvm/xen_overlay.c
index db9aa7942d..a2b26e9906 100644
--- a/hw/i386/kvm/xen_overlay.c
+++ b/hw/i386/kvm/xen_overlay.c
@@ -16,7 +16,7 @@
#include "qapi/error.h"
#include "qom/object.h"
#include "exec/target_page.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "migration/vmstate.h"
#include "hw/sysbus.h"
diff --git a/hw/i386/sgx-epc.c b/hw/i386/sgx-epc.c
index 875e1c5c33..00b220d4d6 100644
--- a/hw/i386/sgx-epc.c
+++ b/hw/i386/sgx-epc.c
@@ -17,7 +17,7 @@
#include "qapi/error.h"
#include "qapi/visitor.h"
#include "target/i386/cpu.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
static const Property sgx_epc_properties[] = {
DEFINE_PROP_UINT64(SGX_EPC_ADDR_PROP, SGXEPCDevice, addr, 0),
diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
index e665e2111c..5685c4fb80 100644
--- a/hw/i386/sgx.c
+++ b/hw/i386/sgx.c
@@ -20,7 +20,7 @@
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qapi/qapi-commands-misc-target.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/hw_accel.h"
#include "system/reset.h"
#include <sys/ioctl.h>
diff --git a/hw/i386/vapic.c b/hw/i386/vapic.c
index 14de9b7a82..26aae64e5d 100644
--- a/hw/i386/vapic.c
+++ b/hw/i386/vapic.c
@@ -16,7 +16,7 @@
#include "system/hw_accel.h"
#include "system/kvm.h"
#include "system/runstate.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/i386/apic_internal.h"
#include "hw/sysbus.h"
#include "hw/boards.h"
diff --git a/hw/ide/ahci-sysbus.c b/hw/ide/ahci-sysbus.c
index 03a5bd42d0..3c1935d81c 100644
--- a/hw/ide/ahci-sysbus.c
+++ b/hw/ide/ahci-sysbus.c
@@ -22,7 +22,7 @@
*/
#include "qemu/osdep.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c
index d9f8c36778..987034efd3 100644
--- a/hw/input/lasips2.c
+++ b/hw/input/lasips2.c
@@ -29,7 +29,7 @@
#include "hw/input/lasips2.h"
#include "exec/hwaddr.h"
#include "trace.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "migration/vmstate.h"
#include "hw/irq.h"
#include "qapi/error.h"
diff --git a/hw/intc/loongarch_extioi.c b/hw/intc/loongarch_extioi.c
index a51a215e6e..a558c50185 100644
--- a/hw/intc/loongarch_extioi.c
+++ b/hw/intc/loongarch_extioi.c
@@ -11,7 +11,7 @@
#include "qapi/error.h"
#include "hw/irq.h"
#include "hw/loongarch/virt.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/intc/loongarch_extioi.h"
#include "trace.h"
diff --git a/hw/intc/riscv_aplic.c b/hw/intc/riscv_aplic.c
index 5964cde7e0..789c4a4d6e 100644
--- a/hw/intc/riscv_aplic.c
+++ b/hw/intc/riscv_aplic.c
@@ -22,7 +22,7 @@
#include "qemu/module.h"
#include "qemu/error-report.h"
#include "qemu/bswap.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/sysbus.h"
#include "hw/pci/msi.h"
#include "hw/boards.h"
diff --git a/hw/intc/riscv_imsic.c b/hw/intc/riscv_imsic.c
index 241b12fef0..852f413e5a 100644
--- a/hw/intc/riscv_imsic.c
+++ b/hw/intc/riscv_imsic.c
@@ -22,7 +22,7 @@
#include "qemu/module.h"
#include "qemu/error-report.h"
#include "qemu/bswap.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/sysbus.h"
#include "hw/pci/msi.h"
#include "hw/boards.h"
diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
index a5840ff968..08ae2d9692 100644
--- a/hw/loongarch/virt.c
+++ b/hw/loongarch/virt.c
@@ -18,7 +18,7 @@
#include "system/reset.h"
#include "system/rtc.h"
#include "hw/loongarch/virt.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/irq.h"
#include "net/net.h"
#include "hw/loader.h"
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index 1de8dfec7d..1a432e9bd2 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -17,7 +17,7 @@
#include "qemu/range.h"
#include "hw/virtio/vhost.h"
#include "system/kvm.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "trace.h"
static bool memory_device_is_empty(const MemoryDeviceState *md)
diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index 21ad215e44..c887c7a99e 100644
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -36,7 +36,7 @@
#include "hw/boards.h"
#include "hw/char/serial-mm.h"
#include "hw/qdev-properties.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/ssi/ssi.h"
#include "boot.h"
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index bdba2006b7..f976c90bd2 100644
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -33,7 +33,7 @@
#include "system/system.h"
#include "hw/boards.h"
#include "hw/misc/unimp.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/char/xilinx_uartlite.h"
#include "boot.h"
diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c
index bdbf7328bf..0922c65295 100644
--- a/hw/microblaze/xlnx-zynqmp-pmu.c
+++ b/hw/microblaze/xlnx-zynqmp-pmu.c
@@ -17,7 +17,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/boards.h"
#include "cpu.h"
#include "boot.h"
diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c
index c530688e76..b6dabf2893 100644
--- a/hw/mips/mipssim.c
+++ b/hw/mips/mipssim.c
@@ -28,7 +28,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu/datadir.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/clock.h"
#include "hw/mips/mips.h"
#include "hw/char/serial-mm.h"
diff --git a/hw/misc/allwinner-h3-dramc.c b/hw/misc/allwinner-h3-dramc.c
index c4f3eb9274..74ff71b753 100644
--- a/hw/misc/allwinner-h3-dramc.c
+++ b/hw/misc/allwinner-h3-dramc.c
@@ -24,7 +24,7 @@
#include "migration/vmstate.h"
#include "qemu/log.h"
#include "qemu/module.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/qdev-properties.h"
#include "qapi/error.h"
#include "hw/misc/allwinner-h3-dramc.h"
diff --git a/hw/misc/allwinner-r40-dramc.c b/hw/misc/allwinner-r40-dramc.c
index 96e1848c21..5908a059e8 100644
--- a/hw/misc/allwinner-r40-dramc.c
+++ b/hw/misc/allwinner-r40-dramc.c
@@ -24,7 +24,7 @@
#include "migration/vmstate.h"
#include "qemu/log.h"
#include "qemu/module.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/qdev-properties.h"
#include "qapi/error.h"
#include "qemu/bitops.h"
diff --git a/hw/misc/ivshmem-flat.c b/hw/misc/ivshmem-flat.c
index 40309a8ff3..076c4b42de 100644
--- a/hw/misc/ivshmem-flat.c
+++ b/hw/misc/ivshmem-flat.c
@@ -17,7 +17,7 @@
#include "hw/qdev-properties-system.h"
#include "hw/sysbus.h"
#include "chardev/char-fe.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "trace.h"
#include "hw/misc/ivshmem-flat.h"
diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c
index 03b1feda50..3c0819c58a 100644
--- a/hw/misc/mac_via.c
+++ b/hw/misc/mac_via.c
@@ -16,7 +16,7 @@
*/
#include "qemu/osdep.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "migration/vmstate.h"
#include "hw/sysbus.h"
#include "hw/irq.h"
diff --git a/hw/net/i82596.c b/hw/net/i82596.c
index ee919dab3c..64ed3c8390 100644
--- a/hw/net/i82596.c
+++ b/hw/net/i82596.c
@@ -15,7 +15,7 @@
#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qemu/module.h"
#include "trace.h"
#include "i82596.h"
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index a757939cfb..cbfb2b5303 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -27,7 +27,7 @@
#include "system/system.h"
#include "system/dma.h"
#include "system/reset.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/boards.h"
#include "hw/nvram/fw_cfg.h"
#include "hw/qdev-properties.h"
diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index 83d7c2a8af..c2284a7d41 100644
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -28,7 +28,7 @@
#include "net/net.h"
#include "hw/openrisc/boot.h"
#include "hw/qdev-properties.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/device_tree.h"
#include "system/system.h"
#include "hw/sysbus.h"
diff --git a/hw/openrisc/virt.c b/hw/openrisc/virt.c
index 3055306783..0d1c1f103c 100644
--- a/hw/openrisc/virt.c
+++ b/hw/openrisc/virt.c
@@ -11,7 +11,7 @@
#include "qemu/guest-random.h"
#include "qapi/error.h"
#include "cpu.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/irq.h"
#include "hw/boards.h"
#include "hw/char/serial-mm.h"
diff --git a/hw/pci-host/mv64361.c b/hw/pci-host/mv64361.c
index 9c41c155fb..a297318c6e 100644
--- a/hw/pci-host/mv64361.c
+++ b/hw/pci-host/mv64361.c
@@ -17,7 +17,7 @@
#include "hw/irq.h"
#include "hw/intc/i8259.h"
#include "hw/qdev-properties.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qemu/log.h"
#include "qemu/error-report.h"
#include "trace.h"
diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
index 246d6d633b..7b2dc6985c 100644
--- a/hw/ppc/pegasos2.c
+++ b/hw/ppc/pegasos2.c
@@ -31,7 +31,7 @@
#include "qemu/error-report.h"
#include "system/kvm.h"
#include "kvm_ppc.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qom/qom-qobject.h"
#include "qobject/qdict.h"
#include "trace.h"
diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c
index 1fe11dde50..f832ee61e8 100644
--- a/hw/ppc/pnv_psi.c
+++ b/hw/ppc/pnv_psi.c
@@ -18,7 +18,7 @@
*/
#include "qemu/osdep.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/irq.h"
#include "target/ppc/cpu.h"
#include "qemu/log.h"
diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c
index 8250824a1a..5c7278ea4b 100644
--- a/hw/ppc/ppc405_uc.c
+++ b/hw/ppc/ppc405_uc.c
@@ -36,7 +36,7 @@
#include "qemu/timer.h"
#include "system/reset.h"
#include "system/system.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/intc/ppc-uic.h"
#include "trace.h"
diff --git a/hw/ppc/ppc4xx_sdram.c b/hw/ppc/ppc4xx_sdram.c
index 562bff8d53..bf0faad9e7 100644
--- a/hw/ppc/ppc4xx_sdram.c
+++ b/hw/ppc/ppc4xx_sdram.c
@@ -34,7 +34,7 @@
#include "qapi/error.h"
#include "qemu/log.h"
#include "qemu/error-report.h"
-#include "exec/address-spaces.h" /* get_system_memory() */
+#include "system/address-spaces.h" /* get_system_memory() */
#include "hw/irq.h"
#include "hw/qdev-properties.h"
#include "hw/ppc/ppc4xx.h"
diff --git a/hw/ppc/prep_systemio.c b/hw/ppc/prep_systemio.c
index b1f2e130f0..08f29e72e4 100644
--- a/hw/ppc/prep_systemio.c
+++ b/hw/ppc/prep_systemio.c
@@ -28,7 +28,7 @@
#include "hw/isa/isa.h"
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qom/object.h"
#include "qemu/error-report.h" /* for error_report() */
#include "qemu/module.h"
diff --git a/hw/ppc/rs6000_mc.c b/hw/ppc/rs6000_mc.c
index 0e5d53b8b6..27f1c90f06 100644
--- a/hw/ppc/rs6000_mc.c
+++ b/hw/ppc/rs6000_mc.c
@@ -24,7 +24,7 @@
#include "hw/isa/isa.h"
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qapi/error.h"
#include "trace.h"
#include "qom/object.h"
diff --git a/hw/ppc/spapr_ovec.c b/hw/ppc/spapr_ovec.c
index 88e29536aa..6d6eaf67cb 100644
--- a/hw/ppc/spapr_ovec.c
+++ b/hw/ppc/spapr_ovec.c
@@ -15,7 +15,7 @@
#include "hw/ppc/spapr_ovec.h"
#include "migration/vmstate.h"
#include "qemu/bitmap.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qemu/error-report.h"
#include "trace.h"
#include <libfdt.h>
diff --git a/hw/ppc/vof.c b/hw/ppc/vof.c
index 09cb77de93..f14efa3a7c 100644
--- a/hw/ppc/vof.c
+++ b/hw/ppc/vof.c
@@ -15,7 +15,7 @@
#include "qemu/units.h"
#include "qemu/log.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/ppc/vof.h"
#include "hw/ppc/fdt.h"
#include "system/runstate.h"
diff --git a/hw/remote/iommu.c b/hw/remote/iommu.c
index ec845d1f58..3e0758a21e 100644
--- a/hw/remote/iommu.c
+++ b/hw/remote/iommu.c
@@ -14,7 +14,7 @@
#include "hw/pci/pci_bus.h"
#include "hw/pci/pci.h"
#include "system/memory.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "trace.h"
/**
diff --git a/hw/riscv/microblaze-v-generic.c b/hw/riscv/microblaze-v-generic.c
index d8e67906d2..e863c50cbc 100644
--- a/hw/riscv/microblaze-v-generic.c
+++ b/hw/riscv/microblaze-v-generic.c
@@ -22,7 +22,7 @@
#include "net/net.h"
#include "hw/boards.h"
#include "hw/char/serial-mm.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/char/xilinx_uartlite.h"
#include "hw/misc/unimp.h"
diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c
index 98a67fe52a..019d6b3986 100644
--- a/hw/riscv/opentitan.c
+++ b/hw/riscv/opentitan.c
@@ -28,7 +28,7 @@
#include "hw/riscv/boot.h"
#include "qemu/units.h"
#include "system/system.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
/*
* This version of the OpenTitan machine currently supports
diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c
index e2242b97d0..17c5c72102 100644
--- a/hw/riscv/shakti_c.c
+++ b/hw/riscv/shakti_c.c
@@ -25,7 +25,7 @@
#include "hw/intc/riscv_aclint.h"
#include "system/system.h"
#include "hw/qdev-properties.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/riscv/boot.h"
static const struct MemmapEntry {
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index 738800c98d..2059c5dd0b 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -14,7 +14,7 @@
#include "qapi/visitor.h"
#include "qemu/bitops.h"
#include "qemu/error-report.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/s390x/ioinst.h"
#include "hw/qdev-properties.h"
#include "hw/s390x/css.h"
diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c
index 811d892122..425e3e4a87 100644
--- a/hw/s390x/s390-skeys.c
+++ b/hw/s390x/s390-skeys.c
@@ -19,7 +19,7 @@
#include "qobject/qdict.h"
#include "qemu/error-report.h"
#include "system/memory_mapping.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/kvm.h"
#include "migration/qemu-file-types.h"
#include "migration/register.h"
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 43f3b162c8..e8ecb90826 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -12,7 +12,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/kvm.h"
#include "net/net.h"
#include "hw/virtio/virtio.h"
diff --git a/hw/sparc/sun4m_iommu.c b/hw/sparc/sun4m_iommu.c
index 5a4c1f5e3b..4a542b18d2 100644
--- a/hw/sparc/sun4m_iommu.c
+++ b/hw/sparc/sun4m_iommu.c
@@ -29,7 +29,7 @@
#include "hw/sysbus.h"
#include "migration/vmstate.h"
#include "qemu/module.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "trace.h"
/*
diff --git a/hw/sparc64/sun4u_iommu.c b/hw/sparc64/sun4u_iommu.c
index eba811af0c..533fcae1fb 100644
--- a/hw/sparc64/sun4u_iommu.c
+++ b/hw/sparc64/sun4u_iommu.c
@@ -27,7 +27,7 @@
#include "qemu/osdep.h"
#include "hw/sysbus.h"
#include "hw/sparc/sun4u_iommu.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qemu/log.h"
#include "qemu/module.h"
#include "trace.h"
diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index ccb97b6806..ea82472105 100644
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -36,7 +36,7 @@
#include "hw/rtc/mc146818rtc_regs.h"
#include "migration/vmstate.h"
#include "hw/timer/i8254.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qom/object.h"
#include "trace.h"
diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c
index 6cdeb72df0..b668aee97a 100644
--- a/hw/tpm/tpm_crb.c
+++ b/hw/tpm/tpm_crb.c
@@ -18,7 +18,7 @@
#include "qemu/module.h"
#include "qapi/error.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/qdev-properties.h"
#include "hw/pci/pci_ids.h"
#include "hw/acpi/tpm.h"
diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
index c7ab4ff57a..d6575d7c44 100644
--- a/hw/vfio/ap.c
+++ b/hw/vfio/ap.c
@@ -28,7 +28,7 @@
#include "migration/vmstate.h"
#include "hw/qdev-properties.h"
#include "hw/s390x/ap-bridge.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qom/object.h"
#define TYPE_VFIO_AP_DEVICE "vfio-ap"
diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
index e5e0d9e3e7..29e804e122 100644
--- a/hw/vfio/ccw.c
+++ b/hw/vfio/ccw.c
@@ -27,7 +27,7 @@
#include "hw/s390x/vfio-ccw.h"
#include "hw/qdev-properties.h"
#include "hw/s390x/ccw-device.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index cdcec21c08..5c3bc88222 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -27,7 +27,7 @@
#include "hw/vfio/vfio-common.h"
#include "hw/vfio/pci.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/memory.h"
#include "exec/ram_addr.h"
#include "hw/hw.h"
diff --git a/hw/vfio/container.c b/hw/vfio/container.c
index 1d1c5f9a77..2e993c7e73 100644
--- a/hw/vfio/container.c
+++ b/hw/vfio/container.c
@@ -23,7 +23,7 @@
#include <linux/vfio.h>
#include "hw/vfio/vfio-common.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/memory.h"
#include "exec/ram_addr.h"
#include "qemu/error-report.h"
diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index 96c6bf5654..c6edbdd4ae 100644
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -29,7 +29,7 @@
#include "qemu/module.h"
#include "qemu/range.h"
#include "system/memory.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qemu/queue.h"
#include "hw/sysbus.h"
#include "trace.h"
diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c
index ad4c499eaf..bc00badb34 100644
--- a/hw/vfio/spapr.c
+++ b/hw/vfio/spapr.c
@@ -15,7 +15,7 @@
#include <linux/kvm.h>
#endif
#include "system/kvm.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/vfio/vfio-common.h"
#include "hw/hw.h"
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 7efbde3d4c..1e0336df1d 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -20,7 +20,7 @@
#include "hw/virtio/virtio-net.h"
#include "hw/virtio/vhost-shadow-virtqueue.h"
#include "hw/virtio/vhost-vdpa.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "migration/blocker.h"
#include "qemu/cutils.h"
#include "qemu/main-loop.h"
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index 2eb5a14fa2..0d0603c674 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -24,7 +24,7 @@
#include "hw/boards.h"
#include "system/balloon.h"
#include "hw/virtio/virtio-balloon.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qapi/error.h"
#include "qapi/qapi-events-machine.h"
#include "qapi/visitor.h"
diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c
index 896feb37a1..d1c79c567b 100644
--- a/hw/virtio/virtio-bus.c
+++ b/hw/virtio/virtio-bus.c
@@ -28,7 +28,7 @@
#include "qapi/error.h"
#include "hw/virtio/virtio-bus.h"
#include "hw/virtio/virtio.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
/* #define DEBUG_VIRTIO_BUS */
diff --git a/monitor/hmp-cmds-target.c b/monitor/hmp-cmds-target.c
index 6654d31406..011a367357 100644
--- a/monitor/hmp-cmds-target.c
+++ b/monitor/hmp-cmds-target.c
@@ -24,7 +24,7 @@
#include "qemu/osdep.h"
#include "disas/disas.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/memory.h"
#include "monitor/hmp-target.h"
#include "monitor/monitor-internal.h"
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 7ded3378cf..8ddcdd76c1 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -14,7 +14,7 @@
*/
#include "qemu/osdep.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "exec/ioport.h"
#include "exec/gdbstub.h"
#include "gdbstub/enums.h"
diff --git a/system/ioport.c b/system/ioport.c
index 5f8718486c..2bc14bdcfa 100644
--- a/system/ioport.c
+++ b/system/ioport.c
@@ -29,7 +29,7 @@
#include "cpu.h"
#include "exec/ioport.h"
#include "system/memory.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "trace.h"
struct MemoryRegionPortioList {
diff --git a/system/memory.c b/system/memory.c
index 6d6b33b366..050bffdbf8 100644
--- a/system/memory.c
+++ b/system/memory.c
@@ -33,7 +33,7 @@
#include "qemu/accel.h"
#include "hw/boards.h"
#include "migration/vmstate.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
//#define DEBUG_UNASSIGNED
diff --git a/system/memory_mapping.c b/system/memory_mapping.c
index 8538a8241e..da708a08ab 100644
--- a/system/memory_mapping.c
+++ b/system/memory_mapping.c
@@ -17,7 +17,7 @@
#include "system/memory_mapping.h"
#include "system/memory.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/core/cpu.h"
//#define DEBUG_GUEST_PHYS_REGION_ADD
diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
index 2439af63a0..93a3f9b53d 100644
--- a/target/arm/hvf/hvf.c
+++ b/target/arm/hvf/hvf.c
@@ -22,7 +22,7 @@
#include <mach/mach_time.h>
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/boards.h"
#include "hw/irq.h"
#include "qemu/main-loop.h"
diff --git a/target/arm/kvm.c b/target/arm/kvm.c
index da30bdbb23..97de8c7e93 100644
--- a/target/arm/kvm.c
+++ b/target/arm/kvm.c
@@ -30,7 +30,7 @@
#include "internals.h"
#include "hw/pci/pci.h"
#include "exec/memattrs.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "gdbstub/enums.h"
#include "hw/boards.h"
#include "hw/irq.h"
diff --git a/target/avr/helper.c b/target/avr/helper.c
index 3412312ad5..a1e2cc9c35 100644
--- a/target/avr/helper.c
+++ b/target/avr/helper.c
@@ -26,7 +26,7 @@
#include "exec/cputlb.h"
#include "exec/page-protection.h"
#include "exec/cpu_ldst.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "exec/helper-proto.h"
bool avr_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
diff --git a/target/i386/cpu-apic.c b/target/i386/cpu-apic.c
index c1708b04bb..242a05fdbe 100644
--- a/target/i386/cpu-apic.c
+++ b/target/i386/cpu-apic.c
@@ -14,7 +14,7 @@
#include "system/hw_accel.h"
#include "system/kvm.h"
#include "system/xen.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/qdev-properties.h"
#include "hw/i386/apic_internal.h"
#include "cpu-internal.h"
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 1b64ceaaba..dba1b3ffef 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -38,7 +38,7 @@
#ifndef CONFIG_USER_ONLY
#include "system/reset.h"
#include "qapi/qapi-commands-machine-target.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/boards.h"
#include "hw/i386/sgx-epc.h"
#endif
diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c
index e81a245881..b23010374f 100644
--- a/target/i386/kvm/xen-emu.c
+++ b/target/i386/kvm/xen-emu.c
@@ -17,7 +17,7 @@
#include "system/kvm_int.h"
#include "system/kvm_xen.h"
#include "kvm/kvm_i386.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "xen-emu.h"
#include "trace.h"
#include "system/runstate.h"
diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c
index 04e5f7e637..91f0e32366 100644
--- a/target/i386/nvmm/nvmm-all.c
+++ b/target/i386/nvmm/nvmm-all.c
@@ -9,7 +9,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "exec/ioport.h"
#include "qemu/accel.h"
#include "system/nvmm.h"
diff --git a/target/i386/sev.c b/target/i386/sev.c
index 0e1dbb6959..ba88976e9f 100644
--- a/target/i386/sev.c
+++ b/target/i386/sev.c
@@ -39,7 +39,7 @@
#include "qapi/qapi-commands-misc-target.h"
#include "confidential-guest.h"
#include "hw/i386/pc.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "qemu/queue.h"
OBJECT_DECLARE_TYPE(SevCommonState, SevCommonStateClass, SEV_COMMON)
diff --git a/target/i386/tcg/system/misc_helper.c b/target/i386/tcg/system/misc_helper.c
index ce18c75b9f..0555cf2604 100644
--- a/target/i386/tcg/system/misc_helper.c
+++ b/target/i386/tcg/system/misc_helper.c
@@ -22,7 +22,7 @@
#include "cpu.h"
#include "exec/helper-proto.h"
#include "exec/cpu_ldst.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "exec/cputlb.h"
#include "tcg/helper-tcg.h"
#include "hw/i386/apic.h"
diff --git a/target/i386/tcg/system/tcg-cpu.c b/target/i386/tcg/system/tcg-cpu.c
index 13a3507863..ab1f3c7c59 100644
--- a/target/i386/tcg/system/tcg-cpu.c
+++ b/target/i386/tcg/system/tcg-cpu.c
@@ -23,7 +23,7 @@
#include "system/system.h"
#include "qemu/units.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "tcg/tcg-cpu.h"
diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
index 41fb8c5a4e..d58cb11cee 100644
--- a/target/i386/whpx/whpx-all.c
+++ b/target/i386/whpx/whpx-all.c
@@ -10,7 +10,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "exec/ioport.h"
#include "gdbstub/helpers.h"
#include "qemu/accel.h"
diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
index 28735c80be..1668f12410 100644
--- a/target/loongarch/kvm/kvm.c
+++ b/target/loongarch/kvm/kvm.c
@@ -18,7 +18,7 @@
#include "system/kvm_int.h"
#include "hw/pci/pci.h"
#include "exec/memattrs.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/boards.h"
#include "hw/irq.h"
#include "hw/loongarch/virt.h"
diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c
index 4ffeeaa1c9..9686fa86e0 100644
--- a/target/riscv/kvm/kvm-cpu.c
+++ b/target/riscv/kvm/kvm-cpu.c
@@ -35,7 +35,7 @@
#include "accel/accel-cpu-target.h"
#include "hw/pci/pci.h"
#include "exec/memattrs.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/boards.h"
#include "hw/irq.h"
#include "hw/intc/riscv_imsic.h"
diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
index d8f483898d..b079d120db 100644
--- a/target/s390x/mmu_helper.c
+++ b/target/s390x/mmu_helper.c
@@ -17,7 +17,7 @@
#include "qemu/osdep.h"
#include "qemu/error-report.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "cpu.h"
#include "s390x-internal.h"
#include "kvm/kvm_s390x.h"
diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c
index 6a4d9c5081..a3347f1236 100644
--- a/target/s390x/sigp.c
+++ b/target/s390x/sigp.c
@@ -14,7 +14,7 @@
#include "hw/boards.h"
#include "system/hw_accel.h"
#include "system/runstate.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "exec/cputlb.h"
#include "exec/exec-all.h"
#include "system/tcg.h"
diff --git a/target/s390x/tcg/excp_helper.c b/target/s390x/tcg/excp_helper.c
index f969850f87..ac733f407f 100644
--- a/target/s390x/tcg/excp_helper.c
+++ b/target/s390x/tcg/excp_helper.c
@@ -28,7 +28,7 @@
#include "tcg_s390x.h"
#ifndef CONFIG_USER_ONLY
#include "qemu/timer.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "hw/s390x/ioinst.h"
#include "hw/s390x/s390_flic.h"
#include "hw/boards.h"
diff --git a/target/xtensa/dbg_helper.c b/target/xtensa/dbg_helper.c
index 5546c82ecd..163a1ffc7b 100644
--- a/target/xtensa/dbg_helper.c
+++ b/target/xtensa/dbg_helper.c
@@ -31,7 +31,7 @@
#include "exec/helper-proto.h"
#include "qemu/host-utils.h"
#include "exec/exec-all.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
void HELPER(wsr_ibreakenable)(CPUXtensaState *env, uint32_t v)
{
diff --git a/hw/display/apple-gfx.m b/hw/display/apple-gfx.m
index c4323574e1..2ff1c90df7 100644
--- a/hw/display/apple-gfx.m
+++ b/hw/display/apple-gfx.m
@@ -18,7 +18,7 @@
#include "qapi/visitor.h"
#include "qapi/error.h"
#include "block/aio-wait.h"
-#include "exec/address-spaces.h"
+#include "system/address-spaces.h"
#include "system/dma.h"
#include "migration/blocker.h"
#include "ui/console.h"
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 15/37] include/system: Move exec/address-spaces.h to system/address-spaces.h
2025-03-13 3:44 ` [PATCH 15/37] include/system: Move exec/address-spaces.h to system/address-spaces.h Richard Henderson
@ 2025-03-13 10:01 ` Philippe Mathieu-Daudé
2025-03-13 17:34 ` Pierrick Bouvier
1 sibling, 0 replies; 115+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-03-13 10:01 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pierrick.bouvier, pbonzini
On 13/3/25 04:44, Richard Henderson wrote:
> Convert the existing includes with sed.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> hw/net/i82596.h | 2 +-
> hw/s390x/ipl.h | 2 +-
> include/hw/misc/lasi.h | 2 +-
> include/hw/nubus/nubus.h | 2 +-
> include/hw/ppc/vof.h | 2 +-
> include/hw/tricore/triboard.h | 2 +-
> include/{exec => system}/address-spaces.h | 8 ++------
> include/system/dma.h | 2 +-
> rust/wrapper.h | 2 +-
> target/i386/hvf/vmx.h | 2 +-
> accel/hvf/hvf-accel-ops.c | 2 +-
> hw/acpi/erst.c | 2 +-
> hw/arm/aspeed_ast10x0.c | 2 +-
> hw/arm/bananapi_m2u.c | 2 +-
> hw/arm/collie.c | 2 +-
> hw/arm/exynos4_boards.c | 2 +-
> hw/arm/fsl-imx31.c | 2 +-
> hw/arm/fsl-imx8mp.c | 2 +-
> hw/arm/imx8mp-evk.c | 2 +-
> hw/arm/integratorcp.c | 2 +-
> hw/arm/kzm.c | 2 +-
> hw/arm/microbit.c | 2 +-
> hw/arm/mps2-tz.c | 2 +-
> hw/arm/mps2.c | 2 +-
> hw/arm/mps3r.c | 2 +-
> hw/arm/msf2-soc.c | 2 +-
> hw/arm/msf2-som.c | 2 +-
> hw/arm/musca.c | 2 +-
> hw/arm/omap1.c | 2 +-
> hw/arm/omap_sx1.c | 2 +-
> hw/arm/orangepi.c | 2 +-
> hw/arm/stellaris.c | 2 +-
> hw/arm/stm32f100_soc.c | 2 +-
> hw/arm/stm32f205_soc.c | 2 +-
> hw/arm/stm32f405_soc.c | 2 +-
> hw/arm/stm32l4x5_soc.c | 2 +-
> hw/avr/atmega.c | 2 +-
> hw/char/goldfish_tty.c | 2 +-
> hw/char/omap_uart.c | 2 +-
> hw/char/riscv_htif.c | 2 +-
> hw/core/cpu-system.c | 2 +-
> hw/core/null-machine.c | 2 +-
> hw/core/sysbus.c | 2 +-
> hw/dma/rc4030.c | 2 +-
> hw/hyperv/hv-balloon.c | 2 +-
> hw/hyperv/hyperv.c | 2 +-
> hw/i386/kvm/xen_evtchn.c | 2 +-
> hw/i386/kvm/xen_gnttab.c | 2 +-
> hw/i386/kvm/xen_overlay.c | 2 +-
> hw/i386/sgx-epc.c | 2 +-
> hw/i386/sgx.c | 2 +-
> hw/i386/vapic.c | 2 +-
> hw/ide/ahci-sysbus.c | 2 +-
> hw/input/lasips2.c | 2 +-
> hw/intc/loongarch_extioi.c | 2 +-
> hw/intc/riscv_aplic.c | 2 +-
> hw/intc/riscv_imsic.c | 2 +-
> hw/loongarch/virt.c | 2 +-
> hw/mem/memory-device.c | 2 +-
> hw/microblaze/petalogix_ml605_mmu.c | 2 +-
> hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +-
> hw/microblaze/xlnx-zynqmp-pmu.c | 2 +-
> hw/mips/mipssim.c | 2 +-
> hw/misc/allwinner-h3-dramc.c | 2 +-
> hw/misc/allwinner-r40-dramc.c | 2 +-
> hw/misc/ivshmem-flat.c | 2 +-
> hw/misc/mac_via.c | 2 +-
> hw/net/i82596.c | 2 +-
> hw/nvram/fw_cfg.c | 2 +-
> hw/openrisc/openrisc_sim.c | 2 +-
> hw/openrisc/virt.c | 2 +-
> hw/pci-host/mv64361.c | 2 +-
> hw/ppc/pegasos2.c | 2 +-
> hw/ppc/pnv_psi.c | 2 +-
> hw/ppc/ppc405_uc.c | 2 +-
> hw/ppc/ppc4xx_sdram.c | 2 +-
> hw/ppc/prep_systemio.c | 2 +-
> hw/ppc/rs6000_mc.c | 2 +-
> hw/ppc/spapr_ovec.c | 2 +-
> hw/ppc/vof.c | 2 +-
> hw/remote/iommu.c | 2 +-
> hw/riscv/microblaze-v-generic.c | 2 +-
> hw/riscv/opentitan.c | 2 +-
> hw/riscv/shakti_c.c | 2 +-
> hw/s390x/css.c | 2 +-
> hw/s390x/s390-skeys.c | 2 +-
> hw/s390x/virtio-ccw.c | 2 +-
> hw/sparc/sun4m_iommu.c | 2 +-
> hw/sparc64/sun4u_iommu.c | 2 +-
> hw/timer/hpet.c | 2 +-
> hw/tpm/tpm_crb.c | 2 +-
> hw/vfio/ap.c | 2 +-
> hw/vfio/ccw.c | 2 +-
> hw/vfio/common.c | 2 +-
> hw/vfio/container.c | 2 +-
> hw/vfio/platform.c | 2 +-
> hw/vfio/spapr.c | 2 +-
> hw/virtio/vhost-vdpa.c | 2 +-
> hw/virtio/virtio-balloon.c | 2 +-
> hw/virtio/virtio-bus.c | 2 +-
> monitor/hmp-cmds-target.c | 2 +-
> monitor/hmp-cmds.c | 2 +-
> system/ioport.c | 2 +-
> system/memory.c | 2 +-
> system/memory_mapping.c | 2 +-
> target/arm/hvf/hvf.c | 2 +-
> target/arm/kvm.c | 2 +-
> target/avr/helper.c | 2 +-
> target/i386/cpu-apic.c | 2 +-
> target/i386/cpu.c | 2 +-
> target/i386/kvm/xen-emu.c | 2 +-
> target/i386/nvmm/nvmm-all.c | 2 +-
> target/i386/sev.c | 2 +-
> target/i386/tcg/system/misc_helper.c | 2 +-
> target/i386/tcg/system/tcg-cpu.c | 2 +-
> target/i386/whpx/whpx-all.c | 2 +-
> target/loongarch/kvm/kvm.c | 2 +-
> target/riscv/kvm/kvm-cpu.c | 2 +-
> target/s390x/mmu_helper.c | 2 +-
> target/s390x/sigp.c | 2 +-
> target/s390x/tcg/excp_helper.c | 2 +-
> target/xtensa/dbg_helper.c | 2 +-
> hw/display/apple-gfx.m | 2 +-
> 123 files changed, 124 insertions(+), 128 deletions(-)
> rename include/{exec => system}/address-spaces.h (89%)
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 15/37] include/system: Move exec/address-spaces.h to system/address-spaces.h
2025-03-13 3:44 ` [PATCH 15/37] include/system: Move exec/address-spaces.h to system/address-spaces.h Richard Henderson
2025-03-13 10:01 ` Philippe Mathieu-Daudé
@ 2025-03-13 17:34 ` Pierrick Bouvier
1 sibling, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 17:34 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> Convert the existing includes with sed.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> hw/net/i82596.h | 2 +-
> hw/s390x/ipl.h | 2 +-
> include/hw/misc/lasi.h | 2 +-
> include/hw/nubus/nubus.h | 2 +-
> include/hw/ppc/vof.h | 2 +-
> include/hw/tricore/triboard.h | 2 +-
> include/{exec => system}/address-spaces.h | 8 ++------
> include/system/dma.h | 2 +-
> rust/wrapper.h | 2 +-
> target/i386/hvf/vmx.h | 2 +-
> accel/hvf/hvf-accel-ops.c | 2 +-
> hw/acpi/erst.c | 2 +-
> hw/arm/aspeed_ast10x0.c | 2 +-
> hw/arm/bananapi_m2u.c | 2 +-
> hw/arm/collie.c | 2 +-
> hw/arm/exynos4_boards.c | 2 +-
> hw/arm/fsl-imx31.c | 2 +-
> hw/arm/fsl-imx8mp.c | 2 +-
> hw/arm/imx8mp-evk.c | 2 +-
> hw/arm/integratorcp.c | 2 +-
> hw/arm/kzm.c | 2 +-
> hw/arm/microbit.c | 2 +-
> hw/arm/mps2-tz.c | 2 +-
> hw/arm/mps2.c | 2 +-
> hw/arm/mps3r.c | 2 +-
> hw/arm/msf2-soc.c | 2 +-
> hw/arm/msf2-som.c | 2 +-
> hw/arm/musca.c | 2 +-
> hw/arm/omap1.c | 2 +-
> hw/arm/omap_sx1.c | 2 +-
> hw/arm/orangepi.c | 2 +-
> hw/arm/stellaris.c | 2 +-
> hw/arm/stm32f100_soc.c | 2 +-
> hw/arm/stm32f205_soc.c | 2 +-
> hw/arm/stm32f405_soc.c | 2 +-
> hw/arm/stm32l4x5_soc.c | 2 +-
> hw/avr/atmega.c | 2 +-
> hw/char/goldfish_tty.c | 2 +-
> hw/char/omap_uart.c | 2 +-
> hw/char/riscv_htif.c | 2 +-
> hw/core/cpu-system.c | 2 +-
> hw/core/null-machine.c | 2 +-
> hw/core/sysbus.c | 2 +-
> hw/dma/rc4030.c | 2 +-
> hw/hyperv/hv-balloon.c | 2 +-
> hw/hyperv/hyperv.c | 2 +-
> hw/i386/kvm/xen_evtchn.c | 2 +-
> hw/i386/kvm/xen_gnttab.c | 2 +-
> hw/i386/kvm/xen_overlay.c | 2 +-
> hw/i386/sgx-epc.c | 2 +-
> hw/i386/sgx.c | 2 +-
> hw/i386/vapic.c | 2 +-
> hw/ide/ahci-sysbus.c | 2 +-
> hw/input/lasips2.c | 2 +-
> hw/intc/loongarch_extioi.c | 2 +-
> hw/intc/riscv_aplic.c | 2 +-
> hw/intc/riscv_imsic.c | 2 +-
> hw/loongarch/virt.c | 2 +-
> hw/mem/memory-device.c | 2 +-
> hw/microblaze/petalogix_ml605_mmu.c | 2 +-
> hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +-
> hw/microblaze/xlnx-zynqmp-pmu.c | 2 +-
> hw/mips/mipssim.c | 2 +-
> hw/misc/allwinner-h3-dramc.c | 2 +-
> hw/misc/allwinner-r40-dramc.c | 2 +-
> hw/misc/ivshmem-flat.c | 2 +-
> hw/misc/mac_via.c | 2 +-
> hw/net/i82596.c | 2 +-
> hw/nvram/fw_cfg.c | 2 +-
> hw/openrisc/openrisc_sim.c | 2 +-
> hw/openrisc/virt.c | 2 +-
> hw/pci-host/mv64361.c | 2 +-
> hw/ppc/pegasos2.c | 2 +-
> hw/ppc/pnv_psi.c | 2 +-
> hw/ppc/ppc405_uc.c | 2 +-
> hw/ppc/ppc4xx_sdram.c | 2 +-
> hw/ppc/prep_systemio.c | 2 +-
> hw/ppc/rs6000_mc.c | 2 +-
> hw/ppc/spapr_ovec.c | 2 +-
> hw/ppc/vof.c | 2 +-
> hw/remote/iommu.c | 2 +-
> hw/riscv/microblaze-v-generic.c | 2 +-
> hw/riscv/opentitan.c | 2 +-
> hw/riscv/shakti_c.c | 2 +-
> hw/s390x/css.c | 2 +-
> hw/s390x/s390-skeys.c | 2 +-
> hw/s390x/virtio-ccw.c | 2 +-
> hw/sparc/sun4m_iommu.c | 2 +-
> hw/sparc64/sun4u_iommu.c | 2 +-
> hw/timer/hpet.c | 2 +-
> hw/tpm/tpm_crb.c | 2 +-
> hw/vfio/ap.c | 2 +-
> hw/vfio/ccw.c | 2 +-
> hw/vfio/common.c | 2 +-
> hw/vfio/container.c | 2 +-
> hw/vfio/platform.c | 2 +-
> hw/vfio/spapr.c | 2 +-
> hw/virtio/vhost-vdpa.c | 2 +-
> hw/virtio/virtio-balloon.c | 2 +-
> hw/virtio/virtio-bus.c | 2 +-
> monitor/hmp-cmds-target.c | 2 +-
> monitor/hmp-cmds.c | 2 +-
> system/ioport.c | 2 +-
> system/memory.c | 2 +-
> system/memory_mapping.c | 2 +-
> target/arm/hvf/hvf.c | 2 +-
> target/arm/kvm.c | 2 +-
> target/avr/helper.c | 2 +-
> target/i386/cpu-apic.c | 2 +-
> target/i386/cpu.c | 2 +-
> target/i386/kvm/xen-emu.c | 2 +-
> target/i386/nvmm/nvmm-all.c | 2 +-
> target/i386/sev.c | 2 +-
> target/i386/tcg/system/misc_helper.c | 2 +-
> target/i386/tcg/system/tcg-cpu.c | 2 +-
> target/i386/whpx/whpx-all.c | 2 +-
> target/loongarch/kvm/kvm.c | 2 +-
> target/riscv/kvm/kvm-cpu.c | 2 +-
> target/s390x/mmu_helper.c | 2 +-
> target/s390x/sigp.c | 2 +-
> target/s390x/tcg/excp_helper.c | 2 +-
> target/xtensa/dbg_helper.c | 2 +-
> hw/display/apple-gfx.m | 2 +-
> 123 files changed, 124 insertions(+), 128 deletions(-)
> rename include/{exec => system}/address-spaces.h (89%)
>
> diff --git a/hw/net/i82596.h b/hw/net/i82596.h
> index 4bdfcaf856..dc1fa1a1dc 100644
> --- a/hw/net/i82596.h
> +++ b/hw/net/i82596.h
> @@ -4,7 +4,7 @@
> #define I82596_IOPORT_SIZE 0x20
>
> #include "system/memory.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
>
> #define PORT_RESET 0x00 /* reset 82596 */
> #define PORT_SELFTEST 0x01 /* selftest */
> diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h
> index 8e3882d506..c6ecb3433c 100644
> --- a/hw/s390x/ipl.h
> +++ b/hw/s390x/ipl.h
> @@ -14,7 +14,7 @@
> #define HW_S390_IPL_H
>
> #include "cpu.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/qdev-core.h"
> #include "hw/s390x/ipl/qipl.h"
> #include "qom/object.h"
> diff --git a/include/hw/misc/lasi.h b/include/hw/misc/lasi.h
> index f01c0f680a..0bdfb11b50 100644
> --- a/include/hw/misc/lasi.h
> +++ b/include/hw/misc/lasi.h
> @@ -12,7 +12,7 @@
> #ifndef LASI_H
> #define LASI_H
>
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/pci/pci_host.h"
> #include "hw/boards.h"
>
> diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h
> index fee79b71d1..7825840dca 100644
> --- a/include/hw/nubus/nubus.h
> +++ b/include/hw/nubus/nubus.h
> @@ -11,7 +11,7 @@
>
> #include "hw/qdev-properties.h"
> #include "hw/sysbus.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "qom/object.h"
> #include "qemu/units.h"
>
> diff --git a/include/hw/ppc/vof.h b/include/hw/ppc/vof.h
> index 2918aaab12..3a0fbffe54 100644
> --- a/include/hw/ppc/vof.h
> +++ b/include/hw/ppc/vof.h
> @@ -7,7 +7,7 @@
> #define HW_VOF_H
>
> #include "qom/object.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/memory.h"
> #include "exec/cpu-defs.h"
>
> diff --git a/include/hw/tricore/triboard.h b/include/hw/tricore/triboard.h
> index 8250470643..ca49a0c752 100644
> --- a/include/hw/tricore/triboard.h
> +++ b/include/hw/tricore/triboard.h
> @@ -21,7 +21,7 @@
> #include "qapi/error.h"
> #include "hw/boards.h"
> #include "system/system.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "qom/object.h"
>
> #include "hw/tricore/tc27x_soc.h"
> diff --git a/include/exec/address-spaces.h b/include/system/address-spaces.h
> similarity index 89%
> rename from include/exec/address-spaces.h
> rename to include/system/address-spaces.h
> index 0d0aa61d68..72d17afb0f 100644
> --- a/include/exec/address-spaces.h
> +++ b/include/system/address-spaces.h
> @@ -11,16 +11,14 @@
> *
> */
>
> -#ifndef EXEC_ADDRESS_SPACES_H
> -#define EXEC_ADDRESS_SPACES_H
> +#ifndef SYSTEM_ADDRESS_SPACES_H
> +#define SYSTEM_ADDRESS_SPACES_H
>
> /*
> * Internal interfaces between memory.c/exec.c/vl.c. Do not #include unless
> * you're one of them.
> */
>
> -#ifndef CONFIG_USER_ONLY
> -
> /* Get the root memory region. This interface should only be used temporarily
> * until a proper bus interface is available.
> */
> @@ -35,5 +33,3 @@ extern AddressSpace address_space_memory;
> extern AddressSpace address_space_io;
>
> #endif
> -
> -#endif
> diff --git a/include/system/dma.h b/include/system/dma.h
> index 0a2f0ad2dd..7178d4f610 100644
> --- a/include/system/dma.h
> +++ b/include/system/dma.h
> @@ -11,7 +11,7 @@
> #define DMA_H
>
> #include "system/memory.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "block/block.h"
> #include "block/accounting.h"
>
> diff --git a/rust/wrapper.h b/rust/wrapper.h
> index 3bc4a6c899..f80dbab24f 100644
> --- a/rust/wrapper.h
> +++ b/rust/wrapper.h
> @@ -64,4 +64,4 @@ typedef enum memory_order {
> #include "chardev/char-serial.h"
> #include "exec/memattrs.h"
> #include "qemu/timer.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> diff --git a/target/i386/hvf/vmx.h b/target/i386/hvf/vmx.h
> index 80ce26279b..87a478f7fd 100644
> --- a/target/i386/hvf/vmx.h
> +++ b/target/i386/hvf/vmx.h
> @@ -33,7 +33,7 @@
> #include "system/hvf.h"
> #include "system/hvf_int.h"
>
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
>
> static inline uint64_t rreg(hv_vcpuid_t vcpu, hv_x86_reg_t reg)
> {
> diff --git a/accel/hvf/hvf-accel-ops.c b/accel/hvf/hvf-accel-ops.c
> index 12fc30c276..601c3bc0ac 100644
> --- a/accel/hvf/hvf-accel-ops.c
> +++ b/accel/hvf/hvf-accel-ops.c
> @@ -50,7 +50,7 @@
> #include "qemu/osdep.h"
> #include "qemu/error-report.h"
> #include "qemu/main-loop.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "exec/exec-all.h"
> #include "gdbstub/enums.h"
> #include "hw/boards.h"
> diff --git a/hw/acpi/erst.c b/hw/acpi/erst.c
> index 5c4c1dc638..2e49b551f2 100644
> --- a/hw/acpi/erst.c
> +++ b/hw/acpi/erst.c
> @@ -23,7 +23,7 @@
> #include "hw/acpi/acpi-defs.h"
> #include "hw/acpi/aml-build.h"
> #include "hw/acpi/bios-linker-loader.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/hostmem.h"
> #include "hw/acpi/erst.h"
> #include "trace.h"
> diff --git a/hw/arm/aspeed_ast10x0.c b/hw/arm/aspeed_ast10x0.c
> index ec329f4991..21ffab10f3 100644
> --- a/hw/arm/aspeed_ast10x0.c
> +++ b/hw/arm/aspeed_ast10x0.c
> @@ -11,7 +11,7 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/system.h"
> #include "hw/qdev-clock.h"
> #include "hw/misc/unimp.h"
> diff --git a/hw/arm/bananapi_m2u.c b/hw/arm/bananapi_m2u.c
> index 4d84d10d24..b750a575f7 100644
> --- a/hw/arm/bananapi_m2u.c
> +++ b/hw/arm/bananapi_m2u.c
> @@ -19,7 +19,7 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "hw/boards.h"
> diff --git a/hw/arm/collie.c b/hw/arm/collie.c
> index eaa5c52d45..e83aee58c6 100644
> --- a/hw/arm/collie.c
> +++ b/hw/arm/collie.c
> @@ -16,7 +16,7 @@
> #include "strongarm.h"
> #include "hw/arm/boot.h"
> #include "hw/block/flash.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "qom/object.h"
> #include "qemu/error-report.h"
>
> diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
> index 43dc89d902..2d8f2d7326 100644
> --- a/hw/arm/exynos4_boards.c
> +++ b/hw/arm/exynos4_boards.c
> @@ -28,7 +28,7 @@
> #include "hw/sysbus.h"
> #include "net/net.h"
> #include "hw/arm/boot.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/arm/exynos4210.h"
> #include "hw/net/lan9118.h"
> #include "hw/qdev-properties.h"
> diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c
> index 9de0f2148f..2a8ffb15f7 100644
> --- a/hw/arm/fsl-imx31.c
> +++ b/hw/arm/fsl-imx31.c
> @@ -23,7 +23,7 @@
> #include "qapi/error.h"
> #include "hw/arm/fsl-imx31.h"
> #include "system/system.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/qdev-properties.h"
> #include "chardev/char.h"
> #include "target/arm/cpu-qom.h"
> diff --git a/hw/arm/fsl-imx8mp.c b/hw/arm/fsl-imx8mp.c
> index 1ea98e1463..0b19e071cf 100644
> --- a/hw/arm/fsl-imx8mp.c
> +++ b/hw/arm/fsl-imx8mp.c
> @@ -9,7 +9,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/arm/bsa.h"
> #include "hw/arm/fsl-imx8mp.h"
> #include "hw/intc/arm_gicv3.h"
> diff --git a/hw/arm/imx8mp-evk.c b/hw/arm/imx8mp-evk.c
> index e1a7892fd7..6e64ec4ea5 100644
> --- a/hw/arm/imx8mp-evk.c
> +++ b/hw/arm/imx8mp-evk.c
> @@ -7,7 +7,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/arm/boot.h"
> #include "hw/arm/fsl-imx8mp.h"
> #include "hw/boards.h"
> diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
> index 8aa2e6e98e..ac0c6c6096 100644
> --- a/hw/arm/integratorcp.c
> +++ b/hw/arm/integratorcp.c
> @@ -16,7 +16,7 @@
> #include "hw/misc/arm_integrator_debug.h"
> #include "hw/net/smc91c111.h"
> #include "net/net.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/runstate.h"
> #include "system/system.h"
> #include "qemu/log.h"
> diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
> index 08d2b3025c..362c145409 100644
> --- a/hw/arm/kzm.c
> +++ b/hw/arm/kzm.c
> @@ -19,7 +19,7 @@
> #include "hw/arm/boot.h"
> #include "hw/boards.h"
> #include "qemu/error-report.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "net/net.h"
> #include "hw/net/lan9118.h"
> #include "hw/char/serial-mm.h"
> diff --git a/hw/arm/microbit.c b/hw/arm/microbit.c
> index 3f56fb45ce..ade363daaa 100644
> --- a/hw/arm/microbit.c
> +++ b/hw/arm/microbit.c
> @@ -13,7 +13,7 @@
> #include "hw/boards.h"
> #include "hw/arm/boot.h"
> #include "system/system.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
>
> #include "hw/arm/nrf51_soc.h"
> #include "hw/i2c/microbit_i2c.h"
> diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c
> index 13ed868b6b..b0633a5a69 100644
> --- a/hw/arm/mps2-tz.c
> +++ b/hw/arm/mps2-tz.c
> @@ -54,7 +54,7 @@
> #include "hw/arm/armv7m.h"
> #include "hw/or-irq.h"
> #include "hw/boards.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/system.h"
> #include "system/reset.h"
> #include "hw/misc/unimp.h"
> diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
> index 3f8db0cab6..6958485a66 100644
> --- a/hw/arm/mps2.c
> +++ b/hw/arm/mps2.c
> @@ -33,7 +33,7 @@
> #include "hw/arm/armv7m.h"
> #include "hw/or-irq.h"
> #include "hw/boards.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/system.h"
> #include "hw/qdev-properties.h"
> #include "hw/misc/unimp.h"
> diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c
> index 1bddb5e822..4dd1e8a718 100644
> --- a/hw/arm/mps3r.c
> +++ b/hw/arm/mps3r.c
> @@ -28,7 +28,7 @@
> #include "qemu/units.h"
> #include "qapi/error.h"
> #include "qobject/qlist.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "cpu.h"
> #include "system/system.h"
> #include "hw/boards.h"
> diff --git a/hw/arm/msf2-soc.c b/hw/arm/msf2-soc.c
> index e8a5b231ba..bc9b419e37 100644
> --- a/hw/arm/msf2-soc.c
> +++ b/hw/arm/msf2-soc.c
> @@ -25,7 +25,7 @@
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/char/serial-mm.h"
> #include "hw/arm/msf2-soc.h"
> #include "hw/misc/unimp.h"
> diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c
> index 9b20f1e2c9..29c76c6860 100644
> --- a/hw/arm/msf2-som.c
> +++ b/hw/arm/msf2-som.c
> @@ -33,7 +33,7 @@
> #include "hw/qdev-properties.h"
> #include "hw/arm/boot.h"
> #include "hw/qdev-clock.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/arm/msf2-soc.h"
>
> #define DDR_BASE_ADDRESS 0xA0000000
> diff --git a/hw/arm/musca.c b/hw/arm/musca.c
> index e9c092abc3..a4f43f1992 100644
> --- a/hw/arm/musca.c
> +++ b/hw/arm/musca.c
> @@ -22,7 +22,7 @@
> #include "qemu/osdep.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/system.h"
> #include "hw/arm/boot.h"
> #include "hw/arm/armsse.h"
> diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
> index 3ee10b4777..91d7e3f04b 100644
> --- a/hw/arm/omap1.c
> +++ b/hw/arm/omap1.c
> @@ -23,7 +23,7 @@
> #include "qemu/main-loop.h"
> #include "qapi/error.h"
> #include "cpu.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/hw.h"
> #include "hw/irq.h"
> #include "hw/qdev-properties.h"
> diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
> index 24b4043183..aa1e96b3ad 100644
> --- a/hw/arm/omap_sx1.c
> +++ b/hw/arm/omap_sx1.c
> @@ -34,7 +34,7 @@
> #include "hw/arm/boot.h"
> #include "hw/block/flash.h"
> #include "system/qtest.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
>
> diff --git a/hw/arm/orangepi.c b/hw/arm/orangepi.c
> index 634af9b0a1..e0956880d1 100644
> --- a/hw/arm/orangepi.c
> +++ b/hw/arm/orangepi.c
> @@ -19,7 +19,7 @@
>
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "hw/boards.h"
> diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
> index 3361111360..cbe914c93e 100644
> --- a/hw/arm/stellaris.c
> +++ b/hw/arm/stellaris.c
> @@ -20,7 +20,7 @@
> #include "net/net.h"
> #include "hw/boards.h"
> #include "qemu/log.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/system.h"
> #include "hw/arm/armv7m.h"
> #include "hw/char/pl011.h"
> diff --git a/hw/arm/stm32f100_soc.c b/hw/arm/stm32f100_soc.c
> index 53b5636452..0eabaf8d9b 100644
> --- a/hw/arm/stm32f100_soc.c
> +++ b/hw/arm/stm32f100_soc.c
> @@ -27,7 +27,7 @@
> #include "qapi/error.h"
> #include "qemu/module.h"
> #include "hw/arm/boot.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/arm/stm32f100_soc.h"
> #include "hw/qdev-properties.h"
> #include "hw/qdev-clock.h"
> diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c
> index 47a54e592b..32e96912f0 100644
> --- a/hw/arm/stm32f205_soc.c
> +++ b/hw/arm/stm32f205_soc.c
> @@ -26,7 +26,7 @@
> #include "qapi/error.h"
> #include "qemu/module.h"
> #include "hw/arm/boot.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/arm/stm32f205_soc.h"
> #include "hw/qdev-properties.h"
> #include "hw/qdev-clock.h"
> diff --git a/hw/arm/stm32f405_soc.c b/hw/arm/stm32f405_soc.c
> index 18d8824f29..bba9060daf 100644
> --- a/hw/arm/stm32f405_soc.c
> +++ b/hw/arm/stm32f405_soc.c
> @@ -24,7 +24,7 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/system.h"
> #include "hw/arm/stm32f405_soc.h"
> #include "hw/qdev-clock.h"
> diff --git a/hw/arm/stm32l4x5_soc.c b/hw/arm/stm32l4x5_soc.c
> index dbf75329f7..6278d354c8 100644
> --- a/hw/arm/stm32l4x5_soc.c
> +++ b/hw/arm/stm32l4x5_soc.c
> @@ -24,7 +24,7 @@
> #include "qemu/osdep.h"
> #include "qemu/units.h"
> #include "qapi/error.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/system.h"
> #include "hw/or-irq.h"
> #include "hw/arm/stm32l4x5_soc.h"
> diff --git a/hw/avr/atmega.c b/hw/avr/atmega.c
> index 59c0160283..ee8747781e 100644
> --- a/hw/avr/atmega.c
> +++ b/hw/avr/atmega.c
> @@ -13,7 +13,7 @@
> #include "qemu/units.h"
> #include "qapi/error.h"
> #include "system/memory.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/system.h"
> #include "hw/qdev-properties.h"
> #include "hw/sysbus.h"
> diff --git a/hw/char/goldfish_tty.c b/hw/char/goldfish_tty.c
> index 7374561141..f0891ffa4d 100644
> --- a/hw/char/goldfish_tty.c
> +++ b/hw/char/goldfish_tty.c
> @@ -15,7 +15,7 @@
> #include "chardev/char-fe.h"
> #include "qemu/log.h"
> #include "trace.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/dma.h"
> #include "hw/char/goldfish_tty.h"
>
> diff --git a/hw/char/omap_uart.c b/hw/char/omap_uart.c
> index 07fb868965..8cbf6ce803 100644
> --- a/hw/char/omap_uart.c
> +++ b/hw/char/omap_uart.c
> @@ -21,7 +21,7 @@
> #include "chardev/char.h"
> #include "hw/arm/omap.h"
> #include "hw/char/serial-mm.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
>
> /* UARTs */
> struct omap_uart_s {
> diff --git a/hw/char/riscv_htif.c b/hw/char/riscv_htif.c
> index ec5db5a597..c884be5d75 100644
> --- a/hw/char/riscv_htif.c
> +++ b/hw/char/riscv_htif.c
> @@ -28,7 +28,7 @@
> #include "chardev/char-fe.h"
> #include "qemu/timer.h"
> #include "qemu/error-report.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "exec/tswap.h"
> #include "system/dma.h"
> #include "system/runstate.h"
> diff --git a/hw/core/cpu-system.c b/hw/core/cpu-system.c
> index 5ef8c24b5b..82b68b8927 100644
> --- a/hw/core/cpu-system.c
> +++ b/hw/core/cpu-system.c
> @@ -20,7 +20,7 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "exec/cputlb.h"
> #include "system/memory.h"
> #include "exec/tb-flush.h"
> diff --git a/hw/core/null-machine.c b/hw/core/null-machine.c
> index 7f1fb562be..a6e477a2d8 100644
> --- a/hw/core/null-machine.c
> +++ b/hw/core/null-machine.c
> @@ -14,7 +14,7 @@
> #include "qemu/osdep.h"
> #include "qemu/error-report.h"
> #include "hw/boards.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/core/cpu.h"
>
> static void machine_none_init(MachineState *mch)
> diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c
> index 98819d5dc6..6eb4c0f15a 100644
> --- a/hw/core/sysbus.c
> +++ b/hw/core/sysbus.c
> @@ -21,7 +21,7 @@
> #include "qapi/error.h"
> #include "hw/sysbus.h"
> #include "monitor/monitor.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
>
> static void sysbus_dev_print(Monitor *mon, DeviceState *dev, int indent);
> static char *sysbus_get_fw_dev_path(DeviceState *dev);
> diff --git a/hw/dma/rc4030.c b/hw/dma/rc4030.c
> index 5bf54347ed..6842e7d491 100644
> --- a/hw/dma/rc4030.c
> +++ b/hw/dma/rc4030.c
> @@ -32,7 +32,7 @@
> #include "qemu/timer.h"
> #include "qemu/log.h"
> #include "qemu/module.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "trace.h"
> #include "qom/object.h"
>
> diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c
> index 6f33c3e741..0b1da723c8 100644
> --- a/hw/hyperv/hv-balloon.c
> +++ b/hw/hyperv/hv-balloon.c
> @@ -10,7 +10,7 @@
> #include "qemu/osdep.h"
> #include "hv-balloon-internal.h"
>
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "exec/cpu-common.h"
> #include "exec/ramblock.h"
> #include "hw/boards.h"
> diff --git a/hw/hyperv/hyperv.c b/hw/hyperv/hyperv.c
> index 382c62d668..d21e428eae 100644
> --- a/hw/hyperv/hyperv.c
> +++ b/hw/hyperv/hyperv.c
> @@ -11,7 +11,7 @@
> #include "qemu/main-loop.h"
> #include "qemu/module.h"
> #include "qapi/error.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/memory.h"
> #include "system/kvm.h"
> #include "qemu/bitops.h"
> diff --git a/hw/i386/kvm/xen_evtchn.c b/hw/i386/kvm/xen_evtchn.c
> index 9b8b092bc2..f9223ef1a1 100644
> --- a/hw/i386/kvm/xen_evtchn.c
> +++ b/hw/i386/kvm/xen_evtchn.c
> @@ -23,7 +23,7 @@
> #include "qobject/qdict.h"
> #include "qom/object.h"
> #include "exec/target_page.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "migration/vmstate.h"
> #include "trace.h"
>
> diff --git a/hw/i386/kvm/xen_gnttab.c b/hw/i386/kvm/xen_gnttab.c
> index 7b843a72b1..430ba62896 100644
> --- a/hw/i386/kvm/xen_gnttab.c
> +++ b/hw/i386/kvm/xen_gnttab.c
> @@ -17,7 +17,7 @@
> #include "qapi/error.h"
> #include "qom/object.h"
> #include "exec/target_page.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "migration/vmstate.h"
>
> #include "hw/sysbus.h"
> diff --git a/hw/i386/kvm/xen_overlay.c b/hw/i386/kvm/xen_overlay.c
> index db9aa7942d..a2b26e9906 100644
> --- a/hw/i386/kvm/xen_overlay.c
> +++ b/hw/i386/kvm/xen_overlay.c
> @@ -16,7 +16,7 @@
> #include "qapi/error.h"
> #include "qom/object.h"
> #include "exec/target_page.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "migration/vmstate.h"
>
> #include "hw/sysbus.h"
> diff --git a/hw/i386/sgx-epc.c b/hw/i386/sgx-epc.c
> index 875e1c5c33..00b220d4d6 100644
> --- a/hw/i386/sgx-epc.c
> +++ b/hw/i386/sgx-epc.c
> @@ -17,7 +17,7 @@
> #include "qapi/error.h"
> #include "qapi/visitor.h"
> #include "target/i386/cpu.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
>
> static const Property sgx_epc_properties[] = {
> DEFINE_PROP_UINT64(SGX_EPC_ADDR_PROP, SGXEPCDevice, addr, 0),
> diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c
> index e665e2111c..5685c4fb80 100644
> --- a/hw/i386/sgx.c
> +++ b/hw/i386/sgx.c
> @@ -20,7 +20,7 @@
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "qapi/qapi-commands-misc-target.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/hw_accel.h"
> #include "system/reset.h"
> #include <sys/ioctl.h>
> diff --git a/hw/i386/vapic.c b/hw/i386/vapic.c
> index 14de9b7a82..26aae64e5d 100644
> --- a/hw/i386/vapic.c
> +++ b/hw/i386/vapic.c
> @@ -16,7 +16,7 @@
> #include "system/hw_accel.h"
> #include "system/kvm.h"
> #include "system/runstate.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/i386/apic_internal.h"
> #include "hw/sysbus.h"
> #include "hw/boards.h"
> diff --git a/hw/ide/ahci-sysbus.c b/hw/ide/ahci-sysbus.c
> index 03a5bd42d0..3c1935d81c 100644
> --- a/hw/ide/ahci-sysbus.c
> +++ b/hw/ide/ahci-sysbus.c
> @@ -22,7 +22,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/qdev-properties.h"
> #include "migration/vmstate.h"
>
> diff --git a/hw/input/lasips2.c b/hw/input/lasips2.c
> index d9f8c36778..987034efd3 100644
> --- a/hw/input/lasips2.c
> +++ b/hw/input/lasips2.c
> @@ -29,7 +29,7 @@
> #include "hw/input/lasips2.h"
> #include "exec/hwaddr.h"
> #include "trace.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "migration/vmstate.h"
> #include "hw/irq.h"
> #include "qapi/error.h"
> diff --git a/hw/intc/loongarch_extioi.c b/hw/intc/loongarch_extioi.c
> index a51a215e6e..a558c50185 100644
> --- a/hw/intc/loongarch_extioi.c
> +++ b/hw/intc/loongarch_extioi.c
> @@ -11,7 +11,7 @@
> #include "qapi/error.h"
> #include "hw/irq.h"
> #include "hw/loongarch/virt.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/intc/loongarch_extioi.h"
> #include "trace.h"
>
> diff --git a/hw/intc/riscv_aplic.c b/hw/intc/riscv_aplic.c
> index 5964cde7e0..789c4a4d6e 100644
> --- a/hw/intc/riscv_aplic.c
> +++ b/hw/intc/riscv_aplic.c
> @@ -22,7 +22,7 @@
> #include "qemu/module.h"
> #include "qemu/error-report.h"
> #include "qemu/bswap.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/sysbus.h"
> #include "hw/pci/msi.h"
> #include "hw/boards.h"
> diff --git a/hw/intc/riscv_imsic.c b/hw/intc/riscv_imsic.c
> index 241b12fef0..852f413e5a 100644
> --- a/hw/intc/riscv_imsic.c
> +++ b/hw/intc/riscv_imsic.c
> @@ -22,7 +22,7 @@
> #include "qemu/module.h"
> #include "qemu/error-report.h"
> #include "qemu/bswap.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/sysbus.h"
> #include "hw/pci/msi.h"
> #include "hw/boards.h"
> diff --git a/hw/loongarch/virt.c b/hw/loongarch/virt.c
> index a5840ff968..08ae2d9692 100644
> --- a/hw/loongarch/virt.c
> +++ b/hw/loongarch/virt.c
> @@ -18,7 +18,7 @@
> #include "system/reset.h"
> #include "system/rtc.h"
> #include "hw/loongarch/virt.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/irq.h"
> #include "net/net.h"
> #include "hw/loader.h"
> diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
> index 1de8dfec7d..1a432e9bd2 100644
> --- a/hw/mem/memory-device.c
> +++ b/hw/mem/memory-device.c
> @@ -17,7 +17,7 @@
> #include "qemu/range.h"
> #include "hw/virtio/vhost.h"
> #include "system/kvm.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "trace.h"
>
> static bool memory_device_is_empty(const MemoryDeviceState *md)
> diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
> index 21ad215e44..c887c7a99e 100644
> --- a/hw/microblaze/petalogix_ml605_mmu.c
> +++ b/hw/microblaze/petalogix_ml605_mmu.c
> @@ -36,7 +36,7 @@
> #include "hw/boards.h"
> #include "hw/char/serial-mm.h"
> #include "hw/qdev-properties.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/ssi/ssi.h"
>
> #include "boot.h"
> diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c
> index bdba2006b7..f976c90bd2 100644
> --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
> +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
> @@ -33,7 +33,7 @@
> #include "system/system.h"
> #include "hw/boards.h"
> #include "hw/misc/unimp.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/char/xilinx_uartlite.h"
>
> #include "boot.h"
> diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c
> index bdbf7328bf..0922c65295 100644
> --- a/hw/microblaze/xlnx-zynqmp-pmu.c
> +++ b/hw/microblaze/xlnx-zynqmp-pmu.c
> @@ -17,7 +17,7 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/boards.h"
> #include "cpu.h"
> #include "boot.h"
> diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c
> index c530688e76..b6dabf2893 100644
> --- a/hw/mips/mipssim.c
> +++ b/hw/mips/mipssim.c
> @@ -28,7 +28,7 @@
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> #include "qemu/datadir.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/clock.h"
> #include "hw/mips/mips.h"
> #include "hw/char/serial-mm.h"
> diff --git a/hw/misc/allwinner-h3-dramc.c b/hw/misc/allwinner-h3-dramc.c
> index c4f3eb9274..74ff71b753 100644
> --- a/hw/misc/allwinner-h3-dramc.c
> +++ b/hw/misc/allwinner-h3-dramc.c
> @@ -24,7 +24,7 @@
> #include "migration/vmstate.h"
> #include "qemu/log.h"
> #include "qemu/module.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/qdev-properties.h"
> #include "qapi/error.h"
> #include "hw/misc/allwinner-h3-dramc.h"
> diff --git a/hw/misc/allwinner-r40-dramc.c b/hw/misc/allwinner-r40-dramc.c
> index 96e1848c21..5908a059e8 100644
> --- a/hw/misc/allwinner-r40-dramc.c
> +++ b/hw/misc/allwinner-r40-dramc.c
> @@ -24,7 +24,7 @@
> #include "migration/vmstate.h"
> #include "qemu/log.h"
> #include "qemu/module.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/qdev-properties.h"
> #include "qapi/error.h"
> #include "qemu/bitops.h"
> diff --git a/hw/misc/ivshmem-flat.c b/hw/misc/ivshmem-flat.c
> index 40309a8ff3..076c4b42de 100644
> --- a/hw/misc/ivshmem-flat.c
> +++ b/hw/misc/ivshmem-flat.c
> @@ -17,7 +17,7 @@
> #include "hw/qdev-properties-system.h"
> #include "hw/sysbus.h"
> #include "chardev/char-fe.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "trace.h"
>
> #include "hw/misc/ivshmem-flat.h"
> diff --git a/hw/misc/mac_via.c b/hw/misc/mac_via.c
> index 03b1feda50..3c0819c58a 100644
> --- a/hw/misc/mac_via.c
> +++ b/hw/misc/mac_via.c
> @@ -16,7 +16,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "migration/vmstate.h"
> #include "hw/sysbus.h"
> #include "hw/irq.h"
> diff --git a/hw/net/i82596.c b/hw/net/i82596.c
> index ee919dab3c..64ed3c8390 100644
> --- a/hw/net/i82596.c
> +++ b/hw/net/i82596.c
> @@ -15,7 +15,7 @@
> #include "hw/irq.h"
> #include "hw/qdev-properties.h"
> #include "migration/vmstate.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "qemu/module.h"
> #include "trace.h"
> #include "i82596.h"
> diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
> index a757939cfb..cbfb2b5303 100644
> --- a/hw/nvram/fw_cfg.c
> +++ b/hw/nvram/fw_cfg.c
> @@ -27,7 +27,7 @@
> #include "system/system.h"
> #include "system/dma.h"
> #include "system/reset.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/boards.h"
> #include "hw/nvram/fw_cfg.h"
> #include "hw/qdev-properties.h"
> diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
> index 83d7c2a8af..c2284a7d41 100644
> --- a/hw/openrisc/openrisc_sim.c
> +++ b/hw/openrisc/openrisc_sim.c
> @@ -28,7 +28,7 @@
> #include "net/net.h"
> #include "hw/openrisc/boot.h"
> #include "hw/qdev-properties.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/device_tree.h"
> #include "system/system.h"
> #include "hw/sysbus.h"
> diff --git a/hw/openrisc/virt.c b/hw/openrisc/virt.c
> index 3055306783..0d1c1f103c 100644
> --- a/hw/openrisc/virt.c
> +++ b/hw/openrisc/virt.c
> @@ -11,7 +11,7 @@
> #include "qemu/guest-random.h"
> #include "qapi/error.h"
> #include "cpu.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/irq.h"
> #include "hw/boards.h"
> #include "hw/char/serial-mm.h"
> diff --git a/hw/pci-host/mv64361.c b/hw/pci-host/mv64361.c
> index 9c41c155fb..a297318c6e 100644
> --- a/hw/pci-host/mv64361.c
> +++ b/hw/pci-host/mv64361.c
> @@ -17,7 +17,7 @@
> #include "hw/irq.h"
> #include "hw/intc/i8259.h"
> #include "hw/qdev-properties.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "qemu/log.h"
> #include "qemu/error-report.h"
> #include "trace.h"
> diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
> index 246d6d633b..7b2dc6985c 100644
> --- a/hw/ppc/pegasos2.c
> +++ b/hw/ppc/pegasos2.c
> @@ -31,7 +31,7 @@
> #include "qemu/error-report.h"
> #include "system/kvm.h"
> #include "kvm_ppc.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "qom/qom-qobject.h"
> #include "qobject/qdict.h"
> #include "trace.h"
> diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c
> index 1fe11dde50..f832ee61e8 100644
> --- a/hw/ppc/pnv_psi.c
> +++ b/hw/ppc/pnv_psi.c
> @@ -18,7 +18,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/irq.h"
> #include "target/ppc/cpu.h"
> #include "qemu/log.h"
> diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c
> index 8250824a1a..5c7278ea4b 100644
> --- a/hw/ppc/ppc405_uc.c
> +++ b/hw/ppc/ppc405_uc.c
> @@ -36,7 +36,7 @@
> #include "qemu/timer.h"
> #include "system/reset.h"
> #include "system/system.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/intc/ppc-uic.h"
> #include "trace.h"
>
> diff --git a/hw/ppc/ppc4xx_sdram.c b/hw/ppc/ppc4xx_sdram.c
> index 562bff8d53..bf0faad9e7 100644
> --- a/hw/ppc/ppc4xx_sdram.c
> +++ b/hw/ppc/ppc4xx_sdram.c
> @@ -34,7 +34,7 @@
> #include "qapi/error.h"
> #include "qemu/log.h"
> #include "qemu/error-report.h"
> -#include "exec/address-spaces.h" /* get_system_memory() */
> +#include "system/address-spaces.h" /* get_system_memory() */
> #include "hw/irq.h"
> #include "hw/qdev-properties.h"
> #include "hw/ppc/ppc4xx.h"
> diff --git a/hw/ppc/prep_systemio.c b/hw/ppc/prep_systemio.c
> index b1f2e130f0..08f29e72e4 100644
> --- a/hw/ppc/prep_systemio.c
> +++ b/hw/ppc/prep_systemio.c
> @@ -28,7 +28,7 @@
> #include "hw/isa/isa.h"
> #include "hw/qdev-properties.h"
> #include "migration/vmstate.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "qom/object.h"
> #include "qemu/error-report.h" /* for error_report() */
> #include "qemu/module.h"
> diff --git a/hw/ppc/rs6000_mc.c b/hw/ppc/rs6000_mc.c
> index 0e5d53b8b6..27f1c90f06 100644
> --- a/hw/ppc/rs6000_mc.c
> +++ b/hw/ppc/rs6000_mc.c
> @@ -24,7 +24,7 @@
> #include "hw/isa/isa.h"
> #include "hw/qdev-properties.h"
> #include "migration/vmstate.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "qapi/error.h"
> #include "trace.h"
> #include "qom/object.h"
> diff --git a/hw/ppc/spapr_ovec.c b/hw/ppc/spapr_ovec.c
> index 88e29536aa..6d6eaf67cb 100644
> --- a/hw/ppc/spapr_ovec.c
> +++ b/hw/ppc/spapr_ovec.c
> @@ -15,7 +15,7 @@
> #include "hw/ppc/spapr_ovec.h"
> #include "migration/vmstate.h"
> #include "qemu/bitmap.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "qemu/error-report.h"
> #include "trace.h"
> #include <libfdt.h>
> diff --git a/hw/ppc/vof.c b/hw/ppc/vof.c
> index 09cb77de93..f14efa3a7c 100644
> --- a/hw/ppc/vof.c
> +++ b/hw/ppc/vof.c
> @@ -15,7 +15,7 @@
> #include "qemu/units.h"
> #include "qemu/log.h"
> #include "qapi/error.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/ppc/vof.h"
> #include "hw/ppc/fdt.h"
> #include "system/runstate.h"
> diff --git a/hw/remote/iommu.c b/hw/remote/iommu.c
> index ec845d1f58..3e0758a21e 100644
> --- a/hw/remote/iommu.c
> +++ b/hw/remote/iommu.c
> @@ -14,7 +14,7 @@
> #include "hw/pci/pci_bus.h"
> #include "hw/pci/pci.h"
> #include "system/memory.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "trace.h"
>
> /**
> diff --git a/hw/riscv/microblaze-v-generic.c b/hw/riscv/microblaze-v-generic.c
> index d8e67906d2..e863c50cbc 100644
> --- a/hw/riscv/microblaze-v-generic.c
> +++ b/hw/riscv/microblaze-v-generic.c
> @@ -22,7 +22,7 @@
> #include "net/net.h"
> #include "hw/boards.h"
> #include "hw/char/serial-mm.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/char/xilinx_uartlite.h"
> #include "hw/misc/unimp.h"
>
> diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c
> index 98a67fe52a..019d6b3986 100644
> --- a/hw/riscv/opentitan.c
> +++ b/hw/riscv/opentitan.c
> @@ -28,7 +28,7 @@
> #include "hw/riscv/boot.h"
> #include "qemu/units.h"
> #include "system/system.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
>
> /*
> * This version of the OpenTitan machine currently supports
> diff --git a/hw/riscv/shakti_c.c b/hw/riscv/shakti_c.c
> index e2242b97d0..17c5c72102 100644
> --- a/hw/riscv/shakti_c.c
> +++ b/hw/riscv/shakti_c.c
> @@ -25,7 +25,7 @@
> #include "hw/intc/riscv_aclint.h"
> #include "system/system.h"
> #include "hw/qdev-properties.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/riscv/boot.h"
>
> static const struct MemmapEntry {
> diff --git a/hw/s390x/css.c b/hw/s390x/css.c
> index 738800c98d..2059c5dd0b 100644
> --- a/hw/s390x/css.c
> +++ b/hw/s390x/css.c
> @@ -14,7 +14,7 @@
> #include "qapi/visitor.h"
> #include "qemu/bitops.h"
> #include "qemu/error-report.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/s390x/ioinst.h"
> #include "hw/qdev-properties.h"
> #include "hw/s390x/css.h"
> diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c
> index 811d892122..425e3e4a87 100644
> --- a/hw/s390x/s390-skeys.c
> +++ b/hw/s390x/s390-skeys.c
> @@ -19,7 +19,7 @@
> #include "qobject/qdict.h"
> #include "qemu/error-report.h"
> #include "system/memory_mapping.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/kvm.h"
> #include "migration/qemu-file-types.h"
> #include "migration/register.h"
> diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
> index 43f3b162c8..e8ecb90826 100644
> --- a/hw/s390x/virtio-ccw.c
> +++ b/hw/s390x/virtio-ccw.c
> @@ -12,7 +12,7 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/kvm.h"
> #include "net/net.h"
> #include "hw/virtio/virtio.h"
> diff --git a/hw/sparc/sun4m_iommu.c b/hw/sparc/sun4m_iommu.c
> index 5a4c1f5e3b..4a542b18d2 100644
> --- a/hw/sparc/sun4m_iommu.c
> +++ b/hw/sparc/sun4m_iommu.c
> @@ -29,7 +29,7 @@
> #include "hw/sysbus.h"
> #include "migration/vmstate.h"
> #include "qemu/module.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "trace.h"
>
> /*
> diff --git a/hw/sparc64/sun4u_iommu.c b/hw/sparc64/sun4u_iommu.c
> index eba811af0c..533fcae1fb 100644
> --- a/hw/sparc64/sun4u_iommu.c
> +++ b/hw/sparc64/sun4u_iommu.c
> @@ -27,7 +27,7 @@
> #include "qemu/osdep.h"
> #include "hw/sysbus.h"
> #include "hw/sparc/sun4u_iommu.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "qemu/log.h"
> #include "qemu/module.h"
> #include "trace.h"
> diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
> index ccb97b6806..ea82472105 100644
> --- a/hw/timer/hpet.c
> +++ b/hw/timer/hpet.c
> @@ -36,7 +36,7 @@
> #include "hw/rtc/mc146818rtc_regs.h"
> #include "migration/vmstate.h"
> #include "hw/timer/i8254.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "qom/object.h"
> #include "trace.h"
>
> diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c
> index 6cdeb72df0..b668aee97a 100644
> --- a/hw/tpm/tpm_crb.c
> +++ b/hw/tpm/tpm_crb.c
> @@ -18,7 +18,7 @@
>
> #include "qemu/module.h"
> #include "qapi/error.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/qdev-properties.h"
> #include "hw/pci/pci_ids.h"
> #include "hw/acpi/tpm.h"
> diff --git a/hw/vfio/ap.c b/hw/vfio/ap.c
> index c7ab4ff57a..d6575d7c44 100644
> --- a/hw/vfio/ap.c
> +++ b/hw/vfio/ap.c
> @@ -28,7 +28,7 @@
> #include "migration/vmstate.h"
> #include "hw/qdev-properties.h"
> #include "hw/s390x/ap-bridge.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "qom/object.h"
>
> #define TYPE_VFIO_AP_DEVICE "vfio-ap"
> diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c
> index e5e0d9e3e7..29e804e122 100644
> --- a/hw/vfio/ccw.c
> +++ b/hw/vfio/ccw.c
> @@ -27,7 +27,7 @@
> #include "hw/s390x/vfio-ccw.h"
> #include "hw/qdev-properties.h"
> #include "hw/s390x/ccw-device.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "qemu/error-report.h"
> #include "qemu/main-loop.h"
> #include "qemu/module.h"
> diff --git a/hw/vfio/common.c b/hw/vfio/common.c
> index cdcec21c08..5c3bc88222 100644
> --- a/hw/vfio/common.c
> +++ b/hw/vfio/common.c
> @@ -27,7 +27,7 @@
>
> #include "hw/vfio/vfio-common.h"
> #include "hw/vfio/pci.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/memory.h"
> #include "exec/ram_addr.h"
> #include "hw/hw.h"
> diff --git a/hw/vfio/container.c b/hw/vfio/container.c
> index 1d1c5f9a77..2e993c7e73 100644
> --- a/hw/vfio/container.c
> +++ b/hw/vfio/container.c
> @@ -23,7 +23,7 @@
> #include <linux/vfio.h>
>
> #include "hw/vfio/vfio-common.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/memory.h"
> #include "exec/ram_addr.h"
> #include "qemu/error-report.h"
> diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
> index 96c6bf5654..c6edbdd4ae 100644
> --- a/hw/vfio/platform.c
> +++ b/hw/vfio/platform.c
> @@ -29,7 +29,7 @@
> #include "qemu/module.h"
> #include "qemu/range.h"
> #include "system/memory.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "qemu/queue.h"
> #include "hw/sysbus.h"
> #include "trace.h"
> diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c
> index ad4c499eaf..bc00badb34 100644
> --- a/hw/vfio/spapr.c
> +++ b/hw/vfio/spapr.c
> @@ -15,7 +15,7 @@
> #include <linux/kvm.h>
> #endif
> #include "system/kvm.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
>
> #include "hw/vfio/vfio-common.h"
> #include "hw/hw.h"
> diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
> index 7efbde3d4c..1e0336df1d 100644
> --- a/hw/virtio/vhost-vdpa.c
> +++ b/hw/virtio/vhost-vdpa.c
> @@ -20,7 +20,7 @@
> #include "hw/virtio/virtio-net.h"
> #include "hw/virtio/vhost-shadow-virtqueue.h"
> #include "hw/virtio/vhost-vdpa.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "migration/blocker.h"
> #include "qemu/cutils.h"
> #include "qemu/main-loop.h"
> diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
> index 2eb5a14fa2..0d0603c674 100644
> --- a/hw/virtio/virtio-balloon.c
> +++ b/hw/virtio/virtio-balloon.c
> @@ -24,7 +24,7 @@
> #include "hw/boards.h"
> #include "system/balloon.h"
> #include "hw/virtio/virtio-balloon.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "qapi/error.h"
> #include "qapi/qapi-events-machine.h"
> #include "qapi/visitor.h"
> diff --git a/hw/virtio/virtio-bus.c b/hw/virtio/virtio-bus.c
> index 896feb37a1..d1c79c567b 100644
> --- a/hw/virtio/virtio-bus.c
> +++ b/hw/virtio/virtio-bus.c
> @@ -28,7 +28,7 @@
> #include "qapi/error.h"
> #include "hw/virtio/virtio-bus.h"
> #include "hw/virtio/virtio.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
>
> /* #define DEBUG_VIRTIO_BUS */
>
> diff --git a/monitor/hmp-cmds-target.c b/monitor/hmp-cmds-target.c
> index 6654d31406..011a367357 100644
> --- a/monitor/hmp-cmds-target.c
> +++ b/monitor/hmp-cmds-target.c
> @@ -24,7 +24,7 @@
>
> #include "qemu/osdep.h"
> #include "disas/disas.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/memory.h"
> #include "monitor/hmp-target.h"
> #include "monitor/monitor-internal.h"
> diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
> index 7ded3378cf..8ddcdd76c1 100644
> --- a/monitor/hmp-cmds.c
> +++ b/monitor/hmp-cmds.c
> @@ -14,7 +14,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "exec/ioport.h"
> #include "exec/gdbstub.h"
> #include "gdbstub/enums.h"
> diff --git a/system/ioport.c b/system/ioport.c
> index 5f8718486c..2bc14bdcfa 100644
> --- a/system/ioport.c
> +++ b/system/ioport.c
> @@ -29,7 +29,7 @@
> #include "cpu.h"
> #include "exec/ioport.h"
> #include "system/memory.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "trace.h"
>
> struct MemoryRegionPortioList {
> diff --git a/system/memory.c b/system/memory.c
> index 6d6b33b366..050bffdbf8 100644
> --- a/system/memory.c
> +++ b/system/memory.c
> @@ -33,7 +33,7 @@
> #include "qemu/accel.h"
> #include "hw/boards.h"
> #include "migration/vmstate.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
>
> //#define DEBUG_UNASSIGNED
>
> diff --git a/system/memory_mapping.c b/system/memory_mapping.c
> index 8538a8241e..da708a08ab 100644
> --- a/system/memory_mapping.c
> +++ b/system/memory_mapping.c
> @@ -17,7 +17,7 @@
>
> #include "system/memory_mapping.h"
> #include "system/memory.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/core/cpu.h"
>
> //#define DEBUG_GUEST_PHYS_REGION_ADD
> diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c
> index 2439af63a0..93a3f9b53d 100644
> --- a/target/arm/hvf/hvf.c
> +++ b/target/arm/hvf/hvf.c
> @@ -22,7 +22,7 @@
>
> #include <mach/mach_time.h>
>
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/boards.h"
> #include "hw/irq.h"
> #include "qemu/main-loop.h"
> diff --git a/target/arm/kvm.c b/target/arm/kvm.c
> index da30bdbb23..97de8c7e93 100644
> --- a/target/arm/kvm.c
> +++ b/target/arm/kvm.c
> @@ -30,7 +30,7 @@
> #include "internals.h"
> #include "hw/pci/pci.h"
> #include "exec/memattrs.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "gdbstub/enums.h"
> #include "hw/boards.h"
> #include "hw/irq.h"
> diff --git a/target/avr/helper.c b/target/avr/helper.c
> index 3412312ad5..a1e2cc9c35 100644
> --- a/target/avr/helper.c
> +++ b/target/avr/helper.c
> @@ -26,7 +26,7 @@
> #include "exec/cputlb.h"
> #include "exec/page-protection.h"
> #include "exec/cpu_ldst.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "exec/helper-proto.h"
>
> bool avr_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
> diff --git a/target/i386/cpu-apic.c b/target/i386/cpu-apic.c
> index c1708b04bb..242a05fdbe 100644
> --- a/target/i386/cpu-apic.c
> +++ b/target/i386/cpu-apic.c
> @@ -14,7 +14,7 @@
> #include "system/hw_accel.h"
> #include "system/kvm.h"
> #include "system/xen.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/qdev-properties.h"
> #include "hw/i386/apic_internal.h"
> #include "cpu-internal.h"
> diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> index 1b64ceaaba..dba1b3ffef 100644
> --- a/target/i386/cpu.c
> +++ b/target/i386/cpu.c
> @@ -38,7 +38,7 @@
> #ifndef CONFIG_USER_ONLY
> #include "system/reset.h"
> #include "qapi/qapi-commands-machine-target.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/boards.h"
> #include "hw/i386/sgx-epc.h"
> #endif
> diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c
> index e81a245881..b23010374f 100644
> --- a/target/i386/kvm/xen-emu.c
> +++ b/target/i386/kvm/xen-emu.c
> @@ -17,7 +17,7 @@
> #include "system/kvm_int.h"
> #include "system/kvm_xen.h"
> #include "kvm/kvm_i386.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "xen-emu.h"
> #include "trace.h"
> #include "system/runstate.h"
> diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c
> index 04e5f7e637..91f0e32366 100644
> --- a/target/i386/nvmm/nvmm-all.c
> +++ b/target/i386/nvmm/nvmm-all.c
> @@ -9,7 +9,7 @@
>
> #include "qemu/osdep.h"
> #include "cpu.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "exec/ioport.h"
> #include "qemu/accel.h"
> #include "system/nvmm.h"
> diff --git a/target/i386/sev.c b/target/i386/sev.c
> index 0e1dbb6959..ba88976e9f 100644
> --- a/target/i386/sev.c
> +++ b/target/i386/sev.c
> @@ -39,7 +39,7 @@
> #include "qapi/qapi-commands-misc-target.h"
> #include "confidential-guest.h"
> #include "hw/i386/pc.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "qemu/queue.h"
>
> OBJECT_DECLARE_TYPE(SevCommonState, SevCommonStateClass, SEV_COMMON)
> diff --git a/target/i386/tcg/system/misc_helper.c b/target/i386/tcg/system/misc_helper.c
> index ce18c75b9f..0555cf2604 100644
> --- a/target/i386/tcg/system/misc_helper.c
> +++ b/target/i386/tcg/system/misc_helper.c
> @@ -22,7 +22,7 @@
> #include "cpu.h"
> #include "exec/helper-proto.h"
> #include "exec/cpu_ldst.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "exec/cputlb.h"
> #include "tcg/helper-tcg.h"
> #include "hw/i386/apic.h"
> diff --git a/target/i386/tcg/system/tcg-cpu.c b/target/i386/tcg/system/tcg-cpu.c
> index 13a3507863..ab1f3c7c59 100644
> --- a/target/i386/tcg/system/tcg-cpu.c
> +++ b/target/i386/tcg/system/tcg-cpu.c
> @@ -23,7 +23,7 @@
>
> #include "system/system.h"
> #include "qemu/units.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
>
> #include "tcg/tcg-cpu.h"
>
> diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
> index 41fb8c5a4e..d58cb11cee 100644
> --- a/target/i386/whpx/whpx-all.c
> +++ b/target/i386/whpx/whpx-all.c
> @@ -10,7 +10,7 @@
>
> #include "qemu/osdep.h"
> #include "cpu.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "exec/ioport.h"
> #include "gdbstub/helpers.h"
> #include "qemu/accel.h"
> diff --git a/target/loongarch/kvm/kvm.c b/target/loongarch/kvm/kvm.c
> index 28735c80be..1668f12410 100644
> --- a/target/loongarch/kvm/kvm.c
> +++ b/target/loongarch/kvm/kvm.c
> @@ -18,7 +18,7 @@
> #include "system/kvm_int.h"
> #include "hw/pci/pci.h"
> #include "exec/memattrs.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/boards.h"
> #include "hw/irq.h"
> #include "hw/loongarch/virt.h"
> diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c
> index 4ffeeaa1c9..9686fa86e0 100644
> --- a/target/riscv/kvm/kvm-cpu.c
> +++ b/target/riscv/kvm/kvm-cpu.c
> @@ -35,7 +35,7 @@
> #include "accel/accel-cpu-target.h"
> #include "hw/pci/pci.h"
> #include "exec/memattrs.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/boards.h"
> #include "hw/irq.h"
> #include "hw/intc/riscv_imsic.h"
> diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c
> index d8f483898d..b079d120db 100644
> --- a/target/s390x/mmu_helper.c
> +++ b/target/s390x/mmu_helper.c
> @@ -17,7 +17,7 @@
>
> #include "qemu/osdep.h"
> #include "qemu/error-report.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "cpu.h"
> #include "s390x-internal.h"
> #include "kvm/kvm_s390x.h"
> diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c
> index 6a4d9c5081..a3347f1236 100644
> --- a/target/s390x/sigp.c
> +++ b/target/s390x/sigp.c
> @@ -14,7 +14,7 @@
> #include "hw/boards.h"
> #include "system/hw_accel.h"
> #include "system/runstate.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "exec/cputlb.h"
> #include "exec/exec-all.h"
> #include "system/tcg.h"
> diff --git a/target/s390x/tcg/excp_helper.c b/target/s390x/tcg/excp_helper.c
> index f969850f87..ac733f407f 100644
> --- a/target/s390x/tcg/excp_helper.c
> +++ b/target/s390x/tcg/excp_helper.c
> @@ -28,7 +28,7 @@
> #include "tcg_s390x.h"
> #ifndef CONFIG_USER_ONLY
> #include "qemu/timer.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "hw/s390x/ioinst.h"
> #include "hw/s390x/s390_flic.h"
> #include "hw/boards.h"
> diff --git a/target/xtensa/dbg_helper.c b/target/xtensa/dbg_helper.c
> index 5546c82ecd..163a1ffc7b 100644
> --- a/target/xtensa/dbg_helper.c
> +++ b/target/xtensa/dbg_helper.c
> @@ -31,7 +31,7 @@
> #include "exec/helper-proto.h"
> #include "qemu/host-utils.h"
> #include "exec/exec-all.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
>
> void HELPER(wsr_ibreakenable)(CPUXtensaState *env, uint32_t v)
> {
> diff --git a/hw/display/apple-gfx.m b/hw/display/apple-gfx.m
> index c4323574e1..2ff1c90df7 100644
> --- a/hw/display/apple-gfx.m
> +++ b/hw/display/apple-gfx.m
> @@ -18,7 +18,7 @@
> #include "qapi/visitor.h"
> #include "qapi/error.h"
> #include "block/aio-wait.h"
> -#include "exec/address-spaces.h"
> +#include "system/address-spaces.h"
> #include "system/dma.h"
> #include "migration/blocker.h"
> #include "ui/console.h"
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 16/37] include/system: Move exec/ioport.h to system/ioport.h
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (14 preceding siblings ...)
2025-03-13 3:44 ` [PATCH 15/37] include/system: Move exec/address-spaces.h to system/address-spaces.h Richard Henderson
@ 2025-03-13 3:44 ` Richard Henderson
2025-03-13 17:35 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 17/37] meson: Introduce top-level libuser_ss and libsystem_ss Richard Henderson
` (22 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
Convert the existing includes with sed.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
hw/display/vga_int.h | 2 +-
include/hw/char/parallel-isa.h | 2 +-
include/hw/dma/i8257.h | 2 +-
include/hw/ide/ide-bus.h | 2 +-
include/hw/isa/isa.h | 2 +-
include/{exec => system}/ioport.h | 6 ++----
hw/block/fdc-isa.c | 2 +-
monitor/hmp-cmds.c | 2 +-
system/ioport.c | 2 +-
system/physmem.c | 2 +-
system/qtest.c | 2 +-
target/i386/nvmm/nvmm-all.c | 2 +-
target/i386/whpx/whpx-all.c | 2 +-
tests/qtest/fuzz/qtest_wrappers.c | 2 +-
MAINTAINERS | 2 +-
15 files changed, 16 insertions(+), 18 deletions(-)
rename include/{exec => system}/ioport.h (97%)
diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h
index 60ad26e03e..747b5cc6cf 100644
--- a/hw/display/vga_int.h
+++ b/hw/display/vga_int.h
@@ -26,7 +26,7 @@
#define HW_VGA_INT_H
#include "ui/console.h"
-#include "exec/ioport.h"
+#include "system/ioport.h"
#include "system/memory.h"
#include "hw/display/bochs-vbe.h"
diff --git a/include/hw/char/parallel-isa.h b/include/hw/char/parallel-isa.h
index 5284b2ffec..3edaf9dbe4 100644
--- a/include/hw/char/parallel-isa.h
+++ b/include/hw/char/parallel-isa.h
@@ -12,7 +12,7 @@
#include "parallel.h"
-#include "exec/ioport.h"
+#include "system/ioport.h"
#include "hw/isa/isa.h"
#include "qom/object.h"
diff --git a/include/hw/dma/i8257.h b/include/hw/dma/i8257.h
index 4342e4a91e..33b6286d5a 100644
--- a/include/hw/dma/i8257.h
+++ b/include/hw/dma/i8257.h
@@ -2,7 +2,7 @@
#define HW_I8257_H
#include "hw/isa/isa.h"
-#include "exec/ioport.h"
+#include "system/ioport.h"
#include "qom/object.h"
#define TYPE_I8257 "i8257"
diff --git a/include/hw/ide/ide-bus.h b/include/hw/ide/ide-bus.h
index 4841a7dcd6..121b455fcd 100644
--- a/include/hw/ide/ide-bus.h
+++ b/include/hw/ide/ide-bus.h
@@ -1,7 +1,7 @@
#ifndef HW_IDE_BUS_H
#define HW_IDE_BUS_H
-#include "exec/ioport.h"
+#include "system/ioport.h"
#include "hw/ide/ide-dev.h"
#include "hw/ide/ide-dma.h"
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index 1d852011b3..a82c5f1004 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -4,7 +4,7 @@
/* ISA bus */
#include "system/memory.h"
-#include "exec/ioport.h"
+#include "system/ioport.h"
#include "hw/qdev-core.h"
#include "qom/object.h"
diff --git a/include/exec/ioport.h b/include/system/ioport.h
similarity index 97%
rename from include/exec/ioport.h
rename to include/system/ioport.h
index ecea3575bc..780ea5a676 100644
--- a/include/exec/ioport.h
+++ b/include/system/ioport.h
@@ -21,8 +21,8 @@
* IO ports API
*/
-#ifndef IOPORT_H
-#define IOPORT_H
+#ifndef SYSTEM_IOPORT_H
+#define SYSTEM_IOPORT_H
#include "system/memory.h"
@@ -39,9 +39,7 @@ typedef struct MemoryRegionPortio {
#define PORTIO_END_OF_LIST() { }
-#ifndef CONFIG_USER_ONLY
extern const MemoryRegionOps unassigned_io_ops;
-#endif
void cpu_outb(uint32_t addr, uint8_t val);
void cpu_outw(uint32_t addr, uint16_t val);
diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c
index a10c24aab1..561cfa47c1 100644
--- a/hw/block/fdc-isa.c
+++ b/hw/block/fdc-isa.c
@@ -42,7 +42,7 @@
#include "system/block-backend.h"
#include "system/blockdev.h"
#include "system/system.h"
-#include "exec/ioport.h"
+#include "system/ioport.h"
#include "qemu/log.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
index 8ddcdd76c1..74a0f56566 100644
--- a/monitor/hmp-cmds.c
+++ b/monitor/hmp-cmds.c
@@ -15,7 +15,7 @@
#include "qemu/osdep.h"
#include "system/address-spaces.h"
-#include "exec/ioport.h"
+#include "system/ioport.h"
#include "exec/gdbstub.h"
#include "gdbstub/enums.h"
#include "monitor/hmp.h"
diff --git a/system/ioport.c b/system/ioport.c
index 2bc14bdcfa..ec5c586cf8 100644
--- a/system/ioport.c
+++ b/system/ioport.c
@@ -27,7 +27,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "exec/ioport.h"
+#include "system/ioport.h"
#include "system/memory.h"
#include "system/address-spaces.h"
#include "trace.h"
diff --git a/system/physmem.c b/system/physmem.c
index be92969a4a..2850e14780 100644
--- a/system/physmem.c
+++ b/system/physmem.c
@@ -51,7 +51,7 @@
#include "qemu/memalign.h"
#include "qemu/memfd.h"
#include "system/memory.h"
-#include "exec/ioport.h"
+#include "system/ioport.h"
#include "system/dma.h"
#include "system/hostmem.h"
#include "system/hw_accel.h"
diff --git a/system/qtest.c b/system/qtest.c
index 5407289154..523a047995 100644
--- a/system/qtest.c
+++ b/system/qtest.c
@@ -16,7 +16,7 @@
#include "system/qtest.h"
#include "system/runstate.h"
#include "chardev/char-fe.h"
-#include "exec/ioport.h"
+#include "system/ioport.h"
#include "system/memory.h"
#include "exec/tswap.h"
#include "hw/qdev-core.h"
diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c
index 91f0e32366..17394d073d 100644
--- a/target/i386/nvmm/nvmm-all.c
+++ b/target/i386/nvmm/nvmm-all.c
@@ -10,7 +10,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "system/address-spaces.h"
-#include "exec/ioport.h"
+#include "system/ioport.h"
#include "qemu/accel.h"
#include "system/nvmm.h"
#include "system/cpus.h"
diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
index d58cb11cee..b64852e13e 100644
--- a/target/i386/whpx/whpx-all.c
+++ b/target/i386/whpx/whpx-all.c
@@ -11,7 +11,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "system/address-spaces.h"
-#include "exec/ioport.h"
+#include "system/ioport.h"
#include "gdbstub/helpers.h"
#include "qemu/accel.h"
#include "system/whpx.h"
diff --git a/tests/qtest/fuzz/qtest_wrappers.c b/tests/qtest/fuzz/qtest_wrappers.c
index 0580f8df86..d7adcbe3fd 100644
--- a/tests/qtest/fuzz/qtest_wrappers.c
+++ b/tests/qtest/fuzz/qtest_wrappers.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "hw/core/cpu.h"
-#include "exec/ioport.h"
+#include "system/ioport.h"
#include "fuzz.h"
diff --git a/MAINTAINERS b/MAINTAINERS
index b5f1e81771..751d611613 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3107,7 +3107,7 @@ M: Peter Xu <peterx@redhat.com>
M: David Hildenbrand <david@redhat.com>
R: Philippe Mathieu-Daudé <philmd@linaro.org>
S: Supported
-F: include/exec/ioport.h
+F: include/system/ioport.h
F: include/exec/memop.h
F: include/system/memory.h
F: include/exec/ram_addr.h
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 16/37] include/system: Move exec/ioport.h to system/ioport.h
2025-03-13 3:44 ` [PATCH 16/37] include/system: Move exec/ioport.h to system/ioport.h Richard Henderson
@ 2025-03-13 17:35 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 17:35 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> Convert the existing includes with sed.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> hw/display/vga_int.h | 2 +-
> include/hw/char/parallel-isa.h | 2 +-
> include/hw/dma/i8257.h | 2 +-
> include/hw/ide/ide-bus.h | 2 +-
> include/hw/isa/isa.h | 2 +-
> include/{exec => system}/ioport.h | 6 ++----
> hw/block/fdc-isa.c | 2 +-
> monitor/hmp-cmds.c | 2 +-
> system/ioport.c | 2 +-
> system/physmem.c | 2 +-
> system/qtest.c | 2 +-
> target/i386/nvmm/nvmm-all.c | 2 +-
> target/i386/whpx/whpx-all.c | 2 +-
> tests/qtest/fuzz/qtest_wrappers.c | 2 +-
> MAINTAINERS | 2 +-
> 15 files changed, 16 insertions(+), 18 deletions(-)
> rename include/{exec => system}/ioport.h (97%)
>
> diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h
> index 60ad26e03e..747b5cc6cf 100644
> --- a/hw/display/vga_int.h
> +++ b/hw/display/vga_int.h
> @@ -26,7 +26,7 @@
> #define HW_VGA_INT_H
>
> #include "ui/console.h"
> -#include "exec/ioport.h"
> +#include "system/ioport.h"
> #include "system/memory.h"
>
> #include "hw/display/bochs-vbe.h"
> diff --git a/include/hw/char/parallel-isa.h b/include/hw/char/parallel-isa.h
> index 5284b2ffec..3edaf9dbe4 100644
> --- a/include/hw/char/parallel-isa.h
> +++ b/include/hw/char/parallel-isa.h
> @@ -12,7 +12,7 @@
>
> #include "parallel.h"
>
> -#include "exec/ioport.h"
> +#include "system/ioport.h"
> #include "hw/isa/isa.h"
> #include "qom/object.h"
>
> diff --git a/include/hw/dma/i8257.h b/include/hw/dma/i8257.h
> index 4342e4a91e..33b6286d5a 100644
> --- a/include/hw/dma/i8257.h
> +++ b/include/hw/dma/i8257.h
> @@ -2,7 +2,7 @@
> #define HW_I8257_H
>
> #include "hw/isa/isa.h"
> -#include "exec/ioport.h"
> +#include "system/ioport.h"
> #include "qom/object.h"
>
> #define TYPE_I8257 "i8257"
> diff --git a/include/hw/ide/ide-bus.h b/include/hw/ide/ide-bus.h
> index 4841a7dcd6..121b455fcd 100644
> --- a/include/hw/ide/ide-bus.h
> +++ b/include/hw/ide/ide-bus.h
> @@ -1,7 +1,7 @@
> #ifndef HW_IDE_BUS_H
> #define HW_IDE_BUS_H
>
> -#include "exec/ioport.h"
> +#include "system/ioport.h"
> #include "hw/ide/ide-dev.h"
> #include "hw/ide/ide-dma.h"
>
> diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
> index 1d852011b3..a82c5f1004 100644
> --- a/include/hw/isa/isa.h
> +++ b/include/hw/isa/isa.h
> @@ -4,7 +4,7 @@
> /* ISA bus */
>
> #include "system/memory.h"
> -#include "exec/ioport.h"
> +#include "system/ioport.h"
> #include "hw/qdev-core.h"
> #include "qom/object.h"
>
> diff --git a/include/exec/ioport.h b/include/system/ioport.h
> similarity index 97%
> rename from include/exec/ioport.h
> rename to include/system/ioport.h
> index ecea3575bc..780ea5a676 100644
> --- a/include/exec/ioport.h
> +++ b/include/system/ioport.h
> @@ -21,8 +21,8 @@
> * IO ports API
> */
>
> -#ifndef IOPORT_H
> -#define IOPORT_H
> +#ifndef SYSTEM_IOPORT_H
> +#define SYSTEM_IOPORT_H
>
> #include "system/memory.h"
>
> @@ -39,9 +39,7 @@ typedef struct MemoryRegionPortio {
>
> #define PORTIO_END_OF_LIST() { }
>
> -#ifndef CONFIG_USER_ONLY
> extern const MemoryRegionOps unassigned_io_ops;
> -#endif
>
> void cpu_outb(uint32_t addr, uint8_t val);
> void cpu_outw(uint32_t addr, uint16_t val);
> diff --git a/hw/block/fdc-isa.c b/hw/block/fdc-isa.c
> index a10c24aab1..561cfa47c1 100644
> --- a/hw/block/fdc-isa.c
> +++ b/hw/block/fdc-isa.c
> @@ -42,7 +42,7 @@
> #include "system/block-backend.h"
> #include "system/blockdev.h"
> #include "system/system.h"
> -#include "exec/ioport.h"
> +#include "system/ioport.h"
> #include "qemu/log.h"
> #include "qemu/main-loop.h"
> #include "qemu/module.h"
> diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
> index 8ddcdd76c1..74a0f56566 100644
> --- a/monitor/hmp-cmds.c
> +++ b/monitor/hmp-cmds.c
> @@ -15,7 +15,7 @@
>
> #include "qemu/osdep.h"
> #include "system/address-spaces.h"
> -#include "exec/ioport.h"
> +#include "system/ioport.h"
> #include "exec/gdbstub.h"
> #include "gdbstub/enums.h"
> #include "monitor/hmp.h"
> diff --git a/system/ioport.c b/system/ioport.c
> index 2bc14bdcfa..ec5c586cf8 100644
> --- a/system/ioport.c
> +++ b/system/ioport.c
> @@ -27,7 +27,7 @@
>
> #include "qemu/osdep.h"
> #include "cpu.h"
> -#include "exec/ioport.h"
> +#include "system/ioport.h"
> #include "system/memory.h"
> #include "system/address-spaces.h"
> #include "trace.h"
> diff --git a/system/physmem.c b/system/physmem.c
> index be92969a4a..2850e14780 100644
> --- a/system/physmem.c
> +++ b/system/physmem.c
> @@ -51,7 +51,7 @@
> #include "qemu/memalign.h"
> #include "qemu/memfd.h"
> #include "system/memory.h"
> -#include "exec/ioport.h"
> +#include "system/ioport.h"
> #include "system/dma.h"
> #include "system/hostmem.h"
> #include "system/hw_accel.h"
> diff --git a/system/qtest.c b/system/qtest.c
> index 5407289154..523a047995 100644
> --- a/system/qtest.c
> +++ b/system/qtest.c
> @@ -16,7 +16,7 @@
> #include "system/qtest.h"
> #include "system/runstate.h"
> #include "chardev/char-fe.h"
> -#include "exec/ioport.h"
> +#include "system/ioport.h"
> #include "system/memory.h"
> #include "exec/tswap.h"
> #include "hw/qdev-core.h"
> diff --git a/target/i386/nvmm/nvmm-all.c b/target/i386/nvmm/nvmm-all.c
> index 91f0e32366..17394d073d 100644
> --- a/target/i386/nvmm/nvmm-all.c
> +++ b/target/i386/nvmm/nvmm-all.c
> @@ -10,7 +10,7 @@
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "system/address-spaces.h"
> -#include "exec/ioport.h"
> +#include "system/ioport.h"
> #include "qemu/accel.h"
> #include "system/nvmm.h"
> #include "system/cpus.h"
> diff --git a/target/i386/whpx/whpx-all.c b/target/i386/whpx/whpx-all.c
> index d58cb11cee..b64852e13e 100644
> --- a/target/i386/whpx/whpx-all.c
> +++ b/target/i386/whpx/whpx-all.c
> @@ -11,7 +11,7 @@
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "system/address-spaces.h"
> -#include "exec/ioport.h"
> +#include "system/ioport.h"
> #include "gdbstub/helpers.h"
> #include "qemu/accel.h"
> #include "system/whpx.h"
> diff --git a/tests/qtest/fuzz/qtest_wrappers.c b/tests/qtest/fuzz/qtest_wrappers.c
> index 0580f8df86..d7adcbe3fd 100644
> --- a/tests/qtest/fuzz/qtest_wrappers.c
> +++ b/tests/qtest/fuzz/qtest_wrappers.c
> @@ -13,7 +13,7 @@
>
> #include "qemu/osdep.h"
> #include "hw/core/cpu.h"
> -#include "exec/ioport.h"
> +#include "system/ioport.h"
>
> #include "fuzz.h"
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index b5f1e81771..751d611613 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3107,7 +3107,7 @@ M: Peter Xu <peterx@redhat.com>
> M: David Hildenbrand <david@redhat.com>
> R: Philippe Mathieu-Daudé <philmd@linaro.org>
> S: Supported
> -F: include/exec/ioport.h
> +F: include/system/ioport.h
> F: include/exec/memop.h
> F: include/system/memory.h
> F: include/exec/ram_addr.h
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 17/37] meson: Introduce top-level libuser_ss and libsystem_ss
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (15 preceding siblings ...)
2025-03-13 3:44 ` [PATCH 16/37] include/system: Move exec/ioport.h to system/ioport.h Richard Henderson
@ 2025-03-13 3:44 ` Richard Henderson
2025-03-13 17:36 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 18/37] gdbstub: Move syscalls.c out of common_ss Richard Henderson
` (21 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
We already have two subdirectories for which we need
to build files twice, for user vs system modes.
Move this handling to the top level.
This cannot be combined with user_ss or system_ss,
because the formulation has not been extended to support
configuration symbols.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
gdbstub/meson.build | 32 ++++++++------------------------
meson.build | 22 ++++++++++++++++++++++
tcg/meson.build | 23 ++---------------------
3 files changed, 32 insertions(+), 45 deletions(-)
diff --git a/gdbstub/meson.build b/gdbstub/meson.build
index dff741ddd4..0e8099ae9c 100644
--- a/gdbstub/meson.build
+++ b/gdbstub/meson.build
@@ -4,32 +4,16 @@
# types such as hwaddr.
#
-# We need to build the core gdb code via a library to be able to tweak
-# cflags so:
-
-gdb_user_ss = ss.source_set()
-gdb_system_ss = ss.source_set()
-
# We build two versions of gdbstub, one for each mode
-gdb_user_ss.add(files('gdbstub.c', 'user.c'))
-gdb_system_ss.add(files('gdbstub.c', 'system.c'))
+libuser_ss.add(files(
+ 'gdbstub.c',
+ 'user.c'
+))
-gdb_user_ss = gdb_user_ss.apply({})
-gdb_system_ss = gdb_system_ss.apply({})
-
-libgdb_user = static_library('gdb_user',
- gdb_user_ss.sources() + genh,
- c_args: '-DCONFIG_USER_ONLY',
- build_by_default: false)
-
-libgdb_system = static_library('gdb_system',
- gdb_system_ss.sources() + genh,
- build_by_default: false)
-
-gdb_user = declare_dependency(objects: libgdb_user.extract_all_objects(recursive: false))
-user_ss.add(gdb_user)
-gdb_system = declare_dependency(objects: libgdb_system.extract_all_objects(recursive: false))
-system_ss.add(gdb_system)
+libsystem_ss.add(files(
+ 'gdbstub.c',
+ 'system.c'
+))
common_ss.add(files('syscalls.c'))
diff --git a/meson.build b/meson.build
index 9d9c11731f..3869e5bfbc 100644
--- a/meson.build
+++ b/meson.build
@@ -3655,12 +3655,14 @@ io_ss = ss.source_set()
qmp_ss = ss.source_set()
qom_ss = ss.source_set()
system_ss = ss.source_set()
+libsystem_ss = ss.source_set()
specific_fuzz_ss = ss.source_set()
specific_ss = ss.source_set()
rust_devices_ss = ss.source_set()
stub_ss = ss.source_set()
trace_ss = ss.source_set()
user_ss = ss.source_set()
+libuser_ss = ss.source_set()
util_ss = ss.source_set()
# accel modules
@@ -4038,6 +4040,26 @@ common_ss.add(qom, qemuutil)
common_ss.add_all(when: 'CONFIG_SYSTEM_ONLY', if_true: [system_ss])
common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss)
+libuser_ss = libuser_ss.apply({})
+libuser = static_library('user',
+ libuser_ss.sources() + genh,
+ c_args: '-DCONFIG_USER_ONLY',
+ dependencies: libuser_ss.dependencies(),
+ build_by_default: false)
+libuser = declare_dependency(objects: libuser.extract_all_objects(recursive: false),
+ dependencies: libuser_ss.dependencies())
+common_ss.add(when: 'CONFIG_USER_ONLY', if_true: libuser)
+
+libsystem_ss = libsystem_ss.apply({})
+libsystem = static_library('system',
+ libsystem_ss.sources() + genh,
+ c_args: '-DCONFIG_SOFTMMU',
+ dependencies: libsystem_ss.dependencies(),
+ build_by_default: false)
+libsystem = declare_dependency(objects: libsystem.extract_all_objects(recursive: false),
+ dependencies: libsystem_ss.dependencies())
+common_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: libsystem)
+
# Note that this library is never used directly (only through extract_objects)
# and is not built by default; therefore, source files not used by the build
# configuration will be in build.ninja, but are never built by default.
diff --git a/tcg/meson.build b/tcg/meson.build
index 69ebb4908a..7df378d773 100644
--- a/tcg/meson.build
+++ b/tcg/meson.build
@@ -27,24 +27,5 @@ if host_os == 'linux'
tcg_ss.add(files('perf.c'))
endif
-tcg_ss = tcg_ss.apply({})
-
-libtcg_user = static_library('tcg_user',
- tcg_ss.sources() + genh,
- dependencies: tcg_ss.dependencies(),
- c_args: '-DCONFIG_USER_ONLY',
- build_by_default: false)
-
-tcg_user = declare_dependency(objects: libtcg_user.extract_all_objects(recursive: false),
- dependencies: tcg_ss.dependencies())
-user_ss.add(tcg_user)
-
-libtcg_system = static_library('tcg_system',
- tcg_ss.sources() + genh,
- dependencies: tcg_ss.dependencies(),
- c_args: '-DCONFIG_SOFTMMU',
- build_by_default: false)
-
-tcg_system = declare_dependency(objects: libtcg_system.extract_all_objects(recursive: false),
- dependencies: tcg_ss.dependencies())
-system_ss.add(tcg_system)
+libuser_ss.add_all(tcg_ss)
+libsystem_ss.add_all(tcg_ss)
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 17/37] meson: Introduce top-level libuser_ss and libsystem_ss
2025-03-13 3:44 ` [PATCH 17/37] meson: Introduce top-level libuser_ss and libsystem_ss Richard Henderson
@ 2025-03-13 17:36 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 17:36 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> We already have two subdirectories for which we need
> to build files twice, for user vs system modes.
> Move this handling to the top level.
>
> This cannot be combined with user_ss or system_ss,
> because the formulation has not been extended to support
> configuration symbols.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> gdbstub/meson.build | 32 ++++++++------------------------
> meson.build | 22 ++++++++++++++++++++++
> tcg/meson.build | 23 ++---------------------
> 3 files changed, 32 insertions(+), 45 deletions(-)
>
> diff --git a/gdbstub/meson.build b/gdbstub/meson.build
> index dff741ddd4..0e8099ae9c 100644
> --- a/gdbstub/meson.build
> +++ b/gdbstub/meson.build
> @@ -4,32 +4,16 @@
> # types such as hwaddr.
> #
>
> -# We need to build the core gdb code via a library to be able to tweak
> -# cflags so:
> -
> -gdb_user_ss = ss.source_set()
> -gdb_system_ss = ss.source_set()
> -
> # We build two versions of gdbstub, one for each mode
> -gdb_user_ss.add(files('gdbstub.c', 'user.c'))
> -gdb_system_ss.add(files('gdbstub.c', 'system.c'))
> +libuser_ss.add(files(
> + 'gdbstub.c',
> + 'user.c'
> +))
>
> -gdb_user_ss = gdb_user_ss.apply({})
> -gdb_system_ss = gdb_system_ss.apply({})
> -
> -libgdb_user = static_library('gdb_user',
> - gdb_user_ss.sources() + genh,
> - c_args: '-DCONFIG_USER_ONLY',
> - build_by_default: false)
> -
> -libgdb_system = static_library('gdb_system',
> - gdb_system_ss.sources() + genh,
> - build_by_default: false)
> -
> -gdb_user = declare_dependency(objects: libgdb_user.extract_all_objects(recursive: false))
> -user_ss.add(gdb_user)
> -gdb_system = declare_dependency(objects: libgdb_system.extract_all_objects(recursive: false))
> -system_ss.add(gdb_system)
> +libsystem_ss.add(files(
> + 'gdbstub.c',
> + 'system.c'
> +))
>
> common_ss.add(files('syscalls.c'))
>
> diff --git a/meson.build b/meson.build
> index 9d9c11731f..3869e5bfbc 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -3655,12 +3655,14 @@ io_ss = ss.source_set()
> qmp_ss = ss.source_set()
> qom_ss = ss.source_set()
> system_ss = ss.source_set()
> +libsystem_ss = ss.source_set()
> specific_fuzz_ss = ss.source_set()
> specific_ss = ss.source_set()
> rust_devices_ss = ss.source_set()
> stub_ss = ss.source_set()
> trace_ss = ss.source_set()
> user_ss = ss.source_set()
> +libuser_ss = ss.source_set()
> util_ss = ss.source_set()
>
> # accel modules
> @@ -4038,6 +4040,26 @@ common_ss.add(qom, qemuutil)
> common_ss.add_all(when: 'CONFIG_SYSTEM_ONLY', if_true: [system_ss])
> common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss)
>
> +libuser_ss = libuser_ss.apply({})
> +libuser = static_library('user',
> + libuser_ss.sources() + genh,
> + c_args: '-DCONFIG_USER_ONLY',
> + dependencies: libuser_ss.dependencies(),
> + build_by_default: false)
> +libuser = declare_dependency(objects: libuser.extract_all_objects(recursive: false),
> + dependencies: libuser_ss.dependencies())
> +common_ss.add(when: 'CONFIG_USER_ONLY', if_true: libuser)
> +
> +libsystem_ss = libsystem_ss.apply({})
> +libsystem = static_library('system',
> + libsystem_ss.sources() + genh,
> + c_args: '-DCONFIG_SOFTMMU',
> + dependencies: libsystem_ss.dependencies(),
> + build_by_default: false)
> +libsystem = declare_dependency(objects: libsystem.extract_all_objects(recursive: false),
> + dependencies: libsystem_ss.dependencies())
> +common_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_true: libsystem)
> +
> # Note that this library is never used directly (only through extract_objects)
> # and is not built by default; therefore, source files not used by the build
> # configuration will be in build.ninja, but are never built by default.
> diff --git a/tcg/meson.build b/tcg/meson.build
> index 69ebb4908a..7df378d773 100644
> --- a/tcg/meson.build
> +++ b/tcg/meson.build
> @@ -27,24 +27,5 @@ if host_os == 'linux'
> tcg_ss.add(files('perf.c'))
> endif
>
> -tcg_ss = tcg_ss.apply({})
> -
> -libtcg_user = static_library('tcg_user',
> - tcg_ss.sources() + genh,
> - dependencies: tcg_ss.dependencies(),
> - c_args: '-DCONFIG_USER_ONLY',
> - build_by_default: false)
> -
> -tcg_user = declare_dependency(objects: libtcg_user.extract_all_objects(recursive: false),
> - dependencies: tcg_ss.dependencies())
> -user_ss.add(tcg_user)
> -
> -libtcg_system = static_library('tcg_system',
> - tcg_ss.sources() + genh,
> - dependencies: tcg_ss.dependencies(),
> - c_args: '-DCONFIG_SOFTMMU',
> - build_by_default: false)
> -
> -tcg_system = declare_dependency(objects: libtcg_system.extract_all_objects(recursive: false),
> - dependencies: tcg_ss.dependencies())
> -system_ss.add(tcg_system)
> +libuser_ss.add_all(tcg_ss)
> +libsystem_ss.add_all(tcg_ss)
Good move,
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 18/37] gdbstub: Move syscalls.c out of common_ss
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (16 preceding siblings ...)
2025-03-13 3:44 ` [PATCH 17/37] meson: Introduce top-level libuser_ss and libsystem_ss Richard Henderson
@ 2025-03-13 3:44 ` Richard Henderson
2025-03-13 17:46 ` Pierrick Bouvier
2025-03-13 3:44 ` [PATCH 19/37] accel/tcg: Use libuser_ss and libsystem_ss Richard Henderson
` (20 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
Copy to libuser_ss and libsystem_ss.
This file uses semihosting/semihost.h, which has separate
implementations with and without CONFIG_USER_ONLY.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
gdbstub/meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gdbstub/meson.build b/gdbstub/meson.build
index 0e8099ae9c..b25db86767 100644
--- a/gdbstub/meson.build
+++ b/gdbstub/meson.build
@@ -7,15 +7,15 @@
# We build two versions of gdbstub, one for each mode
libuser_ss.add(files(
'gdbstub.c',
+ 'syscalls.c',
'user.c'
))
libsystem_ss.add(files(
'gdbstub.c',
+ 'syscalls.c',
'system.c'
))
-common_ss.add(files('syscalls.c'))
-
# The user-target is specialised by the guest
specific_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-target.c'))
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 18/37] gdbstub: Move syscalls.c out of common_ss
2025-03-13 3:44 ` [PATCH 18/37] gdbstub: Move syscalls.c out of common_ss Richard Henderson
@ 2025-03-13 17:46 ` Pierrick Bouvier
2025-03-13 18:31 ` Richard Henderson
0 siblings, 1 reply; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 17:46 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> Copy to libuser_ss and libsystem_ss.
> This file uses semihosting/semihost.h, which has separate
> implementations with and without CONFIG_USER_ONLY.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> gdbstub/meson.build | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gdbstub/meson.build b/gdbstub/meson.build
> index 0e8099ae9c..b25db86767 100644
> --- a/gdbstub/meson.build
> +++ b/gdbstub/meson.build
> @@ -7,15 +7,15 @@
> # We build two versions of gdbstub, one for each mode
> libuser_ss.add(files(
> 'gdbstub.c',
> + 'syscalls.c',
> 'user.c'
> ))
>
> libsystem_ss.add(files(
> 'gdbstub.c',
> + 'syscalls.c',
> 'system.c'
> ))
>
> -common_ss.add(files('syscalls.c'))
> -
> # The user-target is specialised by the guest
> specific_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-target.c'))
So it fixes an existing issue if I'm correct?
Maybe there was no consequence, but definitely a hole in our build system.
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 18/37] gdbstub: Move syscalls.c out of common_ss
2025-03-13 17:46 ` Pierrick Bouvier
@ 2025-03-13 18:31 ` Richard Henderson
0 siblings, 0 replies; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 18:31 UTC (permalink / raw)
To: Pierrick Bouvier, qemu-devel; +Cc: pbonzini, philmd
On 3/13/25 10:46, Pierrick Bouvier wrote:
> On 3/12/25 20:44, Richard Henderson wrote:
>> Copy to libuser_ss and libsystem_ss.
>> This file uses semihosting/semihost.h, which has separate
>> implementations with and without CONFIG_USER_ONLY.
>>
>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>> ---
>> gdbstub/meson.build | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/gdbstub/meson.build b/gdbstub/meson.build
>> index 0e8099ae9c..b25db86767 100644
>> --- a/gdbstub/meson.build
>> +++ b/gdbstub/meson.build
>> @@ -7,15 +7,15 @@
>> # We build two versions of gdbstub, one for each mode
>> libuser_ss.add(files(
>> 'gdbstub.c',
>> + 'syscalls.c',
>> 'user.c'
>> ))
>> libsystem_ss.add(files(
>> 'gdbstub.c',
>> + 'syscalls.c',
>> 'system.c'
>> ))
>> -common_ss.add(files('syscalls.c'))
>> -
>> # The user-target is specialised by the guest
>> specific_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-target.c'))
>
> So it fixes an existing issue if I'm correct?
I think it currently works accidentally, because semihosting_get_target() expands
differently for user vs system. But we provide semihosting/stubs-all.c which has another
copy of the user version.
r~
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 19/37] accel/tcg: Use libuser_ss and libsystem_ss
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (17 preceding siblings ...)
2025-03-13 3:44 ` [PATCH 18/37] gdbstub: Move syscalls.c out of common_ss Richard Henderson
@ 2025-03-13 3:44 ` Richard Henderson
2025-03-13 20:53 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 20/37] target/mips: Protect semihosting call with CONFIG_SEMIHOSTING Richard Henderson
` (19 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:44 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
While some of these files are built exactly once, due
to being in only libuser_ss or libsystem_ss, some of
the includes that they depend on require CONFIG_USER_ONLY.
So make use of the common infrastructure to allow that.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
accel/tcg/meson.build | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build
index 185830d0f5..72d4acfe5e 100644
--- a/accel/tcg/meson.build
+++ b/accel/tcg/meson.build
@@ -1,12 +1,21 @@
-common_ss.add(when: 'CONFIG_TCG', if_true: files(
+if not get_option('tcg').allowed()
+ subdir_done()
+endif
+
+tcg_ss = ss.source_set()
+
+tcg_ss.add(files(
'cpu-exec-common.c',
'tcg-runtime.c',
'tcg-runtime-gvec.c',
))
if get_option('plugins')
- common_ss.add(when: 'CONFIG_TCG', if_true: files('plugin-gen.c'))
+ tcg_ss.add(files('plugin-gen.c'))
endif
+libuser_ss.add_all(tcg_ss)
+libsystem_ss.add_all(tcg_ss)
+
tcg_specific_ss = ss.source_set()
tcg_specific_ss.add(files(
'tcg-all.c',
@@ -22,11 +31,11 @@ specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files(
'cputlb.c',
))
-user_ss.add(when: ['CONFIG_TCG'], if_true: files(
+libuser_ss.add(files(
'user-exec-stub.c',
))
-system_ss.add(when: ['CONFIG_TCG'], if_true: files(
+libsystem_ss.add(files(
'icount-common.c',
'monitor.c',
'tcg-accel-ops.c',
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 19/37] accel/tcg: Use libuser_ss and libsystem_ss
2025-03-13 3:44 ` [PATCH 19/37] accel/tcg: Use libuser_ss and libsystem_ss Richard Henderson
@ 2025-03-13 20:53 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 20:53 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> While some of these files are built exactly once, due
> to being in only libuser_ss or libsystem_ss, some of
> the includes that they depend on require CONFIG_USER_ONLY.
> So make use of the common infrastructure to allow that.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> accel/tcg/meson.build | 17 +++++++++++++----
> 1 file changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build
> index 185830d0f5..72d4acfe5e 100644
> --- a/accel/tcg/meson.build
> +++ b/accel/tcg/meson.build
> @@ -1,12 +1,21 @@
> -common_ss.add(when: 'CONFIG_TCG', if_true: files(
> +if not get_option('tcg').allowed()
> + subdir_done()
> +endif
> +
> +tcg_ss = ss.source_set()
> +
> +tcg_ss.add(files(
> 'cpu-exec-common.c',
> 'tcg-runtime.c',
> 'tcg-runtime-gvec.c',
> ))
> if get_option('plugins')
> - common_ss.add(when: 'CONFIG_TCG', if_true: files('plugin-gen.c'))
> + tcg_ss.add(files('plugin-gen.c'))
> endif
>
> +libuser_ss.add_all(tcg_ss)
> +libsystem_ss.add_all(tcg_ss)
> +
> tcg_specific_ss = ss.source_set()
> tcg_specific_ss.add(files(
> 'tcg-all.c',
> @@ -22,11 +31,11 @@ specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files(
> 'cputlb.c',
> ))
>
> -user_ss.add(when: ['CONFIG_TCG'], if_true: files(
> +libuser_ss.add(files(
> 'user-exec-stub.c',
> ))
>
> -system_ss.add(when: ['CONFIG_TCG'], if_true: files(
> +libsystem_ss.add(files(
> 'icount-common.c',
> 'monitor.c',
> 'tcg-accel-ops.c',
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 20/37] target/mips: Protect semihosting call with CONFIG_SEMIHOSTING
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (18 preceding siblings ...)
2025-03-13 3:44 ` [PATCH 19/37] accel/tcg: Use libuser_ss and libsystem_ss Richard Henderson
@ 2025-03-13 3:45 ` Richard Henderson
2025-03-13 20:51 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 21/37] target/xtensa: " Richard Henderson
` (18 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:45 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
Semihosting is not enabled for user-only.
Avoid the test for that case.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/mips/cpu.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/target/mips/cpu.c b/target/mips/cpu.c
index b207106dd7..1ca182c1a2 100644
--- a/target/mips/cpu.c
+++ b/target/mips/cpu.c
@@ -415,11 +415,12 @@ static void mips_cpu_reset_hold(Object *obj, ResetType type)
restore_pamask(env);
cs->exception_index = EXCP_NONE;
+#ifdef CONFIG_SEMIHOSTING
if (semihosting_get_argc()) {
/* UHI interface can be used to obtain argc and argv */
env->active_tc.gpr[4] = -1;
}
-
+#endif
#ifndef CONFIG_USER_ONLY
if (kvm_enabled()) {
kvm_mips_reset_vcpu(cpu);
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 20/37] target/mips: Protect semihosting call with CONFIG_SEMIHOSTING
2025-03-13 3:45 ` [PATCH 20/37] target/mips: Protect semihosting call with CONFIG_SEMIHOSTING Richard Henderson
@ 2025-03-13 20:51 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 20:51 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:45, Richard Henderson wrote:
> Semihosting is not enabled for user-only.
> Avoid the test for that case.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> target/mips/cpu.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/target/mips/cpu.c b/target/mips/cpu.c
> index b207106dd7..1ca182c1a2 100644
> --- a/target/mips/cpu.c
> +++ b/target/mips/cpu.c
> @@ -415,11 +415,12 @@ static void mips_cpu_reset_hold(Object *obj, ResetType type)
> restore_pamask(env);
> cs->exception_index = EXCP_NONE;
>
> +#ifdef CONFIG_SEMIHOSTING
> if (semihosting_get_argc()) {
> /* UHI interface can be used to obtain argc and argv */
> env->active_tc.gpr[4] = -1;
> }
> -
> +#endif
> #ifndef CONFIG_USER_ONLY
> if (kvm_enabled()) {
> kvm_mips_reset_vcpu(cpu);
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 21/37] target/xtensa: Protect semihosting call with CONFIG_SEMIHOSTING
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (19 preceding siblings ...)
2025-03-13 3:45 ` [PATCH 20/37] target/mips: Protect semihosting call with CONFIG_SEMIHOSTING Richard Henderson
@ 2025-03-13 3:45 ` Richard Henderson
2025-03-13 20:54 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 22/37] semihosting: Move user-only implementation out-of-line Richard Henderson
` (17 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:45 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
Semihosting is not enabled for user-only.
Avoid the test for that case.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/xtensa/translate.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c
index 4f02cefde3..d13d05878e 100644
--- a/target/xtensa/translate.c
+++ b/target/xtensa/translate.c
@@ -2241,13 +2241,16 @@ static uint32_t test_exceptions_simcall(DisasContext *dc,
const OpcodeArg arg[],
const uint32_t par[])
{
- bool is_semi = semihosting_enabled(dc->cring != 0);
-#ifdef CONFIG_USER_ONLY
- bool ill = true;
-#else
+ bool ill = true, is_semi = false;
+
+#ifndef CONFIG_USER_ONLY
/* Between RE.2 and RE.3 simcall opcode's become nop for the hardware. */
- bool ill = dc->config->hw_version <= 250002 && !is_semi;
+ ill = dc->config->hw_version <= 250002 && !is_semi;
#endif
+#ifdef CONFIG_SEMIHOSTING
+ is_semi = semihosting_enabled(dc->cring != 0);
+#endif
+
if (ill || !is_semi) {
qemu_log_mask(LOG_GUEST_ERROR, "SIMCALL but semihosting is disabled\n");
}
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 21/37] target/xtensa: Protect semihosting call with CONFIG_SEMIHOSTING
2025-03-13 3:45 ` [PATCH 21/37] target/xtensa: " Richard Henderson
@ 2025-03-13 20:54 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 20:54 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:45, Richard Henderson wrote:
> Semihosting is not enabled for user-only.
> Avoid the test for that case.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> target/xtensa/translate.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c
> index 4f02cefde3..d13d05878e 100644
> --- a/target/xtensa/translate.c
> +++ b/target/xtensa/translate.c
> @@ -2241,13 +2241,16 @@ static uint32_t test_exceptions_simcall(DisasContext *dc,
> const OpcodeArg arg[],
> const uint32_t par[])
> {
> - bool is_semi = semihosting_enabled(dc->cring != 0);
> -#ifdef CONFIG_USER_ONLY
> - bool ill = true;
> -#else
> + bool ill = true, is_semi = false;
> +
> +#ifndef CONFIG_USER_ONLY
> /* Between RE.2 and RE.3 simcall opcode's become nop for the hardware. */
> - bool ill = dc->config->hw_version <= 250002 && !is_semi;
> + ill = dc->config->hw_version <= 250002 && !is_semi;
> #endif
> +#ifdef CONFIG_SEMIHOSTING
> + is_semi = semihosting_enabled(dc->cring != 0);
> +#endif
> +
> if (ill || !is_semi) {
> qemu_log_mask(LOG_GUEST_ERROR, "SIMCALL but semihosting is disabled\n");
> }
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 22/37] semihosting: Move user-only implementation out-of-line
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (20 preceding siblings ...)
2025-03-13 3:45 ` [PATCH 21/37] target/xtensa: " Richard Henderson
@ 2025-03-13 3:45 ` Richard Henderson
2025-03-13 10:04 ` Philippe Mathieu-Daudé
2025-03-13 3:45 ` [PATCH 23/37] include/system: Move exec/ram_addr.h to system/ram_addr.h Richard Henderson
` (16 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:45 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
Avoid testing CONFIG_USER_ONLY in semihost.h.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/semihosting/semihost.h | 29 ++---------------------------
semihosting/user.c | 30 ++++++++++++++++++++++++++++++
semihosting/meson.build | 2 ++
3 files changed, 34 insertions(+), 27 deletions(-)
create mode 100644 semihosting/user.c
diff --git a/include/semihosting/semihost.h b/include/semihosting/semihost.h
index 97d2a2ba99..b03e637578 100644
--- a/include/semihosting/semihost.h
+++ b/include/semihosting/semihost.h
@@ -26,32 +26,6 @@ typedef enum SemihostingTarget {
SEMIHOSTING_TARGET_GDB
} SemihostingTarget;
-#ifdef CONFIG_USER_ONLY
-static inline bool semihosting_enabled(bool is_user)
-{
- return true;
-}
-
-static inline SemihostingTarget semihosting_get_target(void)
-{
- return SEMIHOSTING_TARGET_AUTO;
-}
-
-static inline const char *semihosting_get_arg(int i)
-{
- return NULL;
-}
-
-static inline int semihosting_get_argc(void)
-{
- return 0;
-}
-
-static inline const char *semihosting_get_cmdline(void)
-{
- return NULL;
-}
-#else /* !CONFIG_USER_ONLY */
/**
* semihosting_enabled:
* @is_user: true if guest code is in usermode (i.e. not privileged)
@@ -59,17 +33,18 @@ static inline const char *semihosting_get_cmdline(void)
* Return true if guest code is allowed to make semihosting calls.
*/
bool semihosting_enabled(bool is_user);
+
SemihostingTarget semihosting_get_target(void);
const char *semihosting_get_arg(int i);
int semihosting_get_argc(void);
const char *semihosting_get_cmdline(void);
void semihosting_arg_fallback(const char *file, const char *cmd);
+
/* for vl.c hooks */
void qemu_semihosting_enable(void);
int qemu_semihosting_config_options(const char *optstr);
void qemu_semihosting_chardev_init(void);
void qemu_semihosting_console_init(Chardev *);
-#endif /* CONFIG_USER_ONLY */
void qemu_semihosting_guestfd_init(void);
#endif /* SEMIHOST_H */
diff --git a/semihosting/user.c b/semihosting/user.c
new file mode 100644
index 0000000000..f5b500493b
--- /dev/null
+++ b/semihosting/user.c
@@ -0,0 +1,30 @@
+/*
+ * Semihosting for user emulation
+ *
+ * Copyright (c) 2019 Linaro Ltd
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "qemu/osdep.h"
+#include "semihosting/semihost.h"
+
+bool semihosting_enabled(bool is_user)
+{
+ return true;
+}
+
+const char *semihosting_get_arg(int i)
+{
+ return NULL;
+}
+
+int semihosting_get_argc(void)
+{
+ return 0;
+}
+
+const char *semihosting_get_cmdline(void)
+{
+ return NULL;
+}
diff --git a/semihosting/meson.build b/semihosting/meson.build
index 86f5004bed..ab67f87e4f 100644
--- a/semihosting/meson.build
+++ b/semihosting/meson.build
@@ -15,5 +15,7 @@ system_ss.add(when: ['CONFIG_SEMIHOSTING'], if_true: files(
'stubs-system.c',
))
+user_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: files('user.c'))
+
specific_ss.add(when: ['CONFIG_ARM_COMPATIBLE_SEMIHOSTING'],
if_true: files('arm-compat-semi.c'))
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 22/37] semihosting: Move user-only implementation out-of-line
2025-03-13 3:45 ` [PATCH 22/37] semihosting: Move user-only implementation out-of-line Richard Henderson
@ 2025-03-13 10:04 ` Philippe Mathieu-Daudé
2025-03-13 10:28 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 115+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-03-13 10:04 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pierrick.bouvier, pbonzini
On 13/3/25 04:45, Richard Henderson wrote:
> Avoid testing CONFIG_USER_ONLY in semihost.h.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/semihosting/semihost.h | 29 ++---------------------------
> semihosting/user.c | 30 ++++++++++++++++++++++++++++++
> semihosting/meson.build | 2 ++
> 3 files changed, 34 insertions(+), 27 deletions(-)
> create mode 100644 semihosting/user.c
>
> diff --git a/include/semihosting/semihost.h b/include/semihosting/semihost.h
> index 97d2a2ba99..b03e637578 100644
> --- a/include/semihosting/semihost.h
> +++ b/include/semihosting/semihost.h
> @@ -26,32 +26,6 @@ typedef enum SemihostingTarget {
> SEMIHOSTING_TARGET_GDB
> } SemihostingTarget;
>
> -#ifdef CONFIG_USER_ONLY
> -static inline bool semihosting_enabled(bool is_user)
> -{
> - return true;
> -}
> -
> -static inline SemihostingTarget semihosting_get_target(void)
> -{
> - return SEMIHOSTING_TARGET_AUTO;
> -}
> -
> -static inline const char *semihosting_get_arg(int i)
> -{
> - return NULL;
> -}
> -
> -static inline int semihosting_get_argc(void)
> -{
> - return 0;
> -}
> -
> -static inline const char *semihosting_get_cmdline(void)
> -{
> - return NULL;
> -}
> -#else /* !CONFIG_USER_ONLY */
> /**
> * semihosting_enabled:
> * @is_user: true if guest code is in usermode (i.e. not privileged)
> @@ -59,17 +33,18 @@ static inline const char *semihosting_get_cmdline(void)
> * Return true if guest code is allowed to make semihosting calls.
> */
> bool semihosting_enabled(bool is_user);
> +
> SemihostingTarget semihosting_get_target(void);
> const char *semihosting_get_arg(int i);
> int semihosting_get_argc(void);
> const char *semihosting_get_cmdline(void);
> void semihosting_arg_fallback(const char *file, const char *cmd);
> +
> /* for vl.c hooks */
> void qemu_semihosting_enable(void);
> int qemu_semihosting_config_options(const char *optstr);
> void qemu_semihosting_chardev_init(void);
> void qemu_semihosting_console_init(Chardev *);
> -#endif /* CONFIG_USER_ONLY */
> void qemu_semihosting_guestfd_init(void);
>
> #endif /* SEMIHOST_H */
> diff --git a/semihosting/user.c b/semihosting/user.c
> new file mode 100644
> index 0000000000..f5b500493b
> --- /dev/null
> +++ b/semihosting/user.c
> @@ -0,0 +1,30 @@
> +/*
> + * Semihosting for user emulation
> + *
> + * Copyright (c) 2019 Linaro Ltd
> + *
> + * SPDX-License-Identifier: GPL-2.0-or-later
> + */
> +
> +#include "qemu/osdep.h"
> +#include "semihosting/semihost.h"
> +
> +bool semihosting_enabled(bool is_user)
> +{
> + return true;
> +}
> +
> +const char *semihosting_get_arg(int i)
> +{
> + return NULL;
> +}
> +
> +int semihosting_get_argc(void)
> +{
> + return 0;
> +}
> +
> +const char *semihosting_get_cmdline(void)
> +{
> + return NULL;
> +}
Do we really need the symbols, can't they be elided now?
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 22/37] semihosting: Move user-only implementation out-of-line
2025-03-13 10:04 ` Philippe Mathieu-Daudé
@ 2025-03-13 10:28 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 115+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-03-13 10:28 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pierrick.bouvier, pbonzini
On 13/3/25 11:04, Philippe Mathieu-Daudé wrote:
> On 13/3/25 04:45, Richard Henderson wrote:
>> Avoid testing CONFIG_USER_ONLY in semihost.h.
>>
>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>> ---
>> include/semihosting/semihost.h | 29 ++---------------------------
>> semihosting/user.c | 30 ++++++++++++++++++++++++++++++
>> semihosting/meson.build | 2 ++
>> 3 files changed, 34 insertions(+), 27 deletions(-)
>> create mode 100644 semihosting/user.c
>>
>> diff --git a/include/semihosting/semihost.h b/include/semihosting/
>> semihost.h
>> index 97d2a2ba99..b03e637578 100644
>> --- a/include/semihosting/semihost.h
>> +++ b/include/semihosting/semihost.h
>> @@ -26,32 +26,6 @@ typedef enum SemihostingTarget {
>> SEMIHOSTING_TARGET_GDB
>> } SemihostingTarget;
>> -#ifdef CONFIG_USER_ONLY
>> -static inline bool semihosting_enabled(bool is_user)
>> -{
>> - return true;
>> -}
>> -
>> -static inline SemihostingTarget semihosting_get_target(void)
>> -{
>> - return SEMIHOSTING_TARGET_AUTO;
>> -}
>> -
>> -static inline const char *semihosting_get_arg(int i)
>> -{
>> - return NULL;
>> -}
>> -
>> -static inline int semihosting_get_argc(void)
>> -{
>> - return 0;
>> -}
>> -
>> -static inline const char *semihosting_get_cmdline(void)
>> -{
>> - return NULL;
>> -}
>> -#else /* !CONFIG_USER_ONLY */
>> /**
>> * semihosting_enabled:
>> * @is_user: true if guest code is in usermode (i.e. not privileged)
>> @@ -59,17 +33,18 @@ static inline const char
>> *semihosting_get_cmdline(void)
>> * Return true if guest code is allowed to make semihosting calls.
>> */
>> bool semihosting_enabled(bool is_user);
>> +
>> SemihostingTarget semihosting_get_target(void);
>> const char *semihosting_get_arg(int i);
>> int semihosting_get_argc(void);
>> const char *semihosting_get_cmdline(void);
>> void semihosting_arg_fallback(const char *file, const char *cmd);
>> +
>> /* for vl.c hooks */
>> void qemu_semihosting_enable(void);
>> int qemu_semihosting_config_options(const char *optstr);
>> void qemu_semihosting_chardev_init(void);
>> void qemu_semihosting_console_init(Chardev *);
>> -#endif /* CONFIG_USER_ONLY */
>> void qemu_semihosting_guestfd_init(void);
>> #endif /* SEMIHOST_H */
>> diff --git a/semihosting/user.c b/semihosting/user.c
>> new file mode 100644
>> index 0000000000..f5b500493b
>> --- /dev/null
>> +++ b/semihosting/user.c
>> @@ -0,0 +1,30 @@
>> +/*
>> + * Semihosting for user emulation
>> + *
>> + * Copyright (c) 2019 Linaro Ltd
>> + *
>> + * SPDX-License-Identifier: GPL-2.0-or-later
>> + */
>> +
>> +#include "qemu/osdep.h"
>> +#include "semihosting/semihost.h"
>> +
>> +bool semihosting_enabled(bool is_user)
>> +{
>> + return true;
>> +}
>> +
>> +const char *semihosting_get_arg(int i)
>> +{
>> + return NULL;
>> +}
>> +
>> +int semihosting_get_argc(void)
>> +{
>> + return 0;
>> +}
>> +
>> +const char *semihosting_get_cmdline(void)
>> +{
>> + return NULL;
>> +}
>
> Do we really need the symbols, can't they be elided now?
Apparently we only need semihosting_enabled().
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 23/37] include/system: Move exec/ram_addr.h to system/ram_addr.h
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (21 preceding siblings ...)
2025-03-13 3:45 ` [PATCH 22/37] semihosting: Move user-only implementation out-of-line Richard Henderson
@ 2025-03-13 3:45 ` Richard Henderson
2025-03-13 17:22 ` Alex Bennée
2025-03-13 20:55 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 24/37] include/system: Move exec/ramblock.h to system/ramblock.h Richard Henderson
` (15 subsequent siblings)
38 siblings, 2 replies; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:45 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
Convert the existing includes with sed.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/{exec => system}/ram_addr.h | 7 +++----
accel/kvm/kvm-all.c | 2 +-
accel/tcg/cputlb.c | 2 +-
accel/tcg/translate-all.c | 2 +-
hw/ppc/spapr.c | 2 +-
hw/ppc/spapr_caps.c | 2 +-
hw/ppc/spapr_pci.c | 2 +-
hw/remote/memory.c | 2 +-
hw/remote/proxy-memory-listener.c | 2 +-
hw/s390x/s390-stattrib-kvm.c | 2 +-
hw/s390x/s390-stattrib.c | 2 +-
hw/s390x/s390-virtio-ccw.c | 2 +-
hw/vfio/common.c | 2 +-
hw/vfio/container.c | 2 +-
hw/vfio/iommufd.c | 2 +-
hw/vfio/migration.c | 2 +-
hw/vfio/spapr.c | 2 +-
hw/virtio/virtio-mem.c | 2 +-
migration/ram.c | 2 +-
system/memory.c | 2 +-
system/physmem.c | 2 +-
target/arm/tcg/mte_helper.c | 2 +-
target/ppc/kvm.c | 2 +-
target/s390x/kvm/kvm.c | 2 +-
MAINTAINERS | 2 +-
25 files changed, 27 insertions(+), 28 deletions(-)
rename include/{exec => system}/ram_addr.h (99%)
diff --git a/include/exec/ram_addr.h b/include/system/ram_addr.h
similarity index 99%
rename from include/exec/ram_addr.h
rename to include/system/ram_addr.h
index 3d8df4edf1..65f8f37b2a 100644
--- a/include/exec/ram_addr.h
+++ b/include/system/ram_addr.h
@@ -16,10 +16,9 @@
* The functions declared here will be removed soon.
*/
-#ifndef RAM_ADDR_H
-#define RAM_ADDR_H
+#ifndef SYSTEM_RAM_ADDR_H
+#define SYSTEM_RAM_ADDR_H
-#ifndef CONFIG_USER_ONLY
#include "cpu.h"
#include "system/xen.h"
#include "system/tcg.h"
@@ -557,5 +556,5 @@ uint64_t cpu_physical_memory_sync_dirty_bitmap(RAMBlock *rb,
return num_dirty;
}
-#endif
+
#endif
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 0d47bb0d9b..0723a3933b 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -34,7 +34,7 @@
#include "system/accel-blocker.h"
#include "qemu/bswap.h"
#include "system/memory.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#include "qemu/event_notifier.h"
#include "qemu/main-loop.h"
#include "trace.h"
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 6f0ea9067b..134e523cab 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -27,7 +27,7 @@
#include "exec/cputlb.h"
#include "exec/tb-flush.h"
#include "exec/memory-internal.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#include "exec/mmu-access-type.h"
#include "exec/tlb-common.h"
#include "exec/vaddr.h"
diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
index 16e5043597..167535bcb1 100644
--- a/accel/tcg/translate-all.c
+++ b/accel/tcg/translate-all.c
@@ -40,7 +40,7 @@
#endif
#endif
#else
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#endif
#include "exec/cputlb.h"
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index c15340a58d..e31bc0f0f3 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -74,7 +74,7 @@
#include "hw/virtio/virtio-scsi.h"
#include "hw/virtio/vhost-scsi-common.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#include "system/confidential-guest-support.h"
#include "hw/usb.h"
#include "qemu/config-file.h"
diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
index 904bff87ce..fb010bd215 100644
--- a/hw/ppc/spapr_caps.c
+++ b/hw/ppc/spapr_caps.c
@@ -27,7 +27,7 @@
#include "qapi/error.h"
#include "qapi/visitor.h"
#include "system/hw_accel.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#include "target/ppc/cpu.h"
#include "target/ppc/mmu-hash64.h"
#include "cpu-models.h"
diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index e0a9d50edc..384269b831 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -34,7 +34,7 @@
#include "hw/pci/pci_host.h"
#include "hw/ppc/spapr.h"
#include "hw/pci-host/spapr.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#include <libfdt.h>
#include "trace.h"
#include "qemu/error-report.h"
diff --git a/hw/remote/memory.c b/hw/remote/memory.c
index 6d60da91e0..00193a552f 100644
--- a/hw/remote/memory.c
+++ b/hw/remote/memory.c
@@ -11,7 +11,7 @@
#include "qemu/osdep.h"
#include "hw/remote/memory.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#include "qapi/error.h"
static void remote_sysmem_reset(void)
diff --git a/hw/remote/proxy-memory-listener.c b/hw/remote/proxy-memory-listener.c
index ce7f5b9bfb..30ac74961d 100644
--- a/hw/remote/proxy-memory-listener.c
+++ b/hw/remote/proxy-memory-listener.c
@@ -12,7 +12,7 @@
#include "qemu/range.h"
#include "system/memory.h"
#include "exec/cpu-common.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "hw/remote/mpqemu-link.h"
diff --git a/hw/s390x/s390-stattrib-kvm.c b/hw/s390x/s390-stattrib-kvm.c
index 2a8e31718b..f5695b0e53 100644
--- a/hw/s390x/s390-stattrib-kvm.c
+++ b/hw/s390x/s390-stattrib-kvm.c
@@ -16,7 +16,7 @@
#include "qemu/error-report.h"
#include "system/kvm.h"
#include "system/memory_mapping.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#include "kvm/kvm_s390x.h"
#include "qapi/error.h"
diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c
index be07c28c6e..d95b58a8a8 100644
--- a/hw/s390x/s390-stattrib.c
+++ b/hw/s390x/s390-stattrib.c
@@ -16,7 +16,7 @@
#include "hw/qdev-properties.h"
#include "hw/s390x/storage-attributes.h"
#include "qemu/error-report.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#include "qapi/error.h"
#include "qobject/qdict.h"
#include "cpu.h"
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index a9b3db19f6..d284b1c7d2 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#include "system/confidential-guest-support.h"
#include "hw/boards.h"
#include "hw/s390x/sclp.h"
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 5c3bc88222..f2d30cb06e 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -29,7 +29,7 @@
#include "hw/vfio/pci.h"
#include "system/address-spaces.h"
#include "system/memory.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#include "hw/hw.h"
#include "qemu/error-report.h"
#include "qemu/main-loop.h"
diff --git a/hw/vfio/container.c b/hw/vfio/container.c
index 2e993c7e73..812d5edbcf 100644
--- a/hw/vfio/container.c
+++ b/hw/vfio/container.c
@@ -25,7 +25,7 @@
#include "hw/vfio/vfio-common.h"
#include "system/address-spaces.h"
#include "system/memory.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#include "qemu/error-report.h"
#include "qemu/range.h"
#include "system/reset.h"
diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c
index df61edffc0..ec323fa32b 100644
--- a/hw/vfio/iommufd.c
+++ b/hw/vfio/iommufd.c
@@ -25,7 +25,7 @@
#include "qemu/cutils.h"
#include "qemu/chardev_open.h"
#include "pci.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
static int iommufd_cdev_map(const VFIOContainerBase *bcontainer, hwaddr iova,
ram_addr_t size, void *vaddr, bool readonly)
diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
index 416643ddd6..273618c7e0 100644
--- a/hw/vfio/migration.c
+++ b/hw/vfio/migration.c
@@ -27,7 +27,7 @@
#include "qapi/error.h"
#include "qapi/qapi-events-vfio.h"
#include "exec/ramlist.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#include "pci.h"
#include "trace.h"
#include "hw/hw.h"
diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c
index bc00badb34..3c9a4385a2 100644
--- a/hw/vfio/spapr.c
+++ b/hw/vfio/spapr.c
@@ -19,7 +19,7 @@
#include "hw/vfio/vfio-common.h"
#include "hw/hw.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "trace.h"
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index 7b140add76..f6c9aca291 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -24,7 +24,7 @@
#include "hw/virtio/virtio-mem.h"
#include "qapi/error.h"
#include "qapi/visitor.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#include "migration/misc.h"
#include "hw/boards.h"
#include "hw/qdev-properties.h"
diff --git a/migration/ram.c b/migration/ram.c
index 424df6d9f1..6295f675df 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -48,7 +48,7 @@
#include "qapi/qapi-commands-migration.h"
#include "qapi/qmp/qerror.h"
#include "trace.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#include "exec/target_page.h"
#include "qemu/rcu_queue.h"
#include "migration/colo.h"
diff --git a/system/memory.c b/system/memory.c
index 050bffdbf8..faddcbfd8a 100644
--- a/system/memory.c
+++ b/system/memory.c
@@ -26,7 +26,7 @@
#include "trace.h"
#include "exec/memory-internal.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#include "system/kvm.h"
#include "system/runstate.h"
#include "system/tcg.h"
diff --git a/system/physmem.c b/system/physmem.c
index 2850e14780..765d195cb0 100644
--- a/system/physmem.c
+++ b/system/physmem.c
@@ -67,7 +67,7 @@
#include "system/replay.h"
#include "exec/memory-internal.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#include "qemu/pmem.h"
diff --git a/target/arm/tcg/mte_helper.c b/target/arm/tcg/mte_helper.c
index 5d6d8a17ae..80164a8050 100644
--- a/target/arm/tcg/mte_helper.c
+++ b/target/arm/tcg/mte_helper.c
@@ -27,7 +27,7 @@
#include "user/cpu_loop.h"
#include "user/page-protection.h"
#else
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#endif
#include "exec/cpu_ldst.h"
#include "exec/helper-proto.h"
diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
index 216638dee4..4e2663e3f1 100644
--- a/target/ppc/kvm.c
+++ b/target/ppc/kvm.c
@@ -41,7 +41,7 @@
#include "trace.h"
#include "gdbstub/enums.h"
#include "exec/memattrs.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#include "system/hostmem.h"
#include "qemu/cutils.h"
#include "qemu/main-loop.h"
diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
index 4d56e653dd..b9f1422197 100644
--- a/target/s390x/kvm/kvm.c
+++ b/target/s390x/kvm/kvm.c
@@ -41,7 +41,7 @@
#include "system/runstate.h"
#include "system/device_tree.h"
#include "gdbstub/enums.h"
-#include "exec/ram_addr.h"
+#include "system/ram_addr.h"
#include "trace.h"
#include "hw/s390x/s390-pci-inst.h"
#include "hw/s390x/s390-pci-bus.h"
diff --git a/MAINTAINERS b/MAINTAINERS
index 751d611613..2cc0b54ec4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3110,7 +3110,7 @@ S: Supported
F: include/system/ioport.h
F: include/exec/memop.h
F: include/system/memory.h
-F: include/exec/ram_addr.h
+F: include/system/ram_addr.h
F: include/exec/ramblock.h
F: include/system/memory_mapping.h
F: system/dma-helpers.c
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 23/37] include/system: Move exec/ram_addr.h to system/ram_addr.h
2025-03-13 3:45 ` [PATCH 23/37] include/system: Move exec/ram_addr.h to system/ram_addr.h Richard Henderson
@ 2025-03-13 17:22 ` Alex Bennée
2025-03-13 20:55 ` Pierrick Bouvier
1 sibling, 0 replies; 115+ messages in thread
From: Alex Bennée @ 2025-03-13 17:22 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, pierrick.bouvier, pbonzini, philmd
Richard Henderson <richard.henderson@linaro.org> writes:
> Convert the existing includes with sed.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/{exec => system}/ram_addr.h | 7 +++----
> accel/kvm/kvm-all.c | 2 +-
> accel/tcg/cputlb.c | 2 +-
> accel/tcg/translate-all.c | 2 +-
> hw/ppc/spapr.c | 2 +-
> hw/ppc/spapr_caps.c | 2 +-
> hw/ppc/spapr_pci.c | 2 +-
> hw/remote/memory.c | 2 +-
> hw/remote/proxy-memory-listener.c | 2 +-
> hw/s390x/s390-stattrib-kvm.c | 2 +-
> hw/s390x/s390-stattrib.c | 2 +-
> hw/s390x/s390-virtio-ccw.c | 2 +-
> hw/vfio/common.c | 2 +-
> hw/vfio/container.c | 2 +-
> hw/vfio/iommufd.c | 2 +-
> hw/vfio/migration.c | 2 +-
> hw/vfio/spapr.c | 2 +-
> hw/virtio/virtio-mem.c | 2 +-
> migration/ram.c | 2 +-
> system/memory.c | 2 +-
> system/physmem.c | 2 +-
> target/arm/tcg/mte_helper.c | 2 +-
> target/ppc/kvm.c | 2 +-
> target/s390x/kvm/kvm.c | 2 +-
> MAINTAINERS | 2 +-
> 25 files changed, 27 insertions(+), 28 deletions(-)
> rename include/{exec => system}/ram_addr.h (99%)
>
> diff --git a/include/exec/ram_addr.h b/include/system/ram_addr.h
> similarity index 99%
> rename from include/exec/ram_addr.h
> rename to include/system/ram_addr.h
> index 3d8df4edf1..65f8f37b2a 100644
After rebase:
modified hw/vfio/common.c
@@ -30,7 +30,6 @@
#include "system/address-spaces.h"
#include "system/memory.h"
#include "system/ram_addr.h"
-#include "exec/ram_addr.h"
#include "exec/target_page.h"
#include "hw/hw.h"
#include "qemu/error-report.h"
modified hw/vfio/iommufd.c
@@ -25,7 +25,6 @@
#include "qemu/cutils.h"
#include "qemu/chardev_open.h"
#include "pci.h"
-#include "system/ram_addr.h"
static int iommufd_cdev_map(const VFIOContainerBase *bcontainer, hwaddr iova,
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 23/37] include/system: Move exec/ram_addr.h to system/ram_addr.h
2025-03-13 3:45 ` [PATCH 23/37] include/system: Move exec/ram_addr.h to system/ram_addr.h Richard Henderson
2025-03-13 17:22 ` Alex Bennée
@ 2025-03-13 20:55 ` Pierrick Bouvier
1 sibling, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 20:55 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:45, Richard Henderson wrote:
> Convert the existing includes with sed.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/{exec => system}/ram_addr.h | 7 +++----
> accel/kvm/kvm-all.c | 2 +-
> accel/tcg/cputlb.c | 2 +-
> accel/tcg/translate-all.c | 2 +-
> hw/ppc/spapr.c | 2 +-
> hw/ppc/spapr_caps.c | 2 +-
> hw/ppc/spapr_pci.c | 2 +-
> hw/remote/memory.c | 2 +-
> hw/remote/proxy-memory-listener.c | 2 +-
> hw/s390x/s390-stattrib-kvm.c | 2 +-
> hw/s390x/s390-stattrib.c | 2 +-
> hw/s390x/s390-virtio-ccw.c | 2 +-
> hw/vfio/common.c | 2 +-
> hw/vfio/container.c | 2 +-
> hw/vfio/iommufd.c | 2 +-
> hw/vfio/migration.c | 2 +-
> hw/vfio/spapr.c | 2 +-
> hw/virtio/virtio-mem.c | 2 +-
> migration/ram.c | 2 +-
> system/memory.c | 2 +-
> system/physmem.c | 2 +-
> target/arm/tcg/mte_helper.c | 2 +-
> target/ppc/kvm.c | 2 +-
> target/s390x/kvm/kvm.c | 2 +-
> MAINTAINERS | 2 +-
> 25 files changed, 27 insertions(+), 28 deletions(-)
> rename include/{exec => system}/ram_addr.h (99%)
>
> diff --git a/include/exec/ram_addr.h b/include/system/ram_addr.h
> similarity index 99%
> rename from include/exec/ram_addr.h
> rename to include/system/ram_addr.h
> index 3d8df4edf1..65f8f37b2a 100644
> --- a/include/exec/ram_addr.h
> +++ b/include/system/ram_addr.h
> @@ -16,10 +16,9 @@
> * The functions declared here will be removed soon.
> */
>
> -#ifndef RAM_ADDR_H
> -#define RAM_ADDR_H
> +#ifndef SYSTEM_RAM_ADDR_H
> +#define SYSTEM_RAM_ADDR_H
>
> -#ifndef CONFIG_USER_ONLY
> #include "cpu.h"
> #include "system/xen.h"
> #include "system/tcg.h"
> @@ -557,5 +556,5 @@ uint64_t cpu_physical_memory_sync_dirty_bitmap(RAMBlock *rb,
>
> return num_dirty;
> }
> -#endif
> +
> #endif
> diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
> index 0d47bb0d9b..0723a3933b 100644
> --- a/accel/kvm/kvm-all.c
> +++ b/accel/kvm/kvm-all.c
> @@ -34,7 +34,7 @@
> #include "system/accel-blocker.h"
> #include "qemu/bswap.h"
> #include "system/memory.h"
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #include "qemu/event_notifier.h"
> #include "qemu/main-loop.h"
> #include "trace.h"
> diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
> index 6f0ea9067b..134e523cab 100644
> --- a/accel/tcg/cputlb.c
> +++ b/accel/tcg/cputlb.c
> @@ -27,7 +27,7 @@
> #include "exec/cputlb.h"
> #include "exec/tb-flush.h"
> #include "exec/memory-internal.h"
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #include "exec/mmu-access-type.h"
> #include "exec/tlb-common.h"
> #include "exec/vaddr.h"
> diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
> index 16e5043597..167535bcb1 100644
> --- a/accel/tcg/translate-all.c
> +++ b/accel/tcg/translate-all.c
> @@ -40,7 +40,7 @@
> #endif
> #endif
> #else
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #endif
>
> #include "exec/cputlb.h"
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index c15340a58d..e31bc0f0f3 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -74,7 +74,7 @@
> #include "hw/virtio/virtio-scsi.h"
> #include "hw/virtio/vhost-scsi-common.h"
>
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #include "system/confidential-guest-support.h"
> #include "hw/usb.h"
> #include "qemu/config-file.h"
> diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
> index 904bff87ce..fb010bd215 100644
> --- a/hw/ppc/spapr_caps.c
> +++ b/hw/ppc/spapr_caps.c
> @@ -27,7 +27,7 @@
> #include "qapi/error.h"
> #include "qapi/visitor.h"
> #include "system/hw_accel.h"
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #include "target/ppc/cpu.h"
> #include "target/ppc/mmu-hash64.h"
> #include "cpu-models.h"
> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> index e0a9d50edc..384269b831 100644
> --- a/hw/ppc/spapr_pci.c
> +++ b/hw/ppc/spapr_pci.c
> @@ -34,7 +34,7 @@
> #include "hw/pci/pci_host.h"
> #include "hw/ppc/spapr.h"
> #include "hw/pci-host/spapr.h"
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #include <libfdt.h>
> #include "trace.h"
> #include "qemu/error-report.h"
> diff --git a/hw/remote/memory.c b/hw/remote/memory.c
> index 6d60da91e0..00193a552f 100644
> --- a/hw/remote/memory.c
> +++ b/hw/remote/memory.c
> @@ -11,7 +11,7 @@
> #include "qemu/osdep.h"
>
> #include "hw/remote/memory.h"
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #include "qapi/error.h"
>
> static void remote_sysmem_reset(void)
> diff --git a/hw/remote/proxy-memory-listener.c b/hw/remote/proxy-memory-listener.c
> index ce7f5b9bfb..30ac74961d 100644
> --- a/hw/remote/proxy-memory-listener.c
> +++ b/hw/remote/proxy-memory-listener.c
> @@ -12,7 +12,7 @@
> #include "qemu/range.h"
> #include "system/memory.h"
> #include "exec/cpu-common.h"
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "hw/remote/mpqemu-link.h"
> diff --git a/hw/s390x/s390-stattrib-kvm.c b/hw/s390x/s390-stattrib-kvm.c
> index 2a8e31718b..f5695b0e53 100644
> --- a/hw/s390x/s390-stattrib-kvm.c
> +++ b/hw/s390x/s390-stattrib-kvm.c
> @@ -16,7 +16,7 @@
> #include "qemu/error-report.h"
> #include "system/kvm.h"
> #include "system/memory_mapping.h"
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #include "kvm/kvm_s390x.h"
> #include "qapi/error.h"
>
> diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c
> index be07c28c6e..d95b58a8a8 100644
> --- a/hw/s390x/s390-stattrib.c
> +++ b/hw/s390x/s390-stattrib.c
> @@ -16,7 +16,7 @@
> #include "hw/qdev-properties.h"
> #include "hw/s390x/storage-attributes.h"
> #include "qemu/error-report.h"
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #include "qapi/error.h"
> #include "qobject/qdict.h"
> #include "cpu.h"
> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
> index a9b3db19f6..d284b1c7d2 100644
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@ -13,7 +13,7 @@
>
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #include "system/confidential-guest-support.h"
> #include "hw/boards.h"
> #include "hw/s390x/sclp.h"
> diff --git a/hw/vfio/common.c b/hw/vfio/common.c
> index 5c3bc88222..f2d30cb06e 100644
> --- a/hw/vfio/common.c
> +++ b/hw/vfio/common.c
> @@ -29,7 +29,7 @@
> #include "hw/vfio/pci.h"
> #include "system/address-spaces.h"
> #include "system/memory.h"
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #include "hw/hw.h"
> #include "qemu/error-report.h"
> #include "qemu/main-loop.h"
> diff --git a/hw/vfio/container.c b/hw/vfio/container.c
> index 2e993c7e73..812d5edbcf 100644
> --- a/hw/vfio/container.c
> +++ b/hw/vfio/container.c
> @@ -25,7 +25,7 @@
> #include "hw/vfio/vfio-common.h"
> #include "system/address-spaces.h"
> #include "system/memory.h"
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #include "qemu/error-report.h"
> #include "qemu/range.h"
> #include "system/reset.h"
> diff --git a/hw/vfio/iommufd.c b/hw/vfio/iommufd.c
> index df61edffc0..ec323fa32b 100644
> --- a/hw/vfio/iommufd.c
> +++ b/hw/vfio/iommufd.c
> @@ -25,7 +25,7 @@
> #include "qemu/cutils.h"
> #include "qemu/chardev_open.h"
> #include "pci.h"
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
>
> static int iommufd_cdev_map(const VFIOContainerBase *bcontainer, hwaddr iova,
> ram_addr_t size, void *vaddr, bool readonly)
> diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c
> index 416643ddd6..273618c7e0 100644
> --- a/hw/vfio/migration.c
> +++ b/hw/vfio/migration.c
> @@ -27,7 +27,7 @@
> #include "qapi/error.h"
> #include "qapi/qapi-events-vfio.h"
> #include "exec/ramlist.h"
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #include "pci.h"
> #include "trace.h"
> #include "hw/hw.h"
> diff --git a/hw/vfio/spapr.c b/hw/vfio/spapr.c
> index bc00badb34..3c9a4385a2 100644
> --- a/hw/vfio/spapr.c
> +++ b/hw/vfio/spapr.c
> @@ -19,7 +19,7 @@
>
> #include "hw/vfio/vfio-common.h"
> #include "hw/hw.h"
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> #include "trace.h"
> diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
> index 7b140add76..f6c9aca291 100644
> --- a/hw/virtio/virtio-mem.c
> +++ b/hw/virtio/virtio-mem.c
> @@ -24,7 +24,7 @@
> #include "hw/virtio/virtio-mem.h"
> #include "qapi/error.h"
> #include "qapi/visitor.h"
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #include "migration/misc.h"
> #include "hw/boards.h"
> #include "hw/qdev-properties.h"
> diff --git a/migration/ram.c b/migration/ram.c
> index 424df6d9f1..6295f675df 100644
> --- a/migration/ram.c
> +++ b/migration/ram.c
> @@ -48,7 +48,7 @@
> #include "qapi/qapi-commands-migration.h"
> #include "qapi/qmp/qerror.h"
> #include "trace.h"
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #include "exec/target_page.h"
> #include "qemu/rcu_queue.h"
> #include "migration/colo.h"
> diff --git a/system/memory.c b/system/memory.c
> index 050bffdbf8..faddcbfd8a 100644
> --- a/system/memory.c
> +++ b/system/memory.c
> @@ -26,7 +26,7 @@
> #include "trace.h"
>
> #include "exec/memory-internal.h"
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #include "system/kvm.h"
> #include "system/runstate.h"
> #include "system/tcg.h"
> diff --git a/system/physmem.c b/system/physmem.c
> index 2850e14780..765d195cb0 100644
> --- a/system/physmem.c
> +++ b/system/physmem.c
> @@ -67,7 +67,7 @@
> #include "system/replay.h"
>
> #include "exec/memory-internal.h"
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
>
> #include "qemu/pmem.h"
>
> diff --git a/target/arm/tcg/mte_helper.c b/target/arm/tcg/mte_helper.c
> index 5d6d8a17ae..80164a8050 100644
> --- a/target/arm/tcg/mte_helper.c
> +++ b/target/arm/tcg/mte_helper.c
> @@ -27,7 +27,7 @@
> #include "user/cpu_loop.h"
> #include "user/page-protection.h"
> #else
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #endif
> #include "exec/cpu_ldst.h"
> #include "exec/helper-proto.h"
> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> index 216638dee4..4e2663e3f1 100644
> --- a/target/ppc/kvm.c
> +++ b/target/ppc/kvm.c
> @@ -41,7 +41,7 @@
> #include "trace.h"
> #include "gdbstub/enums.h"
> #include "exec/memattrs.h"
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #include "system/hostmem.h"
> #include "qemu/cutils.h"
> #include "qemu/main-loop.h"
> diff --git a/target/s390x/kvm/kvm.c b/target/s390x/kvm/kvm.c
> index 4d56e653dd..b9f1422197 100644
> --- a/target/s390x/kvm/kvm.c
> +++ b/target/s390x/kvm/kvm.c
> @@ -41,7 +41,7 @@
> #include "system/runstate.h"
> #include "system/device_tree.h"
> #include "gdbstub/enums.h"
> -#include "exec/ram_addr.h"
> +#include "system/ram_addr.h"
> #include "trace.h"
> #include "hw/s390x/s390-pci-inst.h"
> #include "hw/s390x/s390-pci-bus.h"
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 751d611613..2cc0b54ec4 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3110,7 +3110,7 @@ S: Supported
> F: include/system/ioport.h
> F: include/exec/memop.h
> F: include/system/memory.h
> -F: include/exec/ram_addr.h
> +F: include/system/ram_addr.h
> F: include/exec/ramblock.h
> F: include/system/memory_mapping.h
> F: system/dma-helpers.c
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 24/37] include/system: Move exec/ramblock.h to system/ramblock.h
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (22 preceding siblings ...)
2025-03-13 3:45 ` [PATCH 23/37] include/system: Move exec/ram_addr.h to system/ram_addr.h Richard Henderson
@ 2025-03-13 3:45 ` Richard Henderson
2025-03-13 20:56 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 25/37] common-user: Split out watchpoint-stub.c Richard Henderson
` (14 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:45 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
Convert the existing includes with sed.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/system/ram_addr.h | 2 +-
include/{exec => system}/ramblock.h | 9 ++++-----
hw/display/virtio-gpu-udmabuf.c | 2 +-
hw/hyperv/hv-balloon.c | 2 +-
hw/virtio/vhost-user.c | 2 +-
migration/dirtyrate.c | 2 +-
migration/file.c | 2 +-
migration/multifd-nocomp.c | 2 +-
migration/multifd-qatzip.c | 2 +-
migration/multifd-qpl.c | 2 +-
migration/multifd-uadk.c | 2 +-
migration/multifd-zero-page.c | 2 +-
migration/multifd-zlib.c | 2 +-
migration/multifd-zstd.c | 2 +-
migration/multifd.c | 2 +-
migration/postcopy-ram.c | 2 +-
tests/qtest/fuzz/generic_fuzz.c | 2 +-
MAINTAINERS | 2 +-
18 files changed, 21 insertions(+), 22 deletions(-)
rename include/{exec => system}/ramblock.h (96%)
diff --git a/include/system/ram_addr.h b/include/system/ram_addr.h
index 65f8f37b2a..eceb8fbe4b 100644
--- a/include/system/ram_addr.h
+++ b/include/system/ram_addr.h
@@ -24,7 +24,7 @@
#include "system/tcg.h"
#include "exec/cputlb.h"
#include "exec/ramlist.h"
-#include "exec/ramblock.h"
+#include "system/ramblock.h"
#include "exec/exec-all.h"
#include "qemu/rcu.h"
diff --git a/include/exec/ramblock.h b/include/system/ramblock.h
similarity index 96%
rename from include/exec/ramblock.h
rename to include/system/ramblock.h
index 64484cd821..d8a116ba99 100644
--- a/include/exec/ramblock.h
+++ b/include/system/ramblock.h
@@ -16,11 +16,10 @@
* The functions declared here will be removed soon.
*/
-#ifndef QEMU_EXEC_RAMBLOCK_H
-#define QEMU_EXEC_RAMBLOCK_H
+#ifndef SYSTEM_RAMBLOCK_H
+#define SYSTEM_RAMBLOCK_H
-#ifndef CONFIG_USER_ONLY
-#include "cpu-common.h"
+#include "exec/cpu-common.h"
#include "qemu/rcu.h"
#include "exec/ramlist.h"
@@ -91,5 +90,5 @@ struct RAMBlock {
*/
ram_addr_t postcopy_length;
};
-#endif
+
#endif
diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabuf.c
index 85ca23cb32..0510577475 100644
--- a/hw/display/virtio-gpu-udmabuf.c
+++ b/hw/display/virtio-gpu-udmabuf.c
@@ -19,7 +19,7 @@
#include "hw/virtio/virtio-gpu.h"
#include "hw/virtio/virtio-gpu-pixman.h"
#include "trace.h"
-#include "exec/ramblock.h"
+#include "system/ramblock.h"
#include "system/hostmem.h"
#include <sys/ioctl.h>
#include <linux/memfd.h>
diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c
index 0b1da723c8..acabff2c4a 100644
--- a/hw/hyperv/hv-balloon.c
+++ b/hw/hyperv/hv-balloon.c
@@ -12,7 +12,7 @@
#include "system/address-spaces.h"
#include "exec/cpu-common.h"
-#include "exec/ramblock.h"
+#include "system/ramblock.h"
#include "hw/boards.h"
#include "hw/hyperv/dynmem-proto.h"
#include "hw/hyperv/hv-balloon.h"
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 267b612587..48561d3c74 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -28,7 +28,7 @@
#include "system/cryptodev.h"
#include "migration/postcopy-ram.h"
#include "trace.h"
-#include "exec/ramblock.h"
+#include "system/ramblock.h"
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c
index 09caf92f87..986624c79a 100644
--- a/migration/dirtyrate.c
+++ b/migration/dirtyrate.c
@@ -14,7 +14,7 @@
#include "qemu/error-report.h"
#include "hw/core/cpu.h"
#include "qapi/error.h"
-#include "exec/ramblock.h"
+#include "system/ramblock.h"
#include "exec/target_page.h"
#include "qemu/rcu_queue.h"
#include "qemu/main-loop.h"
diff --git a/migration/file.c b/migration/file.c
index 7f11e26f5c..bb8031e3c7 100644
--- a/migration/file.c
+++ b/migration/file.c
@@ -6,7 +6,7 @@
*/
#include "qemu/osdep.h"
-#include "exec/ramblock.h"
+#include "system/ramblock.h"
#include "qemu/cutils.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
diff --git a/migration/multifd-nocomp.c b/migration/multifd-nocomp.c
index ffe75256c9..94f248e8a2 100644
--- a/migration/multifd-nocomp.c
+++ b/migration/multifd-nocomp.c
@@ -11,7 +11,7 @@
*/
#include "qemu/osdep.h"
-#include "exec/ramblock.h"
+#include "system/ramblock.h"
#include "exec/target_page.h"
#include "file.h"
#include "migration-stats.h"
diff --git a/migration/multifd-qatzip.c b/migration/multifd-qatzip.c
index 6a0e989fae..7419e5dc0d 100644
--- a/migration/multifd-qatzip.c
+++ b/migration/multifd-qatzip.c
@@ -13,7 +13,7 @@
*/
#include "qemu/osdep.h"
-#include "exec/ramblock.h"
+#include "system/ramblock.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
#include "qapi/qapi-types-migration.h"
diff --git a/migration/multifd-qpl.c b/migration/multifd-qpl.c
index 88e2344af2..52902eb00c 100644
--- a/migration/multifd-qpl.c
+++ b/migration/multifd-qpl.c
@@ -14,7 +14,7 @@
#include "qemu/module.h"
#include "qapi/error.h"
#include "qapi/qapi-types-migration.h"
-#include "exec/ramblock.h"
+#include "system/ramblock.h"
#include "multifd.h"
#include "qpl/qpl.h"
diff --git a/migration/multifd-uadk.c b/migration/multifd-uadk.c
index 6895c1f65a..fd7cd9b5e8 100644
--- a/migration/multifd-uadk.c
+++ b/migration/multifd-uadk.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "qemu/module.h"
#include "qapi/error.h"
-#include "exec/ramblock.h"
+#include "system/ramblock.h"
#include "migration.h"
#include "multifd.h"
#include "options.h"
diff --git a/migration/multifd-zero-page.c b/migration/multifd-zero-page.c
index f1e988a959..dbc1184921 100644
--- a/migration/multifd-zero-page.c
+++ b/migration/multifd-zero-page.c
@@ -12,7 +12,7 @@
#include "qemu/osdep.h"
#include "qemu/cutils.h"
-#include "exec/ramblock.h"
+#include "system/ramblock.h"
#include "migration.h"
#include "migration-stats.h"
#include "multifd.h"
diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c
index 8cf8a26bb4..8820b2a787 100644
--- a/migration/multifd-zlib.c
+++ b/migration/multifd-zlib.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include <zlib.h>
#include "qemu/rcu.h"
-#include "exec/ramblock.h"
+#include "system/ramblock.h"
#include "exec/target_page.h"
#include "qapi/error.h"
#include "migration.h"
diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c
index abed140855..3c2dcf76b0 100644
--- a/migration/multifd-zstd.c
+++ b/migration/multifd-zstd.c
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include <zstd.h>
#include "qemu/rcu.h"
-#include "exec/ramblock.h"
+#include "system/ramblock.h"
#include "exec/target_page.h"
#include "qapi/error.h"
#include "migration.h"
diff --git a/migration/multifd.c b/migration/multifd.c
index dfb5189f0e..86c83e43c0 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -16,7 +16,7 @@
#include "qemu/rcu.h"
#include "exec/target_page.h"
#include "system/system.h"
-#include "exec/ramblock.h"
+#include "system/ramblock.h"
#include "qemu/error-report.h"
#include "qapi/error.h"
#include "file.h"
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
index 5d3edfcfec..995614b38c 100644
--- a/migration/postcopy-ram.c
+++ b/migration/postcopy-ram.c
@@ -31,7 +31,7 @@
#include "qemu/error-report.h"
#include "trace.h"
#include "hw/boards.h"
-#include "exec/ramblock.h"
+#include "system/ramblock.h"
#include "socket.h"
#include "yank_functions.h"
#include "tls.h"
diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c
index 239be9372d..507de74806 100644
--- a/tests/qtest/fuzz/generic_fuzz.c
+++ b/tests/qtest/fuzz/generic_fuzz.c
@@ -21,7 +21,7 @@
#include "fuzz.h"
#include "string.h"
#include "system/memory.h"
-#include "exec/ramblock.h"
+#include "system/ramblock.h"
#include "hw/qdev-core.h"
#include "hw/pci/pci.h"
#include "hw/pci/pci_device.h"
diff --git a/MAINTAINERS b/MAINTAINERS
index 2cc0b54ec4..212435e302 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3111,7 +3111,7 @@ F: include/system/ioport.h
F: include/exec/memop.h
F: include/system/memory.h
F: include/system/ram_addr.h
-F: include/exec/ramblock.h
+F: include/system/ramblock.h
F: include/system/memory_mapping.h
F: system/dma-helpers.c
F: system/ioport.c
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 24/37] include/system: Move exec/ramblock.h to system/ramblock.h
2025-03-13 3:45 ` [PATCH 24/37] include/system: Move exec/ramblock.h to system/ramblock.h Richard Henderson
@ 2025-03-13 20:56 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 20:56 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:45, Richard Henderson wrote:
> Convert the existing includes with sed.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/system/ram_addr.h | 2 +-
> include/{exec => system}/ramblock.h | 9 ++++-----
> hw/display/virtio-gpu-udmabuf.c | 2 +-
> hw/hyperv/hv-balloon.c | 2 +-
> hw/virtio/vhost-user.c | 2 +-
> migration/dirtyrate.c | 2 +-
> migration/file.c | 2 +-
> migration/multifd-nocomp.c | 2 +-
> migration/multifd-qatzip.c | 2 +-
> migration/multifd-qpl.c | 2 +-
> migration/multifd-uadk.c | 2 +-
> migration/multifd-zero-page.c | 2 +-
> migration/multifd-zlib.c | 2 +-
> migration/multifd-zstd.c | 2 +-
> migration/multifd.c | 2 +-
> migration/postcopy-ram.c | 2 +-
> tests/qtest/fuzz/generic_fuzz.c | 2 +-
> MAINTAINERS | 2 +-
> 18 files changed, 21 insertions(+), 22 deletions(-)
> rename include/{exec => system}/ramblock.h (96%)
>
> diff --git a/include/system/ram_addr.h b/include/system/ram_addr.h
> index 65f8f37b2a..eceb8fbe4b 100644
> --- a/include/system/ram_addr.h
> +++ b/include/system/ram_addr.h
> @@ -24,7 +24,7 @@
> #include "system/tcg.h"
> #include "exec/cputlb.h"
> #include "exec/ramlist.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "exec/exec-all.h"
> #include "qemu/rcu.h"
>
> diff --git a/include/exec/ramblock.h b/include/system/ramblock.h
> similarity index 96%
> rename from include/exec/ramblock.h
> rename to include/system/ramblock.h
> index 64484cd821..d8a116ba99 100644
> --- a/include/exec/ramblock.h
> +++ b/include/system/ramblock.h
> @@ -16,11 +16,10 @@
> * The functions declared here will be removed soon.
> */
>
> -#ifndef QEMU_EXEC_RAMBLOCK_H
> -#define QEMU_EXEC_RAMBLOCK_H
> +#ifndef SYSTEM_RAMBLOCK_H
> +#define SYSTEM_RAMBLOCK_H
>
> -#ifndef CONFIG_USER_ONLY
> -#include "cpu-common.h"
> +#include "exec/cpu-common.h"
> #include "qemu/rcu.h"
> #include "exec/ramlist.h"
>
> @@ -91,5 +90,5 @@ struct RAMBlock {
> */
> ram_addr_t postcopy_length;
> };
> -#endif
> +
> #endif
> diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabuf.c
> index 85ca23cb32..0510577475 100644
> --- a/hw/display/virtio-gpu-udmabuf.c
> +++ b/hw/display/virtio-gpu-udmabuf.c
> @@ -19,7 +19,7 @@
> #include "hw/virtio/virtio-gpu.h"
> #include "hw/virtio/virtio-gpu-pixman.h"
> #include "trace.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "system/hostmem.h"
> #include <sys/ioctl.h>
> #include <linux/memfd.h>
> diff --git a/hw/hyperv/hv-balloon.c b/hw/hyperv/hv-balloon.c
> index 0b1da723c8..acabff2c4a 100644
> --- a/hw/hyperv/hv-balloon.c
> +++ b/hw/hyperv/hv-balloon.c
> @@ -12,7 +12,7 @@
>
> #include "system/address-spaces.h"
> #include "exec/cpu-common.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "hw/boards.h"
> #include "hw/hyperv/dynmem-proto.h"
> #include "hw/hyperv/hv-balloon.h"
> diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
> index 267b612587..48561d3c74 100644
> --- a/hw/virtio/vhost-user.c
> +++ b/hw/virtio/vhost-user.c
> @@ -28,7 +28,7 @@
> #include "system/cryptodev.h"
> #include "migration/postcopy-ram.h"
> #include "trace.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
>
> #include <sys/ioctl.h>
> #include <sys/socket.h>
> diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c
> index 09caf92f87..986624c79a 100644
> --- a/migration/dirtyrate.c
> +++ b/migration/dirtyrate.c
> @@ -14,7 +14,7 @@
> #include "qemu/error-report.h"
> #include "hw/core/cpu.h"
> #include "qapi/error.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "exec/target_page.h"
> #include "qemu/rcu_queue.h"
> #include "qemu/main-loop.h"
> diff --git a/migration/file.c b/migration/file.c
> index 7f11e26f5c..bb8031e3c7 100644
> --- a/migration/file.c
> +++ b/migration/file.c
> @@ -6,7 +6,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "qemu/cutils.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> diff --git a/migration/multifd-nocomp.c b/migration/multifd-nocomp.c
> index ffe75256c9..94f248e8a2 100644
> --- a/migration/multifd-nocomp.c
> +++ b/migration/multifd-nocomp.c
> @@ -11,7 +11,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "exec/target_page.h"
> #include "file.h"
> #include "migration-stats.h"
> diff --git a/migration/multifd-qatzip.c b/migration/multifd-qatzip.c
> index 6a0e989fae..7419e5dc0d 100644
> --- a/migration/multifd-qatzip.c
> +++ b/migration/multifd-qatzip.c
> @@ -13,7 +13,7 @@
> */
>
> #include "qemu/osdep.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "qapi/error.h"
> #include "qemu/error-report.h"
> #include "qapi/qapi-types-migration.h"
> diff --git a/migration/multifd-qpl.c b/migration/multifd-qpl.c
> index 88e2344af2..52902eb00c 100644
> --- a/migration/multifd-qpl.c
> +++ b/migration/multifd-qpl.c
> @@ -14,7 +14,7 @@
> #include "qemu/module.h"
> #include "qapi/error.h"
> #include "qapi/qapi-types-migration.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "multifd.h"
> #include "qpl/qpl.h"
>
> diff --git a/migration/multifd-uadk.c b/migration/multifd-uadk.c
> index 6895c1f65a..fd7cd9b5e8 100644
> --- a/migration/multifd-uadk.c
> +++ b/migration/multifd-uadk.c
> @@ -13,7 +13,7 @@
> #include "qemu/osdep.h"
> #include "qemu/module.h"
> #include "qapi/error.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "migration.h"
> #include "multifd.h"
> #include "options.h"
> diff --git a/migration/multifd-zero-page.c b/migration/multifd-zero-page.c
> index f1e988a959..dbc1184921 100644
> --- a/migration/multifd-zero-page.c
> +++ b/migration/multifd-zero-page.c
> @@ -12,7 +12,7 @@
>
> #include "qemu/osdep.h"
> #include "qemu/cutils.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "migration.h"
> #include "migration-stats.h"
> #include "multifd.h"
> diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c
> index 8cf8a26bb4..8820b2a787 100644
> --- a/migration/multifd-zlib.c
> +++ b/migration/multifd-zlib.c
> @@ -13,7 +13,7 @@
> #include "qemu/osdep.h"
> #include <zlib.h>
> #include "qemu/rcu.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "exec/target_page.h"
> #include "qapi/error.h"
> #include "migration.h"
> diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c
> index abed140855..3c2dcf76b0 100644
> --- a/migration/multifd-zstd.c
> +++ b/migration/multifd-zstd.c
> @@ -13,7 +13,7 @@
> #include "qemu/osdep.h"
> #include <zstd.h>
> #include "qemu/rcu.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "exec/target_page.h"
> #include "qapi/error.h"
> #include "migration.h"
> diff --git a/migration/multifd.c b/migration/multifd.c
> index dfb5189f0e..86c83e43c0 100644
> --- a/migration/multifd.c
> +++ b/migration/multifd.c
> @@ -16,7 +16,7 @@
> #include "qemu/rcu.h"
> #include "exec/target_page.h"
> #include "system/system.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "qemu/error-report.h"
> #include "qapi/error.h"
> #include "file.h"
> diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c
> index 5d3edfcfec..995614b38c 100644
> --- a/migration/postcopy-ram.c
> +++ b/migration/postcopy-ram.c
> @@ -31,7 +31,7 @@
> #include "qemu/error-report.h"
> #include "trace.h"
> #include "hw/boards.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "socket.h"
> #include "yank_functions.h"
> #include "tls.h"
> diff --git a/tests/qtest/fuzz/generic_fuzz.c b/tests/qtest/fuzz/generic_fuzz.c
> index 239be9372d..507de74806 100644
> --- a/tests/qtest/fuzz/generic_fuzz.c
> +++ b/tests/qtest/fuzz/generic_fuzz.c
> @@ -21,7 +21,7 @@
> #include "fuzz.h"
> #include "string.h"
> #include "system/memory.h"
> -#include "exec/ramblock.h"
> +#include "system/ramblock.h"
> #include "hw/qdev-core.h"
> #include "hw/pci/pci.h"
> #include "hw/pci/pci_device.h"
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 2cc0b54ec4..212435e302 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3111,7 +3111,7 @@ F: include/system/ioport.h
> F: include/exec/memop.h
> F: include/system/memory.h
> F: include/system/ram_addr.h
> -F: include/exec/ramblock.h
> +F: include/system/ramblock.h
> F: include/system/memory_mapping.h
> F: system/dma-helpers.c
> F: system/ioport.c
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 25/37] common-user: Split out watchpoint-stub.c
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (23 preceding siblings ...)
2025-03-13 3:45 ` [PATCH 24/37] include/system: Move exec/ramblock.h to system/ramblock.h Richard Henderson
@ 2025-03-13 3:45 ` Richard Henderson
2025-03-13 10:07 ` Philippe Mathieu-Daudé
2025-03-13 20:57 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 26/37] hw/core: Move unconditional files to libsystem_ss, libuser_ss Richard Henderson
` (13 subsequent siblings)
38 siblings, 2 replies; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:45 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
Uninline the user-only stubs from hw/core/cpu.h.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/hw/core/cpu.h | 23 -----------------------
common-user/watchpoint-stub.c | 28 ++++++++++++++++++++++++++++
common-user/meson.build | 1 +
3 files changed, 29 insertions(+), 23 deletions(-)
create mode 100644 common-user/watchpoint-stub.c
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 5d11d26556..2fdb115b19 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -1109,35 +1109,12 @@ static inline bool cpu_breakpoint_test(CPUState *cpu, vaddr pc, int mask)
return false;
}
-#if defined(CONFIG_USER_ONLY)
-static inline int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len,
- int flags, CPUWatchpoint **watchpoint)
-{
- return -ENOSYS;
-}
-
-static inline int cpu_watchpoint_remove(CPUState *cpu, vaddr addr,
- vaddr len, int flags)
-{
- return -ENOSYS;
-}
-
-static inline void cpu_watchpoint_remove_by_ref(CPUState *cpu,
- CPUWatchpoint *wp)
-{
-}
-
-static inline void cpu_watchpoint_remove_all(CPUState *cpu, int mask)
-{
-}
-#else
int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len,
int flags, CPUWatchpoint **watchpoint);
int cpu_watchpoint_remove(CPUState *cpu, vaddr addr,
vaddr len, int flags);
void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *watchpoint);
void cpu_watchpoint_remove_all(CPUState *cpu, int mask);
-#endif
/**
* cpu_get_address_space:
diff --git a/common-user/watchpoint-stub.c b/common-user/watchpoint-stub.c
new file mode 100644
index 0000000000..2489fca4f3
--- /dev/null
+++ b/common-user/watchpoint-stub.c
@@ -0,0 +1,28 @@
+/*
+ * CPU watchpoint stubs
+ *
+ * Copyright (c) 2003 Fabrice Bellard
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
+#include "qemu/osdep.h"
+#include "hw/core/cpu.h"
+
+int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len,
+ int flags, CPUWatchpoint **watchpoint)
+{
+ return -ENOSYS;
+}
+
+int cpu_watchpoint_remove(CPUState *cpu, vaddr addr, vaddr len, int flags)
+{
+ return -ENOSYS;
+}
+
+void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *wp)
+{
+}
+
+void cpu_watchpoint_remove_all(CPUState *cpu, int mask)
+{
+}
diff --git a/common-user/meson.build b/common-user/meson.build
index ac9de5b9e3..4dba482863 100644
--- a/common-user/meson.build
+++ b/common-user/meson.build
@@ -7,4 +7,5 @@ common_user_inc += include_directories('host/' / host_arch)
user_ss.add(files(
'safe-syscall.S',
'safe-syscall-error.c',
+ 'watchpoint-stub.c',
))
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 25/37] common-user: Split out watchpoint-stub.c
2025-03-13 3:45 ` [PATCH 25/37] common-user: Split out watchpoint-stub.c Richard Henderson
@ 2025-03-13 10:07 ` Philippe Mathieu-Daudé
2025-03-13 10:39 ` Philippe Mathieu-Daudé
2025-03-13 20:57 ` Pierrick Bouvier
1 sibling, 1 reply; 115+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-03-13 10:07 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pierrick.bouvier, pbonzini
On 13/3/25 04:45, Richard Henderson wrote:
> Uninline the user-only stubs from hw/core/cpu.h.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/hw/core/cpu.h | 23 -----------------------
> common-user/watchpoint-stub.c | 28 ++++++++++++++++++++++++++++
> common-user/meson.build | 1 +
> 3 files changed, 29 insertions(+), 23 deletions(-)
> create mode 100644 common-user/watchpoint-stub.c
>
> diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
> index 5d11d26556..2fdb115b19 100644
> --- a/include/hw/core/cpu.h
> +++ b/include/hw/core/cpu.h
> @@ -1109,35 +1109,12 @@ static inline bool cpu_breakpoint_test(CPUState *cpu, vaddr pc, int mask)
> return false;
> }
>
> -#if defined(CONFIG_USER_ONLY)
> -static inline int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len,
> - int flags, CPUWatchpoint **watchpoint)
> -{
> - return -ENOSYS;
> -}
> -
> -static inline int cpu_watchpoint_remove(CPUState *cpu, vaddr addr,
> - vaddr len, int flags)
> -{
> - return -ENOSYS;
> -}
> -
> -static inline void cpu_watchpoint_remove_by_ref(CPUState *cpu,
> - CPUWatchpoint *wp)
> -{
> -}
> -
> -static inline void cpu_watchpoint_remove_all(CPUState *cpu, int mask)
> -{
> -}
> -#else
> int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len,
> int flags, CPUWatchpoint **watchpoint);
> int cpu_watchpoint_remove(CPUState *cpu, vaddr addr,
> vaddr len, int flags);
> void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *watchpoint);
> void cpu_watchpoint_remove_all(CPUState *cpu, int mask);
> -#endif
>
> /**
> * cpu_get_address_space:
> diff --git a/common-user/watchpoint-stub.c b/common-user/watchpoint-stub.c
> new file mode 100644
> index 0000000000..2489fca4f3
> --- /dev/null
> +++ b/common-user/watchpoint-stub.c
> @@ -0,0 +1,28 @@
> +/*
> + * CPU watchpoint stubs
> + *
> + * Copyright (c) 2003 Fabrice Bellard
> + * SPDX-License-Identifier: LGPL-2.1-or-later
> + */
> +
> +#include "qemu/osdep.h"
> +#include "hw/core/cpu.h"
> +
> +int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len,
> + int flags, CPUWatchpoint **watchpoint)
> +{
> + return -ENOSYS;
> +}
> +
> +int cpu_watchpoint_remove(CPUState *cpu, vaddr addr, vaddr len, int flags)
> +{
> + return -ENOSYS;
> +}
> +
> +void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *wp)
> +{
Again, can this be elide? Otherwise better use g_assert_not_reached().
> +}
> +
> +void cpu_watchpoint_remove_all(CPUState *cpu, int mask)
> +{
> +}
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 25/37] common-user: Split out watchpoint-stub.c
2025-03-13 10:07 ` Philippe Mathieu-Daudé
@ 2025-03-13 10:39 ` Philippe Mathieu-Daudé
2025-03-14 16:37 ` Richard Henderson
0 siblings, 1 reply; 115+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-03-13 10:39 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pierrick.bouvier, pbonzini
On 13/3/25 11:07, Philippe Mathieu-Daudé wrote:
> On 13/3/25 04:45, Richard Henderson wrote:
>> Uninline the user-only stubs from hw/core/cpu.h.
>>
>> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
>> ---
>> include/hw/core/cpu.h | 23 -----------------------
>> common-user/watchpoint-stub.c | 28 ++++++++++++++++++++++++++++
>> common-user/meson.build | 1 +
>> 3 files changed, 29 insertions(+), 23 deletions(-)
>> create mode 100644 common-user/watchpoint-stub.c
>>
>> diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
>> index 5d11d26556..2fdb115b19 100644
>> --- a/include/hw/core/cpu.h
>> +++ b/include/hw/core/cpu.h
>> @@ -1109,35 +1109,12 @@ static inline bool
>> cpu_breakpoint_test(CPUState *cpu, vaddr pc, int mask)
>> return false;
>> }
>> -#if defined(CONFIG_USER_ONLY)
>> -static inline int cpu_watchpoint_insert(CPUState *cpu, vaddr addr,
>> vaddr len,
>> - int flags, CPUWatchpoint
>> **watchpoint)
>> -{
>> - return -ENOSYS;
>> -}
>> -
>> -static inline int cpu_watchpoint_remove(CPUState *cpu, vaddr addr,
>> - vaddr len, int flags)
>> -{
>> - return -ENOSYS;
>> -}
>> -
>> -static inline void cpu_watchpoint_remove_by_ref(CPUState *cpu,
>> - CPUWatchpoint *wp)
>> -{
>> -}
>> -
>> -static inline void cpu_watchpoint_remove_all(CPUState *cpu, int mask)
>> -{
>> -}
>> -#else
>> int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len,
>> int flags, CPUWatchpoint **watchpoint);
>> int cpu_watchpoint_remove(CPUState *cpu, vaddr addr,
>> vaddr len, int flags);
>> void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint
>> *watchpoint);
>> void cpu_watchpoint_remove_all(CPUState *cpu, int mask);
>> -#endif
>> /**
>> * cpu_get_address_space:
>> diff --git a/common-user/watchpoint-stub.c b/common-user/watchpoint-
>> stub.c
>> new file mode 100644
>> index 0000000000..2489fca4f3
>> --- /dev/null
>> +++ b/common-user/watchpoint-stub.c
>> @@ -0,0 +1,28 @@
>> +/*
>> + * CPU watchpoint stubs
>> + *
>> + * Copyright (c) 2003 Fabrice Bellard
>> + * SPDX-License-Identifier: LGPL-2.1-or-later
>> + */
>> +
>> +#include "qemu/osdep.h"
>> +#include "hw/core/cpu.h"
>> +
>> +int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len,
>> + int flags, CPUWatchpoint **watchpoint)
>> +{
>> + return -ENOSYS;
>> +}
>> +
>> +int cpu_watchpoint_remove(CPUState *cpu, vaddr addr, vaddr len, int
>> flags)
>> +{
>> + return -ENOSYS;
>> +}
>> +
>> +void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *wp)
>> +{
>
> Again, can this be elide? Otherwise better use g_assert_not_reached().
We can, including:
-- >8 --
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index dba1b3ffef..54d3879c56 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -7545,4 +7545,6 @@ static void x86_cpu_reset_hold(Object *obj,
ResetType type)
env->dr[7] = DR7_FIXED_1;
+#ifndef CONFIG_USER_ONLY
cpu_breakpoint_remove_all(cs, BP_CPU);
cpu_watchpoint_remove_all(cs, BP_CPU);
+#endif
diff --git a/target/arm/debug_helper.c b/target/arm/debug_helper.c
index a9a619ba6b..f798569de7 100644
--- a/target/arm/debug_helper.c
+++ b/target/arm/debug_helper.c
@@ -368,2 +368,3 @@ static bool check_watchpoints(ARMCPU *cpu)
+#ifndef CONFIG_USER_ONLY
for (n = 0; n < ARRAY_SIZE(env->cpu_watchpoint); n++) {
@@ -373,2 +374,3 @@ static bool check_watchpoints(ARMCPU *cpu)
}
+#endif
return false;
@@ -555,2 +557,3 @@ void hw_watchpoint_update(ARMCPU *cpu, int n)
+#ifndef CONFIG_USER_ONLY
if (env->cpu_watchpoint[n]) {
@@ -559,2 +562,3 @@ void hw_watchpoint_update(ARMCPU *cpu, int n)
}
+#endif
@@ -631,4 +635,6 @@ void hw_watchpoint_update(ARMCPU *cpu, int n)
+#ifndef CONFIG_USER_ONLY
cpu_watchpoint_insert(CPU(cpu), wvr, len, flags,
&env->cpu_watchpoint[n]);
+#endif
}
@@ -637,3 +643,3 @@ void hw_watchpoint_update_all(ARMCPU *cpu)
{
- int i;
+#ifndef CONFIG_USER_ONLY
CPUARMState *env = &cpu->env;
@@ -646,4 +652,5 @@ void hw_watchpoint_update_all(ARMCPU *cpu)
memset(env->cpu_watchpoint, 0, sizeof(env->cpu_watchpoint));
+#endif
- for (i = 0; i < ARRAY_SIZE(cpu->env.cpu_watchpoint); i++) {
+ for (unsigned i = 0; i < ARRAY_SIZE(cpu->env.cpu_watchpoint); i++) {
hw_watchpoint_update(cpu, i);
---
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 25/37] common-user: Split out watchpoint-stub.c
2025-03-13 10:39 ` Philippe Mathieu-Daudé
@ 2025-03-14 16:37 ` Richard Henderson
2025-03-14 16:53 ` Pierrick Bouvier
0 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-14 16:37 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel; +Cc: pierrick.bouvier, pbonzini
On 3/13/25 03:39, Philippe Mathieu-Daudé wrote:
>>> --- /dev/null
>>> +++ b/common-user/watchpoint-stub.c
>>> @@ -0,0 +1,28 @@
>>> +/*
>>> + * CPU watchpoint stubs
>>> + *
>>> + * Copyright (c) 2003 Fabrice Bellard
>>> + * SPDX-License-Identifier: LGPL-2.1-or-later
>>> + */
>>> +
>>> +#include "qemu/osdep.h"
>>> +#include "hw/core/cpu.h"
>>> +
>>> +int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len,
>>> + int flags, CPUWatchpoint **watchpoint)
>>> +{
>>> + return -ENOSYS;
>>> +}
>>> +
>>> +int cpu_watchpoint_remove(CPUState *cpu, vaddr addr, vaddr len, int flags)
>>> +{
>>> + return -ENOSYS;
>>> +}
>>> +
>>> +void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *wp)
>>> +{
>>
>> Again, can this be elide? Otherwise better use g_assert_not_reached().
>
> We can, including:
>
> -- >8 --
> diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> index dba1b3ffef..54d3879c56 100644
> --- a/target/i386/cpu.c
> +++ b/target/i386/cpu.c
> @@ -7545,4 +7545,6 @@ static void x86_cpu_reset_hold(Object *obj, ResetType type)
> env->dr[7] = DR7_FIXED_1;
> +#ifndef CONFIG_USER_ONLY
> cpu_breakpoint_remove_all(cs, BP_CPU);
> cpu_watchpoint_remove_all(cs, BP_CPU);
> +#endif
But do we really want to add all those ifdefs?
r~
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 25/37] common-user: Split out watchpoint-stub.c
2025-03-14 16:37 ` Richard Henderson
@ 2025-03-14 16:53 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-14 16:53 UTC (permalink / raw)
To: Richard Henderson, Philippe Mathieu-Daudé, qemu-devel; +Cc: pbonzini
On 3/14/25 09:37, Richard Henderson wrote:
> On 3/13/25 03:39, Philippe Mathieu-Daudé wrote:
>>>> --- /dev/null
>>>> +++ b/common-user/watchpoint-stub.c
>>>> @@ -0,0 +1,28 @@
>>>> +/*
>>>> + * CPU watchpoint stubs
>>>> + *
>>>> + * Copyright (c) 2003 Fabrice Bellard
>>>> + * SPDX-License-Identifier: LGPL-2.1-or-later
>>>> + */
>>>> +
>>>> +#include "qemu/osdep.h"
>>>> +#include "hw/core/cpu.h"
>>>> +
>>>> +int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len,
>>>> + int flags, CPUWatchpoint **watchpoint)
>>>> +{
>>>> + return -ENOSYS;
>>>> +}
>>>> +
>>>> +int cpu_watchpoint_remove(CPUState *cpu, vaddr addr, vaddr len, int flags)
>>>> +{
>>>> + return -ENOSYS;
>>>> +}
>>>> +
>>>> +void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *wp)
>>>> +{
>>>
>>> Again, can this be elide? Otherwise better use g_assert_not_reached().
>>
>> We can, including:
>>
>> -- >8 --
>> diff --git a/target/i386/cpu.c b/target/i386/cpu.c
>> index dba1b3ffef..54d3879c56 100644
>> --- a/target/i386/cpu.c
>> +++ b/target/i386/cpu.c
>> @@ -7545,4 +7545,6 @@ static void x86_cpu_reset_hold(Object *obj, ResetType type)
>> env->dr[7] = DR7_FIXED_1;
>> +#ifndef CONFIG_USER_ONLY
>> cpu_breakpoint_remove_all(cs, BP_CPU);
>> cpu_watchpoint_remove_all(cs, BP_CPU);
>> +#endif
>
> But do we really want to add all those ifdefs?
>
I agree with Richard, trading ifdefs is not a win in the end.
Here, we replace header stubs (which are a problem, because they rely on
ifdef by design) to different compilation units, which can be selected
at link time.
In the end, we might even have to unify some stubs and their
implementations, to have a single definition of those symbols.
>
> r~
^ permalink raw reply [flat|nested] 115+ messages in thread
* Re: [PATCH 25/37] common-user: Split out watchpoint-stub.c
2025-03-13 3:45 ` [PATCH 25/37] common-user: Split out watchpoint-stub.c Richard Henderson
2025-03-13 10:07 ` Philippe Mathieu-Daudé
@ 2025-03-13 20:57 ` Pierrick Bouvier
1 sibling, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 20:57 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:45, Richard Henderson wrote:
> Uninline the user-only stubs from hw/core/cpu.h.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/hw/core/cpu.h | 23 -----------------------
> common-user/watchpoint-stub.c | 28 ++++++++++++++++++++++++++++
> common-user/meson.build | 1 +
> 3 files changed, 29 insertions(+), 23 deletions(-)
> create mode 100644 common-user/watchpoint-stub.c
>
> diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
> index 5d11d26556..2fdb115b19 100644
> --- a/include/hw/core/cpu.h
> +++ b/include/hw/core/cpu.h
> @@ -1109,35 +1109,12 @@ static inline bool cpu_breakpoint_test(CPUState *cpu, vaddr pc, int mask)
> return false;
> }
>
> -#if defined(CONFIG_USER_ONLY)
> -static inline int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len,
> - int flags, CPUWatchpoint **watchpoint)
> -{
> - return -ENOSYS;
> -}
> -
> -static inline int cpu_watchpoint_remove(CPUState *cpu, vaddr addr,
> - vaddr len, int flags)
> -{
> - return -ENOSYS;
> -}
> -
> -static inline void cpu_watchpoint_remove_by_ref(CPUState *cpu,
> - CPUWatchpoint *wp)
> -{
> -}
> -
> -static inline void cpu_watchpoint_remove_all(CPUState *cpu, int mask)
> -{
> -}
> -#else
> int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len,
> int flags, CPUWatchpoint **watchpoint);
> int cpu_watchpoint_remove(CPUState *cpu, vaddr addr,
> vaddr len, int flags);
> void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *watchpoint);
> void cpu_watchpoint_remove_all(CPUState *cpu, int mask);
> -#endif
>
> /**
> * cpu_get_address_space:
> diff --git a/common-user/watchpoint-stub.c b/common-user/watchpoint-stub.c
> new file mode 100644
> index 0000000000..2489fca4f3
> --- /dev/null
> +++ b/common-user/watchpoint-stub.c
> @@ -0,0 +1,28 @@
> +/*
> + * CPU watchpoint stubs
> + *
> + * Copyright (c) 2003 Fabrice Bellard
> + * SPDX-License-Identifier: LGPL-2.1-or-later
> + */
> +
> +#include "qemu/osdep.h"
> +#include "hw/core/cpu.h"
> +
> +int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len,
> + int flags, CPUWatchpoint **watchpoint)
> +{
> + return -ENOSYS;
> +}
> +
> +int cpu_watchpoint_remove(CPUState *cpu, vaddr addr, vaddr len, int flags)
> +{
> + return -ENOSYS;
> +}
> +
> +void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *wp)
> +{
> +}
> +
> +void cpu_watchpoint_remove_all(CPUState *cpu, int mask)
> +{
> +}
> diff --git a/common-user/meson.build b/common-user/meson.build
> index ac9de5b9e3..4dba482863 100644
> --- a/common-user/meson.build
> +++ b/common-user/meson.build
> @@ -7,4 +7,5 @@ common_user_inc += include_directories('host/' / host_arch)
> user_ss.add(files(
> 'safe-syscall.S',
> 'safe-syscall-error.c',
> + 'watchpoint-stub.c',
> ))
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 26/37] hw/core: Move unconditional files to libsystem_ss, libuser_ss
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (24 preceding siblings ...)
2025-03-13 3:45 ` [PATCH 25/37] common-user: Split out watchpoint-stub.c Richard Henderson
@ 2025-03-13 3:45 ` Richard Henderson
2025-03-13 20:57 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 27/37] system: Move watchpoint.c to libsystem_ss Richard Henderson
` (12 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:45 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
Many of the headers used by these require CONFIG_USER_ONLY.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
hw/core/meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/core/meson.build b/hw/core/meson.build
index b5a545a0ed..547de6527c 100644
--- a/hw/core/meson.build
+++ b/hw/core/meson.build
@@ -26,7 +26,7 @@ system_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c'))
system_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('sysbus-fdt.c'))
system_ss.add(when: 'CONFIG_EIF', if_true: [files('eif.c'), zlib, libcbor, gnutls])
-system_ss.add(files(
+libsystem_ss.add(files(
'cpu-system.c',
'fw-path-provider.c',
'gpio.c',
@@ -46,7 +46,7 @@ system_ss.add(files(
'vm-change-state-handler.c',
'clock-vmstate.c',
))
-user_ss.add(files(
+libuser_ss.add(files(
'cpu-user.c',
'qdev-user.c',
))
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 26/37] hw/core: Move unconditional files to libsystem_ss, libuser_ss
2025-03-13 3:45 ` [PATCH 26/37] hw/core: Move unconditional files to libsystem_ss, libuser_ss Richard Henderson
@ 2025-03-13 20:57 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 20:57 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:45, Richard Henderson wrote:
> Many of the headers used by these require CONFIG_USER_ONLY.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> hw/core/meson.build | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/core/meson.build b/hw/core/meson.build
> index b5a545a0ed..547de6527c 100644
> --- a/hw/core/meson.build
> +++ b/hw/core/meson.build
> @@ -26,7 +26,7 @@ system_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c'))
> system_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('sysbus-fdt.c'))
> system_ss.add(when: 'CONFIG_EIF', if_true: [files('eif.c'), zlib, libcbor, gnutls])
>
> -system_ss.add(files(
> +libsystem_ss.add(files(
> 'cpu-system.c',
> 'fw-path-provider.c',
> 'gpio.c',
> @@ -46,7 +46,7 @@ system_ss.add(files(
> 'vm-change-state-handler.c',
> 'clock-vmstate.c',
> ))
> -user_ss.add(files(
> +libuser_ss.add(files(
> 'cpu-user.c',
> 'qdev-user.c',
> ))
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 27/37] system: Move watchpoint.c to libsystem_ss
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (25 preceding siblings ...)
2025-03-13 3:45 ` [PATCH 26/37] hw/core: Move unconditional files to libsystem_ss, libuser_ss Richard Henderson
@ 2025-03-13 3:45 ` Richard Henderson
2025-03-13 20:57 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 28/37] plugins: Move api.c, core.c to libuser_ss, libsystem_ss Richard Henderson
` (11 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:45 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
Some of the headers used require CONFIG_USER_ONLY.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
system/meson.build | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/system/meson.build b/system/meson.build
index c83d80fa24..2aab3e97f4 100644
--- a/system/meson.build
+++ b/system/meson.build
@@ -23,9 +23,12 @@ system_ss.add(files(
'runstate.c',
'tpm-hmp-cmds.c',
'vl.c',
- 'watchpoint.c',
), sdl, libpmem, libdaxctl)
+libsystem_ss.add(files(
+ 'watchpoint.c',
+))
+
if have_tpm
system_ss.add(files('tpm.c'))
endif
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 27/37] system: Move watchpoint.c to libsystem_ss
2025-03-13 3:45 ` [PATCH 27/37] system: Move watchpoint.c to libsystem_ss Richard Henderson
@ 2025-03-13 20:57 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 20:57 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:45, Richard Henderson wrote:
> Some of the headers used require CONFIG_USER_ONLY.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> system/meson.build | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/system/meson.build b/system/meson.build
> index c83d80fa24..2aab3e97f4 100644
> --- a/system/meson.build
> +++ b/system/meson.build
> @@ -23,9 +23,12 @@ system_ss.add(files(
> 'runstate.c',
> 'tpm-hmp-cmds.c',
> 'vl.c',
> - 'watchpoint.c',
> ), sdl, libpmem, libdaxctl)
>
> +libsystem_ss.add(files(
> + 'watchpoint.c',
> +))
> +
> if have_tpm
> system_ss.add(files('tpm.c'))
> endif
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 28/37] plugins: Move api.c, core.c to libuser_ss, libsystem_ss
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (26 preceding siblings ...)
2025-03-13 3:45 ` [PATCH 27/37] system: Move watchpoint.c to libsystem_ss Richard Henderson
@ 2025-03-13 3:45 ` Richard Henderson
2025-03-13 20:57 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 29/37] include/exec: Split out cpu-mmu-index.h Richard Henderson
` (10 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:45 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
Headers used by these files require CONFIG_USER_ONLY.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
plugins/meson.build | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/plugins/meson.build b/plugins/meson.build
index 3be8245a69..5383c7b88b 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -61,5 +61,8 @@ endif
user_ss.add(files('user.c', 'api-user.c'))
system_ss.add(files('system.c', 'api-system.c'))
-common_ss.add(files('loader.c', 'api.c', 'core.c'))
+libuser_ss.add(files('api.c', 'core.c'))
+libsystem_ss.add(files('api.c', 'core.c'))
+
+common_ss.add(files('loader.c'))
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 28/37] plugins: Move api.c, core.c to libuser_ss, libsystem_ss
2025-03-13 3:45 ` [PATCH 28/37] plugins: Move api.c, core.c to libuser_ss, libsystem_ss Richard Henderson
@ 2025-03-13 20:57 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 20:57 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:45, Richard Henderson wrote:
> Headers used by these files require CONFIG_USER_ONLY.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> plugins/meson.build | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/plugins/meson.build b/plugins/meson.build
> index 3be8245a69..5383c7b88b 100644
> --- a/plugins/meson.build
> +++ b/plugins/meson.build
> @@ -61,5 +61,8 @@ endif
> user_ss.add(files('user.c', 'api-user.c'))
> system_ss.add(files('system.c', 'api-system.c'))
>
> -common_ss.add(files('loader.c', 'api.c', 'core.c'))
> +libuser_ss.add(files('api.c', 'core.c'))
> +libsystem_ss.add(files('api.c', 'core.c'))
> +
> +common_ss.add(files('loader.c'))
>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 29/37] include/exec: Split out cpu-mmu-index.h
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (27 preceding siblings ...)
2025-03-13 3:45 ` [PATCH 28/37] plugins: Move api.c, core.c to libuser_ss, libsystem_ss Richard Henderson
@ 2025-03-13 3:45 ` Richard Henderson
2025-03-13 20:58 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 30/37] include/exec: Drop ifndef CONFIG_USER_ONLY from cpu-common.h Richard Henderson
` (9 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:45 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
The implementation of cpu_mmu_index was split between
cpu-common.h and cpu-all.h, depending on CONFIG_USER_ONLY.
Unify within a new header and include only where needed.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/cpu-all.h | 6 ------
include/exec/cpu-common.h | 20 --------------------
include/exec/cpu-mmu-index.h | 33 +++++++++++++++++++++++++++++++++
include/exec/cpu_ldst.h | 1 +
accel/tcg/translator.c | 1 +
semihosting/uaccess.c | 1 +
target/arm/gdbstub64.c | 3 +++
target/hppa/mem_helper.c | 1 +
target/i386/tcg/translate.c | 1 +
target/loongarch/cpu_helper.c | 1 +
target/microblaze/helper.c | 1 +
target/microblaze/mmu.c | 1 +
target/openrisc/translate.c | 1 +
target/sparc/cpu.c | 1 +
target/sparc/mmu_helper.c | 1 +
target/tricore/helper.c | 1 +
target/xtensa/mmu_helper.c | 1 +
17 files changed, 49 insertions(+), 26 deletions(-)
create mode 100644 include/exec/cpu-mmu-index.h
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index d72c28a5d2..e62a9a4c79 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -113,8 +113,6 @@ CPUArchState *cpu_copy(CPUArchState *env);
#ifdef CONFIG_USER_ONLY
-static inline int cpu_mmu_index(CPUState *cs, bool ifetch);
-
/*
* Allow some level of source compatibility with softmmu. We do not
* support any of the more exotic features, so only invalid pages may
@@ -124,10 +122,6 @@ static inline int cpu_mmu_index(CPUState *cs, bool ifetch);
#define TLB_MMIO (1 << (TARGET_PAGE_BITS_MIN - 2))
#define TLB_WATCHPOINT 0
-static inline int cpu_mmu_index(CPUState *cs, bool ifetch)
-{
- return MMU_USER_IDX;
-}
#else
/*
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index 3771b2130c..be032e1a49 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -272,24 +272,4 @@ static inline CPUState *env_cpu(CPUArchState *env)
return (CPUState *)env_cpu_const(env);
}
-#ifndef CONFIG_USER_ONLY
-/**
- * cpu_mmu_index:
- * @env: The cpu environment
- * @ifetch: True for code access, false for data access.
- *
- * Return the core mmu index for the current translation regime.
- * This function is used by generic TCG code paths.
- *
- * The user-only version of this function is inline in cpu-all.h,
- * where it always returns MMU_USER_IDX.
- */
-static inline int cpu_mmu_index(CPUState *cs, bool ifetch)
-{
- int ret = cs->cc->mmu_index(cs, ifetch);
- tcg_debug_assert(ret >= 0 && ret < NB_MMU_MODES);
- return ret;
-}
-#endif /* !CONFIG_USER_ONLY */
-
#endif /* CPU_COMMON_H */
diff --git a/include/exec/cpu-mmu-index.h b/include/exec/cpu-mmu-index.h
new file mode 100644
index 0000000000..8a8dc4b162
--- /dev/null
+++ b/include/exec/cpu-mmu-index.h
@@ -0,0 +1,33 @@
+/*
+ * cpu_mmu_index()
+ *
+ * Copyright (c) 2003 Fabrice Bellard
+ *
+ * SPDX-License-Identifier: LGPL-2.1+
+ */
+
+#ifndef EXEC_CPU_MMU_INDEX_H
+#define EXEC_CPU_MMU_INDEX_H
+
+#include "hw/core/cpu.h"
+
+/**
+ * cpu_mmu_index:
+ * @env: The cpu environment
+ * @ifetch: True for code access, false for data access.
+ *
+ * Return the core mmu index for the current translation regime.
+ * This function is used by generic TCG code paths.
+ */
+static inline int cpu_mmu_index(CPUState *cs, bool ifetch)
+{
+#ifdef CONFIG_USER_ONLY
+ return MMU_USER_IDX;
+#else
+ int ret = cs->cc->mmu_index(cs, ifetch);
+ tcg_debug_assert(ret >= 0 && ret < NB_MMU_MODES);
+ return ret;
+#endif
+}
+
+#endif /* EXEC_CPU_MMU_INDEX_H */
diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
index 92b4cf20fd..82e67eff68 100644
--- a/include/exec/cpu_ldst.h
+++ b/include/exec/cpu_ldst.h
@@ -67,6 +67,7 @@
#endif
#include "exec/cpu-ldst-common.h"
+#include "exec/cpu-mmu-index.h"
#include "exec/abi_ptr.h"
#if defined(CONFIG_USER_ONLY)
diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
index 405e0b44c4..49e1a64000 100644
--- a/accel/tcg/translator.c
+++ b/accel/tcg/translator.c
@@ -13,6 +13,7 @@
#include "qemu/error-report.h"
#include "exec/exec-all.h"
#include "exec/cpu-ldst-common.h"
+#include "exec/cpu-mmu-index.h"
#include "exec/translator.h"
#include "exec/plugin-gen.h"
#include "tcg/tcg-op-common.h"
diff --git a/semihosting/uaccess.c b/semihosting/uaccess.c
index 382a366ce3..a957891166 100644
--- a/semihosting/uaccess.c
+++ b/semihosting/uaccess.c
@@ -9,6 +9,7 @@
#include "qemu/osdep.h"
#include "exec/cpu-all.h"
+#include "exec/cpu-mmu-index.h"
#include "exec/exec-all.h"
#include "semihosting/uaccess.h"
diff --git a/target/arm/gdbstub64.c b/target/arm/gdbstub64.c
index 1a4dbec567..a9d8352b76 100644
--- a/target/arm/gdbstub64.c
+++ b/target/arm/gdbstub64.c
@@ -27,6 +27,9 @@
#include <sys/prctl.h>
#include "mte_user_helper.h"
#endif
+#ifdef CONFIG_TCG
+#include "exec/cpu-mmu-index.h"
+#endif
int aarch64_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)
{
diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c
index fb1d93ef1f..510786518d 100644
--- a/target/hppa/mem_helper.c
+++ b/target/hppa/mem_helper.c
@@ -22,6 +22,7 @@
#include "cpu.h"
#include "exec/exec-all.h"
#include "exec/cputlb.h"
+#include "exec/cpu-mmu-index.h"
#include "exec/page-protection.h"
#include "exec/helper-proto.h"
#include "hw/core/cpu.h"
diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
index a8935f487a..20a5c69795 100644
--- a/target/i386/tcg/translate.c
+++ b/target/i386/tcg/translate.c
@@ -20,6 +20,7 @@
#include "qemu/host-utils.h"
#include "cpu.h"
+#include "exec/cpu-mmu-index.h"
#include "exec/exec-all.h"
#include "exec/translation-block.h"
#include "tcg/tcg-op.h"
diff --git a/target/loongarch/cpu_helper.c b/target/loongarch/cpu_helper.c
index 930466ca48..8662fb36ed 100644
--- a/target/loongarch/cpu_helper.c
+++ b/target/loongarch/cpu_helper.c
@@ -8,6 +8,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
+#include "exec/cpu-mmu-index.h"
#include "internals.h"
#include "cpu-csr.h"
diff --git a/target/microblaze/helper.c b/target/microblaze/helper.c
index 27fc929bee..996514ffe8 100644
--- a/target/microblaze/helper.c
+++ b/target/microblaze/helper.c
@@ -21,6 +21,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
#include "exec/cputlb.h"
+#include "exec/cpu-mmu-index.h"
#include "exec/page-protection.h"
#include "qemu/host-utils.h"
#include "exec/log.h"
diff --git a/target/microblaze/mmu.c b/target/microblaze/mmu.c
index f8587d5ac4..987ac9e3a7 100644
--- a/target/microblaze/mmu.c
+++ b/target/microblaze/mmu.c
@@ -22,6 +22,7 @@
#include "qemu/log.h"
#include "cpu.h"
#include "exec/cputlb.h"
+#include "exec/cpu-mmu-index.h"
#include "exec/page-protection.h"
static unsigned int tlb_decode_size(unsigned int f)
diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c
index 7a6af183ae..5b437959ac 100644
--- a/target/openrisc/translate.c
+++ b/target/openrisc/translate.c
@@ -20,6 +20,7 @@
#include "qemu/osdep.h"
#include "cpu.h"
+#include "exec/cpu-mmu-index.h"
#include "exec/exec-all.h"
#include "tcg/tcg-op.h"
#include "qemu/log.h"
diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
index 5716120117..1bf00407af 100644
--- a/target/sparc/cpu.c
+++ b/target/sparc/cpu.c
@@ -22,6 +22,7 @@
#include "cpu.h"
#include "qemu/module.h"
#include "qemu/qemu-print.h"
+#include "exec/cpu-mmu-index.h"
#include "exec/exec-all.h"
#include "exec/translation-block.h"
#include "hw/qdev-properties.h"
diff --git a/target/sparc/mmu_helper.c b/target/sparc/mmu_helper.c
index 7548d01777..4a0cedd9e2 100644
--- a/target/sparc/mmu_helper.c
+++ b/target/sparc/mmu_helper.c
@@ -21,6 +21,7 @@
#include "qemu/log.h"
#include "cpu.h"
#include "exec/cputlb.h"
+#include "exec/cpu-mmu-index.h"
#include "exec/page-protection.h"
#include "qemu/qemu-print.h"
#include "trace.h"
diff --git a/target/tricore/helper.c b/target/tricore/helper.c
index a64412e6bd..be3d97af78 100644
--- a/target/tricore/helper.c
+++ b/target/tricore/helper.c
@@ -20,6 +20,7 @@
#include "hw/registerfields.h"
#include "cpu.h"
#include "exec/cputlb.h"
+#include "exec/cpu-mmu-index.h"
#include "exec/page-protection.h"
#include "fpu/softfloat-helpers.h"
#include "qemu/qemu-print.h"
diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c
index 63be741a42..96140c89c7 100644
--- a/target/xtensa/mmu_helper.c
+++ b/target/xtensa/mmu_helper.c
@@ -33,6 +33,7 @@
#include "exec/helper-proto.h"
#include "qemu/host-utils.h"
#include "exec/cputlb.h"
+#include "exec/cpu-mmu-index.h"
#include "exec/exec-all.h"
#include "exec/page-protection.h"
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 29/37] include/exec: Split out cpu-mmu-index.h
2025-03-13 3:45 ` [PATCH 29/37] include/exec: Split out cpu-mmu-index.h Richard Henderson
@ 2025-03-13 20:58 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 20:58 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:45, Richard Henderson wrote:
> The implementation of cpu_mmu_index was split between
> cpu-common.h and cpu-all.h, depending on CONFIG_USER_ONLY.
> Unify within a new header and include only where needed.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/exec/cpu-all.h | 6 ------
> include/exec/cpu-common.h | 20 --------------------
> include/exec/cpu-mmu-index.h | 33 +++++++++++++++++++++++++++++++++
> include/exec/cpu_ldst.h | 1 +
> accel/tcg/translator.c | 1 +
> semihosting/uaccess.c | 1 +
> target/arm/gdbstub64.c | 3 +++
> target/hppa/mem_helper.c | 1 +
> target/i386/tcg/translate.c | 1 +
> target/loongarch/cpu_helper.c | 1 +
> target/microblaze/helper.c | 1 +
> target/microblaze/mmu.c | 1 +
> target/openrisc/translate.c | 1 +
> target/sparc/cpu.c | 1 +
> target/sparc/mmu_helper.c | 1 +
> target/tricore/helper.c | 1 +
> target/xtensa/mmu_helper.c | 1 +
> 17 files changed, 49 insertions(+), 26 deletions(-)
> create mode 100644 include/exec/cpu-mmu-index.h
>
> diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
> index d72c28a5d2..e62a9a4c79 100644
> --- a/include/exec/cpu-all.h
> +++ b/include/exec/cpu-all.h
> @@ -113,8 +113,6 @@ CPUArchState *cpu_copy(CPUArchState *env);
>
> #ifdef CONFIG_USER_ONLY
>
> -static inline int cpu_mmu_index(CPUState *cs, bool ifetch);
> -
> /*
> * Allow some level of source compatibility with softmmu. We do not
> * support any of the more exotic features, so only invalid pages may
> @@ -124,10 +122,6 @@ static inline int cpu_mmu_index(CPUState *cs, bool ifetch);
> #define TLB_MMIO (1 << (TARGET_PAGE_BITS_MIN - 2))
> #define TLB_WATCHPOINT 0
>
> -static inline int cpu_mmu_index(CPUState *cs, bool ifetch)
> -{
> - return MMU_USER_IDX;
> -}
> #else
>
> /*
> diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
> index 3771b2130c..be032e1a49 100644
> --- a/include/exec/cpu-common.h
> +++ b/include/exec/cpu-common.h
> @@ -272,24 +272,4 @@ static inline CPUState *env_cpu(CPUArchState *env)
> return (CPUState *)env_cpu_const(env);
> }
>
> -#ifndef CONFIG_USER_ONLY
> -/**
> - * cpu_mmu_index:
> - * @env: The cpu environment
> - * @ifetch: True for code access, false for data access.
> - *
> - * Return the core mmu index for the current translation regime.
> - * This function is used by generic TCG code paths.
> - *
> - * The user-only version of this function is inline in cpu-all.h,
> - * where it always returns MMU_USER_IDX.
> - */
> -static inline int cpu_mmu_index(CPUState *cs, bool ifetch)
> -{
> - int ret = cs->cc->mmu_index(cs, ifetch);
> - tcg_debug_assert(ret >= 0 && ret < NB_MMU_MODES);
> - return ret;
> -}
> -#endif /* !CONFIG_USER_ONLY */
> -
> #endif /* CPU_COMMON_H */
> diff --git a/include/exec/cpu-mmu-index.h b/include/exec/cpu-mmu-index.h
> new file mode 100644
> index 0000000000..8a8dc4b162
> --- /dev/null
> +++ b/include/exec/cpu-mmu-index.h
> @@ -0,0 +1,33 @@
> +/*
> + * cpu_mmu_index()
> + *
> + * Copyright (c) 2003 Fabrice Bellard
> + *
> + * SPDX-License-Identifier: LGPL-2.1+
> + */
> +
> +#ifndef EXEC_CPU_MMU_INDEX_H
> +#define EXEC_CPU_MMU_INDEX_H
> +
> +#include "hw/core/cpu.h"
> +
> +/**
> + * cpu_mmu_index:
> + * @env: The cpu environment
> + * @ifetch: True for code access, false for data access.
> + *
> + * Return the core mmu index for the current translation regime.
> + * This function is used by generic TCG code paths.
> + */
> +static inline int cpu_mmu_index(CPUState *cs, bool ifetch)
> +{
> +#ifdef CONFIG_USER_ONLY
> + return MMU_USER_IDX;
> +#else
> + int ret = cs->cc->mmu_index(cs, ifetch);
> + tcg_debug_assert(ret >= 0 && ret < NB_MMU_MODES);
> + return ret;
> +#endif
> +}
> +
> +#endif /* EXEC_CPU_MMU_INDEX_H */
> diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h
> index 92b4cf20fd..82e67eff68 100644
> --- a/include/exec/cpu_ldst.h
> +++ b/include/exec/cpu_ldst.h
> @@ -67,6 +67,7 @@
> #endif
>
> #include "exec/cpu-ldst-common.h"
> +#include "exec/cpu-mmu-index.h"
> #include "exec/abi_ptr.h"
>
> #if defined(CONFIG_USER_ONLY)
> diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c
> index 405e0b44c4..49e1a64000 100644
> --- a/accel/tcg/translator.c
> +++ b/accel/tcg/translator.c
> @@ -13,6 +13,7 @@
> #include "qemu/error-report.h"
> #include "exec/exec-all.h"
> #include "exec/cpu-ldst-common.h"
> +#include "exec/cpu-mmu-index.h"
> #include "exec/translator.h"
> #include "exec/plugin-gen.h"
> #include "tcg/tcg-op-common.h"
> diff --git a/semihosting/uaccess.c b/semihosting/uaccess.c
> index 382a366ce3..a957891166 100644
> --- a/semihosting/uaccess.c
> +++ b/semihosting/uaccess.c
> @@ -9,6 +9,7 @@
>
> #include "qemu/osdep.h"
> #include "exec/cpu-all.h"
> +#include "exec/cpu-mmu-index.h"
> #include "exec/exec-all.h"
> #include "semihosting/uaccess.h"
>
> diff --git a/target/arm/gdbstub64.c b/target/arm/gdbstub64.c
> index 1a4dbec567..a9d8352b76 100644
> --- a/target/arm/gdbstub64.c
> +++ b/target/arm/gdbstub64.c
> @@ -27,6 +27,9 @@
> #include <sys/prctl.h>
> #include "mte_user_helper.h"
> #endif
> +#ifdef CONFIG_TCG
> +#include "exec/cpu-mmu-index.h"
> +#endif
>
> int aarch64_cpu_gdb_read_register(CPUState *cs, GByteArray *mem_buf, int n)
> {
> diff --git a/target/hppa/mem_helper.c b/target/hppa/mem_helper.c
> index fb1d93ef1f..510786518d 100644
> --- a/target/hppa/mem_helper.c
> +++ b/target/hppa/mem_helper.c
> @@ -22,6 +22,7 @@
> #include "cpu.h"
> #include "exec/exec-all.h"
> #include "exec/cputlb.h"
> +#include "exec/cpu-mmu-index.h"
> #include "exec/page-protection.h"
> #include "exec/helper-proto.h"
> #include "hw/core/cpu.h"
> diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c
> index a8935f487a..20a5c69795 100644
> --- a/target/i386/tcg/translate.c
> +++ b/target/i386/tcg/translate.c
> @@ -20,6 +20,7 @@
>
> #include "qemu/host-utils.h"
> #include "cpu.h"
> +#include "exec/cpu-mmu-index.h"
> #include "exec/exec-all.h"
> #include "exec/translation-block.h"
> #include "tcg/tcg-op.h"
> diff --git a/target/loongarch/cpu_helper.c b/target/loongarch/cpu_helper.c
> index 930466ca48..8662fb36ed 100644
> --- a/target/loongarch/cpu_helper.c
> +++ b/target/loongarch/cpu_helper.c
> @@ -8,6 +8,7 @@
>
> #include "qemu/osdep.h"
> #include "cpu.h"
> +#include "exec/cpu-mmu-index.h"
> #include "internals.h"
> #include "cpu-csr.h"
>
> diff --git a/target/microblaze/helper.c b/target/microblaze/helper.c
> index 27fc929bee..996514ffe8 100644
> --- a/target/microblaze/helper.c
> +++ b/target/microblaze/helper.c
> @@ -21,6 +21,7 @@
> #include "qemu/osdep.h"
> #include "cpu.h"
> #include "exec/cputlb.h"
> +#include "exec/cpu-mmu-index.h"
> #include "exec/page-protection.h"
> #include "qemu/host-utils.h"
> #include "exec/log.h"
> diff --git a/target/microblaze/mmu.c b/target/microblaze/mmu.c
> index f8587d5ac4..987ac9e3a7 100644
> --- a/target/microblaze/mmu.c
> +++ b/target/microblaze/mmu.c
> @@ -22,6 +22,7 @@
> #include "qemu/log.h"
> #include "cpu.h"
> #include "exec/cputlb.h"
> +#include "exec/cpu-mmu-index.h"
> #include "exec/page-protection.h"
>
> static unsigned int tlb_decode_size(unsigned int f)
> diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c
> index 7a6af183ae..5b437959ac 100644
> --- a/target/openrisc/translate.c
> +++ b/target/openrisc/translate.c
> @@ -20,6 +20,7 @@
>
> #include "qemu/osdep.h"
> #include "cpu.h"
> +#include "exec/cpu-mmu-index.h"
> #include "exec/exec-all.h"
> #include "tcg/tcg-op.h"
> #include "qemu/log.h"
> diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
> index 5716120117..1bf00407af 100644
> --- a/target/sparc/cpu.c
> +++ b/target/sparc/cpu.c
> @@ -22,6 +22,7 @@
> #include "cpu.h"
> #include "qemu/module.h"
> #include "qemu/qemu-print.h"
> +#include "exec/cpu-mmu-index.h"
> #include "exec/exec-all.h"
> #include "exec/translation-block.h"
> #include "hw/qdev-properties.h"
> diff --git a/target/sparc/mmu_helper.c b/target/sparc/mmu_helper.c
> index 7548d01777..4a0cedd9e2 100644
> --- a/target/sparc/mmu_helper.c
> +++ b/target/sparc/mmu_helper.c
> @@ -21,6 +21,7 @@
> #include "qemu/log.h"
> #include "cpu.h"
> #include "exec/cputlb.h"
> +#include "exec/cpu-mmu-index.h"
> #include "exec/page-protection.h"
> #include "qemu/qemu-print.h"
> #include "trace.h"
> diff --git a/target/tricore/helper.c b/target/tricore/helper.c
> index a64412e6bd..be3d97af78 100644
> --- a/target/tricore/helper.c
> +++ b/target/tricore/helper.c
> @@ -20,6 +20,7 @@
> #include "hw/registerfields.h"
> #include "cpu.h"
> #include "exec/cputlb.h"
> +#include "exec/cpu-mmu-index.h"
> #include "exec/page-protection.h"
> #include "fpu/softfloat-helpers.h"
> #include "qemu/qemu-print.h"
> diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c
> index 63be741a42..96140c89c7 100644
> --- a/target/xtensa/mmu_helper.c
> +++ b/target/xtensa/mmu_helper.c
> @@ -33,6 +33,7 @@
> #include "exec/helper-proto.h"
> #include "qemu/host-utils.h"
> #include "exec/cputlb.h"
> +#include "exec/cpu-mmu-index.h"
> #include "exec/exec-all.h"
> #include "exec/page-protection.h"
>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 30/37] include/exec: Drop ifndef CONFIG_USER_ONLY from cpu-common.h
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (28 preceding siblings ...)
2025-03-13 3:45 ` [PATCH 29/37] include/exec: Split out cpu-mmu-index.h Richard Henderson
@ 2025-03-13 3:45 ` Richard Henderson
2025-03-13 20:58 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 31/37] include/hw/core: Drop ifndef CONFIG_USER_ONLY from cpu.h Richard Henderson
` (8 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:45 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
We were hiding a number of declarations from user-only,
although it hurts nothing to allow them.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/cpu-common.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
index be032e1a49..9b83fd7ac8 100644
--- a/include/exec/cpu-common.h
+++ b/include/exec/cpu-common.h
@@ -9,9 +9,7 @@
#define CPU_COMMON_H
#include "exec/vaddr.h"
-#ifndef CONFIG_USER_ONLY
#include "exec/hwaddr.h"
-#endif
#include "hw/core/cpu.h"
#include "tcg/debug-assert.h"
#include "exec/page-protection.h"
@@ -40,8 +38,6 @@ int cpu_get_free_index(void);
void tcg_iommu_init_notifier_list(CPUState *cpu);
void tcg_iommu_free_notifier_list(CPUState *cpu);
-#if !defined(CONFIG_USER_ONLY)
-
enum device_endian {
DEVICE_NATIVE_ENDIAN,
DEVICE_BIG_ENDIAN,
@@ -176,8 +172,6 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length);
int ram_block_discard_guest_memfd_range(RAMBlock *rb, uint64_t start,
size_t length);
-#endif
-
/* Returns: 0 on success, -1 on error */
int cpu_memory_rw_debug(CPUState *cpu, vaddr addr,
void *ptr, size_t len, bool is_write);
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 30/37] include/exec: Drop ifndef CONFIG_USER_ONLY from cpu-common.h
2025-03-13 3:45 ` [PATCH 30/37] include/exec: Drop ifndef CONFIG_USER_ONLY from cpu-common.h Richard Henderson
@ 2025-03-13 20:58 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 20:58 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:45, Richard Henderson wrote:
> We were hiding a number of declarations from user-only,
> although it hurts nothing to allow them.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/exec/cpu-common.h | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
> index be032e1a49..9b83fd7ac8 100644
> --- a/include/exec/cpu-common.h
> +++ b/include/exec/cpu-common.h
> @@ -9,9 +9,7 @@
> #define CPU_COMMON_H
>
> #include "exec/vaddr.h"
> -#ifndef CONFIG_USER_ONLY
> #include "exec/hwaddr.h"
> -#endif
> #include "hw/core/cpu.h"
> #include "tcg/debug-assert.h"
> #include "exec/page-protection.h"
> @@ -40,8 +38,6 @@ int cpu_get_free_index(void);
> void tcg_iommu_init_notifier_list(CPUState *cpu);
> void tcg_iommu_free_notifier_list(CPUState *cpu);
>
> -#if !defined(CONFIG_USER_ONLY)
> -
> enum device_endian {
> DEVICE_NATIVE_ENDIAN,
> DEVICE_BIG_ENDIAN,
> @@ -176,8 +172,6 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length);
> int ram_block_discard_guest_memfd_range(RAMBlock *rb, uint64_t start,
> size_t length);
>
> -#endif
> -
> /* Returns: 0 on success, -1 on error */
> int cpu_memory_rw_debug(CPUState *cpu, vaddr addr,
> void *ptr, size_t len, bool is_write);
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 31/37] include/hw/core: Drop ifndef CONFIG_USER_ONLY from cpu.h
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (29 preceding siblings ...)
2025-03-13 3:45 ` [PATCH 30/37] include/exec: Drop ifndef CONFIG_USER_ONLY from cpu-common.h Richard Henderson
@ 2025-03-13 3:45 ` Richard Henderson
2025-03-13 20:58 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 32/37] include/hw/intc: Remove ifndef CONFIG_USER_ONLY from armv7m_nvic.h Richard Henderson
` (7 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:45 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
We were hiding a number of declarations from user-only,
although it hurts nothing to allow them.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/hw/core/cpu.h | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
index 2fdb115b19..59394212fa 100644
--- a/include/hw/core/cpu.h
+++ b/include/hw/core/cpu.h
@@ -614,8 +614,6 @@ extern bool mttcg_enabled;
*/
bool cpu_paging_enabled(const CPUState *cpu);
-#if !defined(CONFIG_USER_ONLY)
-
/**
* cpu_get_memory_mapping:
* @cpu: The CPU whose memory mappings are to be obtained.
@@ -676,8 +674,6 @@ int cpu_write_elf32_qemunote(WriteCoreDumpFunction f, CPUState *cpu,
*/
GuestPanicInformation *cpu_get_crash_info(CPUState *cpu);
-#endif /* !CONFIG_USER_ONLY */
-
/**
* CPUDumpFlags:
* @CPU_DUMP_CODE:
@@ -701,7 +697,6 @@ enum CPUDumpFlags {
*/
void cpu_dump_state(CPUState *cpu, FILE *f, int flags);
-#ifndef CONFIG_USER_ONLY
/**
* cpu_get_phys_page_attrs_debug:
* @cpu: The CPU to obtain the physical page address for.
@@ -758,8 +753,6 @@ bool cpu_virtio_is_big_endian(CPUState *cpu);
*/
bool cpu_has_work(CPUState *cpu);
-#endif /* CONFIG_USER_ONLY */
-
/**
* cpu_list_add:
* @cpu: The CPU to be added to the list of CPUs.
@@ -1143,8 +1136,6 @@ const char *target_name(void);
#ifdef COMPILING_PER_TARGET
-#ifndef CONFIG_USER_ONLY
-
extern const VMStateDescription vmstate_cpu_common;
#define VMSTATE_CPU() { \
@@ -1154,7 +1145,6 @@ extern const VMStateDescription vmstate_cpu_common;
.flags = VMS_STRUCT, \
.offset = 0, \
}
-#endif /* !CONFIG_USER_ONLY */
#endif /* COMPILING_PER_TARGET */
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 31/37] include/hw/core: Drop ifndef CONFIG_USER_ONLY from cpu.h
2025-03-13 3:45 ` [PATCH 31/37] include/hw/core: Drop ifndef CONFIG_USER_ONLY from cpu.h Richard Henderson
@ 2025-03-13 20:58 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 20:58 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:45, Richard Henderson wrote:
> We were hiding a number of declarations from user-only,
> although it hurts nothing to allow them.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/hw/core/cpu.h | 10 ----------
> 1 file changed, 10 deletions(-)
>
> diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
> index 2fdb115b19..59394212fa 100644
> --- a/include/hw/core/cpu.h
> +++ b/include/hw/core/cpu.h
> @@ -614,8 +614,6 @@ extern bool mttcg_enabled;
> */
> bool cpu_paging_enabled(const CPUState *cpu);
>
> -#if !defined(CONFIG_USER_ONLY)
> -
> /**
> * cpu_get_memory_mapping:
> * @cpu: The CPU whose memory mappings are to be obtained.
> @@ -676,8 +674,6 @@ int cpu_write_elf32_qemunote(WriteCoreDumpFunction f, CPUState *cpu,
> */
> GuestPanicInformation *cpu_get_crash_info(CPUState *cpu);
>
> -#endif /* !CONFIG_USER_ONLY */
> -
> /**
> * CPUDumpFlags:
> * @CPU_DUMP_CODE:
> @@ -701,7 +697,6 @@ enum CPUDumpFlags {
> */
> void cpu_dump_state(CPUState *cpu, FILE *f, int flags);
>
> -#ifndef CONFIG_USER_ONLY
> /**
> * cpu_get_phys_page_attrs_debug:
> * @cpu: The CPU to obtain the physical page address for.
> @@ -758,8 +753,6 @@ bool cpu_virtio_is_big_endian(CPUState *cpu);
> */
> bool cpu_has_work(CPUState *cpu);
>
> -#endif /* CONFIG_USER_ONLY */
> -
> /**
> * cpu_list_add:
> * @cpu: The CPU to be added to the list of CPUs.
> @@ -1143,8 +1136,6 @@ const char *target_name(void);
>
> #ifdef COMPILING_PER_TARGET
>
> -#ifndef CONFIG_USER_ONLY
> -
> extern const VMStateDescription vmstate_cpu_common;
>
> #define VMSTATE_CPU() { \
> @@ -1154,7 +1145,6 @@ extern const VMStateDescription vmstate_cpu_common;
> .flags = VMS_STRUCT, \
> .offset = 0, \
> }
> -#endif /* !CONFIG_USER_ONLY */
>
> #endif /* COMPILING_PER_TARGET */
>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 32/37] include/hw/intc: Remove ifndef CONFIG_USER_ONLY from armv7m_nvic.h
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (30 preceding siblings ...)
2025-03-13 3:45 ` [PATCH 31/37] include/hw/core: Drop ifndef CONFIG_USER_ONLY from cpu.h Richard Henderson
@ 2025-03-13 3:45 ` Richard Henderson
2025-03-13 21:00 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 33/37] include/hw/s390x: Remove ifndef CONFIG_USER_ONLY in css.h Richard Henderson
` (6 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:45 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
We were hiding a number of declarations from user-only,
although it hurts nothing to allow them. The inlines
for user-only are unused.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/hw/intc/armv7m_nvic.h | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/include/hw/intc/armv7m_nvic.h b/include/hw/intc/armv7m_nvic.h
index 89fe8aedaa..7b9964fe7e 100644
--- a/include/hw/intc/armv7m_nvic.h
+++ b/include/hw/intc/armv7m_nvic.h
@@ -189,21 +189,7 @@ int armv7m_nvic_raw_execution_priority(NVICState *s);
* @secure: the security state to test
* This corresponds to the pseudocode IsReqExecPriNeg().
*/
-#ifndef CONFIG_USER_ONLY
bool armv7m_nvic_neg_prio_requested(NVICState *s, bool secure);
-#else
-static inline bool armv7m_nvic_neg_prio_requested(NVICState *s, bool secure)
-{
- return false;
-}
-#endif
-#ifndef CONFIG_USER_ONLY
bool armv7m_nvic_can_take_pending_exception(NVICState *s);
-#else
-static inline bool armv7m_nvic_can_take_pending_exception(NVICState *s)
-{
- return true;
-}
-#endif
#endif
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 32/37] include/hw/intc: Remove ifndef CONFIG_USER_ONLY from armv7m_nvic.h
2025-03-13 3:45 ` [PATCH 32/37] include/hw/intc: Remove ifndef CONFIG_USER_ONLY from armv7m_nvic.h Richard Henderson
@ 2025-03-13 21:00 ` Pierrick Bouvier
2025-03-14 18:13 ` Richard Henderson
0 siblings, 1 reply; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 21:00 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:45, Richard Henderson wrote:
> We were hiding a number of declarations from user-only,
> although it hurts nothing to allow them. The inlines
> for user-only are unused.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/hw/intc/armv7m_nvic.h | 14 --------------
> 1 file changed, 14 deletions(-)
>
> diff --git a/include/hw/intc/armv7m_nvic.h b/include/hw/intc/armv7m_nvic.h
> index 89fe8aedaa..7b9964fe7e 100644
> --- a/include/hw/intc/armv7m_nvic.h
> +++ b/include/hw/intc/armv7m_nvic.h
> @@ -189,21 +189,7 @@ int armv7m_nvic_raw_execution_priority(NVICState *s);
> * @secure: the security state to test
> * This corresponds to the pseudocode IsReqExecPriNeg().
> */
> -#ifndef CONFIG_USER_ONLY
> bool armv7m_nvic_neg_prio_requested(NVICState *s, bool secure);
> -#else
> -static inline bool armv7m_nvic_neg_prio_requested(NVICState *s, bool secure)
> -{
> - return false;
> -}
> -#endif
> -#ifndef CONFIG_USER_ONLY
> bool armv7m_nvic_can_take_pending_exception(NVICState *s);
> -#else
> -static inline bool armv7m_nvic_can_take_pending_exception(NVICState *s)
> -{
> - return true;
> -}
> -#endif
>
> #endif
I'm a bit worried we might have regression when doing things this way.
Maybe we could have a runtime check:
config_user_mode()
config_system_mode()
And assert we are only in system.
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 32/37] include/hw/intc: Remove ifndef CONFIG_USER_ONLY from armv7m_nvic.h
2025-03-13 21:00 ` Pierrick Bouvier
@ 2025-03-14 18:13 ` Richard Henderson
2025-03-14 18:36 ` Pierrick Bouvier
0 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-14 18:13 UTC (permalink / raw)
To: Pierrick Bouvier, qemu-devel; +Cc: pbonzini, philmd
On 3/13/25 14:00, Pierrick Bouvier wrote:
>> diff --git a/include/hw/intc/armv7m_nvic.h b/include/hw/intc/armv7m_nvic.h
>> index 89fe8aedaa..7b9964fe7e 100644
>> --- a/include/hw/intc/armv7m_nvic.h
>> +++ b/include/hw/intc/armv7m_nvic.h
>> @@ -189,21 +189,7 @@ int armv7m_nvic_raw_execution_priority(NVICState *s);
>> * @secure: the security state to test
>> * This corresponds to the pseudocode IsReqExecPriNeg().
>> */
>> -#ifndef CONFIG_USER_ONLY
>> bool armv7m_nvic_neg_prio_requested(NVICState *s, bool secure);
>> -#else
>> -static inline bool armv7m_nvic_neg_prio_requested(NVICState *s, bool secure)
>> -{
>> - return false;
>> -}
>> -#endif
>> -#ifndef CONFIG_USER_ONLY
>> bool armv7m_nvic_can_take_pending_exception(NVICState *s);
>> -#else
>> -static inline bool armv7m_nvic_can_take_pending_exception(NVICState *s)
>> -{
>> - return true;
>> -}
>> -#endif
>> #endif
>
> I'm a bit worried we might have regression when doing things this way.
I expect link errors to diagnose errors.
r~
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 32/37] include/hw/intc: Remove ifndef CONFIG_USER_ONLY from armv7m_nvic.h
2025-03-14 18:13 ` Richard Henderson
@ 2025-03-14 18:36 ` Pierrick Bouvier
2025-03-14 20:03 ` Richard Henderson
0 siblings, 1 reply; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-14 18:36 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/14/25 11:13, Richard Henderson wrote:
> On 3/13/25 14:00, Pierrick Bouvier wrote:
>>> diff --git a/include/hw/intc/armv7m_nvic.h b/include/hw/intc/armv7m_nvic.h
>>> index 89fe8aedaa..7b9964fe7e 100644
>>> --- a/include/hw/intc/armv7m_nvic.h
>>> +++ b/include/hw/intc/armv7m_nvic.h
>>> @@ -189,21 +189,7 @@ int armv7m_nvic_raw_execution_priority(NVICState *s);
>>> * @secure: the security state to test
>>> * This corresponds to the pseudocode IsReqExecPriNeg().
>>> */
>>> -#ifndef CONFIG_USER_ONLY
>>> bool armv7m_nvic_neg_prio_requested(NVICState *s, bool secure);
>>> -#else
>>> -static inline bool armv7m_nvic_neg_prio_requested(NVICState *s, bool secure)
>>> -{
>>> - return false;
>>> -}
>>> -#endif
>>> -#ifndef CONFIG_USER_ONLY
>>> bool armv7m_nvic_can_take_pending_exception(NVICState *s);
>>> -#else
>>> -static inline bool armv7m_nvic_can_take_pending_exception(NVICState *s)
>>> -{
>>> - return true;
>>> -}
>>> -#endif
>>> #endif
>>
>> I'm a bit worried we might have regression when doing things this way.
>
> I expect link errors to diagnose errors.
>
In this case, yes.
More generally, for system vs user, it might be sufficient (even though
I would prefer to be blindly prudent on this), but it might not protect
all cases, with subtle configs or features enabled/disabled.
With a runtime check, we could identify the missing calls
"feature_enabled()". In this case, we would link, but could end up
call_feature in some cases, when it should be hidden behind a
"_enabled()" check.
if (feature_enabled()) {
call_feature();
}
Stubs are really a dependency hack to palliate architecture problems.
>
> r~
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 32/37] include/hw/intc: Remove ifndef CONFIG_USER_ONLY from armv7m_nvic.h
2025-03-14 18:36 ` Pierrick Bouvier
@ 2025-03-14 20:03 ` Richard Henderson
2025-03-14 20:34 ` Pierrick Bouvier
0 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-14 20:03 UTC (permalink / raw)
To: Pierrick Bouvier, qemu-devel; +Cc: pbonzini, philmd
On 3/14/25 11:36, Pierrick Bouvier wrote:
> On 3/14/25 11:13, Richard Henderson wrote:
>> On 3/13/25 14:00, Pierrick Bouvier wrote:
>>>> diff --git a/include/hw/intc/armv7m_nvic.h b/include/hw/intc/armv7m_nvic.h
>>>> index 89fe8aedaa..7b9964fe7e 100644
>>>> --- a/include/hw/intc/armv7m_nvic.h
>>>> +++ b/include/hw/intc/armv7m_nvic.h
>>>> @@ -189,21 +189,7 @@ int armv7m_nvic_raw_execution_priority(NVICState *s);
>>>> * @secure: the security state to test
>>>> * This corresponds to the pseudocode IsReqExecPriNeg().
>>>> */
>>>> -#ifndef CONFIG_USER_ONLY
>>>> bool armv7m_nvic_neg_prio_requested(NVICState *s, bool secure);
>>>> -#else
>>>> -static inline bool armv7m_nvic_neg_prio_requested(NVICState *s, bool secure)
>>>> -{
>>>> - return false;
>>>> -}
>>>> -#endif
>>>> -#ifndef CONFIG_USER_ONLY
>>>> bool armv7m_nvic_can_take_pending_exception(NVICState *s);
>>>> -#else
>>>> -static inline bool armv7m_nvic_can_take_pending_exception(NVICState *s)
>>>> -{
>>>> - return true;
>>>> -}
>>>> -#endif
>>>> #endif
>>>
>>> I'm a bit worried we might have regression when doing things this way.
>>
>> I expect link errors to diagnose errors.
>>
>
> In this case, yes.
>
> More generally, for system vs user, it might be sufficient (even though I would prefer to
> be blindly prudent on this), but it might not protect all cases, with subtle configs or
> features enabled/disabled.
>
> With a runtime check, we could identify the missing calls "feature_enabled()". In this
> case, we would link, but could end up call_feature in some cases, when it should be hidden
> behind a "_enabled()" check.
>
> if (feature_enabled()) {
> call_feature();
> }
I'm not quite sure what you're arguing for here.
A build-time error is vastly preferable to a run-time error.
If it's a lesser used configuration or feature, a run-time error could lay dormant for
years before a user encounters it.
r~
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 32/37] include/hw/intc: Remove ifndef CONFIG_USER_ONLY from armv7m_nvic.h
2025-03-14 20:03 ` Richard Henderson
@ 2025-03-14 20:34 ` Pierrick Bouvier
2025-03-14 20:59 ` Richard Henderson
0 siblings, 1 reply; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-14 20:34 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/14/25 13:03, Richard Henderson wrote:
> On 3/14/25 11:36, Pierrick Bouvier wrote:
>> On 3/14/25 11:13, Richard Henderson wrote:
>>> On 3/13/25 14:00, Pierrick Bouvier wrote:
>>>>> diff --git a/include/hw/intc/armv7m_nvic.h b/include/hw/intc/armv7m_nvic.h
>>>>> index 89fe8aedaa..7b9964fe7e 100644
>>>>> --- a/include/hw/intc/armv7m_nvic.h
>>>>> +++ b/include/hw/intc/armv7m_nvic.h
>>>>> @@ -189,21 +189,7 @@ int armv7m_nvic_raw_execution_priority(NVICState *s);
>>>>> * @secure: the security state to test
>>>>> * This corresponds to the pseudocode IsReqExecPriNeg().
>>>>> */
>>>>> -#ifndef CONFIG_USER_ONLY
>>>>> bool armv7m_nvic_neg_prio_requested(NVICState *s, bool secure);
>>>>> -#else
>>>>> -static inline bool armv7m_nvic_neg_prio_requested(NVICState *s, bool secure)
>>>>> -{
>>>>> - return false;
>>>>> -}
>>>>> -#endif
>>>>> -#ifndef CONFIG_USER_ONLY
>>>>> bool armv7m_nvic_can_take_pending_exception(NVICState *s);
>>>>> -#else
>>>>> -static inline bool armv7m_nvic_can_take_pending_exception(NVICState *s)
>>>>> -{
>>>>> - return true;
>>>>> -}
>>>>> -#endif
>>>>> #endif
>>>>
>>>> I'm a bit worried we might have regression when doing things this way.
>>>
>>> I expect link errors to diagnose errors.
>>>
>>
>> In this case, yes.
>>
>> More generally, for system vs user, it might be sufficient (even though I would prefer to
>> be blindly prudent on this), but it might not protect all cases, with subtle configs or
>> features enabled/disabled.
>>
>> With a runtime check, we could identify the missing calls "feature_enabled()". In this
>> case, we would link, but could end up call_feature in some cases, when it should be hidden
>> behind a "_enabled()" check.
>>
>> if (feature_enabled()) {
>> call_feature();
>> }
>
> I'm not quite sure what you're arguing for here.
> A build-time error is vastly preferable to a run-time error.
>
Even though this specific patch is safe (code calling those functions
should be under system anyway, so it should not be linked in a user
binary), I just wonder if we should not add explicit checks for this,
for other kind of replacement we'll have to do.
> If it's a lesser used configuration or feature, a run-time error could lay dormant for
> years before a user encounters it.
>
Sure, but wouldn't it better to have an explicit assert, instead of
observing a random behaviour?
I'm just worried we end up calling something we should not (user vs
system, or any other ifdef CONFIG/TARGET that might be hidden
somewhere), and silently return a wrong value, which would not be
covered by our test suite.
>
> r~
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 32/37] include/hw/intc: Remove ifndef CONFIG_USER_ONLY from armv7m_nvic.h
2025-03-14 20:34 ` Pierrick Bouvier
@ 2025-03-14 20:59 ` Richard Henderson
2025-03-14 22:05 ` Pierrick Bouvier
0 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-14 20:59 UTC (permalink / raw)
To: Pierrick Bouvier, qemu-devel; +Cc: pbonzini, philmd
On 3/14/25 13:34, Pierrick Bouvier wrote:
> On 3/14/25 13:03, Richard Henderson wrote:
>> I'm not quite sure what you're arguing for here.
>> A build-time error is vastly preferable to a run-time error.
>>
>
> Even though this specific patch is safe (code calling those functions should be under
> system anyway, so it should not be linked in a user binary), I just wonder if we should
> not add explicit checks for this, for other kind of replacement we'll have to do.
Any such runtime check should not be for "system" vs "user", but for "feature enabled".
>> If it's a lesser used configuration or feature, a run-time error could lay dormant for
>> years before a user encounters it.
>>
>
> Sure, but wouldn't it better to have an explicit assert, instead of observing a random
> behaviour?
What random behaviour are you suggesting?
> I'm just worried we end up calling something we should not (user vs system, or any other
> ifdef CONFIG/TARGET that might be hidden somewhere), and silently return a wrong value,
> which would not be covered by our test suite.
Where is the wrong value going to be returned from, the stub?
Yes, many stubs do abort, typically after the "enabled" stub returns false.
It's still best if "feature enabled" is compile-time false when possible, such that
everything after the feature check gets compiled out. At which point we don't need the
stubs: they won't be reachable and errors are caught at build-time.
r~
^ permalink raw reply [flat|nested] 115+ messages in thread
* Re: [PATCH 32/37] include/hw/intc: Remove ifndef CONFIG_USER_ONLY from armv7m_nvic.h
2025-03-14 20:59 ` Richard Henderson
@ 2025-03-14 22:05 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-14 22:05 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/14/25 13:59, Richard Henderson wrote:
> On 3/14/25 13:34, Pierrick Bouvier wrote:
>> On 3/14/25 13:03, Richard Henderson wrote:
>>> I'm not quite sure what you're arguing for here.
>>> A build-time error is vastly preferable to a run-time error.
>>>
>>
>> Even though this specific patch is safe (code calling those functions should be under
>> system anyway, so it should not be linked in a user binary), I just wonder if we should
>> not add explicit checks for this, for other kind of replacement we'll have to do.
>
> Any such runtime check should not be for "system" vs "user", but for "feature enabled".
>
From our build system point of view, I don't really see what is the
difference. That's part of why I insisted previously on cleaning user vs
system ifdefs at the same time we make files common, but the answer I
had was "We don't need to do that now", so I stopped arguing.
When building user vs system, we use ifdef to detect this case, and we
select different implementations and include a specific set of source
files, the same way we do for some features, or specific targets. So,
why should it be treated differently, or later?
>>> If it's a lesser used configuration or feature, a run-time error could lay dormant for
>>> years before a user encounters it.
>>>
>>
>> Sure, but wouldn't it better to have an explicit assert, instead of observing a random
>> behaviour?
>
> What random behaviour are you suggesting?
>
In case we return a stub value by accident, when you expect to have a
side effect done somewhere. And that it would not result in an immediate
crash, but later at a random place.
Maybe the case just does not exist, but my point was that it does not
cost anything to add an assert just in case.
>> I'm just worried we end up calling something we should not (user vs system, or any other
>> ifdef CONFIG/TARGET that might be hidden somewhere), and silently return a wrong value,
>> which would not be covered by our test suite.
>
> Where is the wrong value going to be returned from, the stub?
> Yes, many stubs do abort, typically after the "enabled" stub returns false.
>
Many, but not all of them I guess.
> It's still best if "feature enabled" is compile-time false when possible, such that
> everything after the feature check gets compiled out. At which point we don't need the
> stubs: they won't be reachable and errors are caught at build-time.
>
Sure, but as we saw, it's not always possible, because some calls are
under: if (X_enabled()) {...do_X()...}, which requires to be able to
link do_X even though it will be dead code at runtime.
Maybe my concern is unfounded, but seeing some of the inline stubs and
the ifdefs associated, I hope we won't miss a corner case.
>
> r~
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 33/37] include/hw/s390x: Remove ifndef CONFIG_USER_ONLY in css.h
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (31 preceding siblings ...)
2025-03-13 3:45 ` [PATCH 32/37] include/hw/intc: Remove ifndef CONFIG_USER_ONLY from armv7m_nvic.h Richard Henderson
@ 2025-03-13 3:45 ` Richard Henderson
2025-03-13 21:00 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 34/37] include/system: Remove ifndef CONFIG_USER_ONLY Richard Henderson
` (5 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:45 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
We were hiding a number of declarations from user-only,
although it hurts nothing to allow them.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/hw/s390x/css.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/hw/s390x/css.h b/include/hw/s390x/css.h
index cd97e2b707..965545ce73 100644
--- a/include/hw/s390x/css.h
+++ b/include/hw/s390x/css.h
@@ -238,7 +238,6 @@ uint32_t css_get_adapter_id(CssIoAdapterType type, uint8_t isc);
void css_register_io_adapters(CssIoAdapterType type, bool swap, bool maskable,
uint8_t flags, Error **errp);
-#ifndef CONFIG_USER_ONLY
SubchDev *css_find_subch(uint8_t m, uint8_t cssid, uint8_t ssid,
uint16_t schid);
bool css_subch_visible(SubchDev *sch);
@@ -262,7 +261,6 @@ int css_enable_mss(void);
IOInstEnding css_do_rsch(SubchDev *sch);
int css_do_rchp(uint8_t cssid, uint8_t chpid);
bool css_present(uint8_t cssid);
-#endif
extern const PropertyInfo css_devid_ro_propinfo;
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 33/37] include/hw/s390x: Remove ifndef CONFIG_USER_ONLY in css.h
2025-03-13 3:45 ` [PATCH 33/37] include/hw/s390x: Remove ifndef CONFIG_USER_ONLY in css.h Richard Henderson
@ 2025-03-13 21:00 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 21:00 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:45, Richard Henderson wrote:
> We were hiding a number of declarations from user-only,
> although it hurts nothing to allow them.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/hw/s390x/css.h | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/include/hw/s390x/css.h b/include/hw/s390x/css.h
> index cd97e2b707..965545ce73 100644
> --- a/include/hw/s390x/css.h
> +++ b/include/hw/s390x/css.h
> @@ -238,7 +238,6 @@ uint32_t css_get_adapter_id(CssIoAdapterType type, uint8_t isc);
> void css_register_io_adapters(CssIoAdapterType type, bool swap, bool maskable,
> uint8_t flags, Error **errp);
>
> -#ifndef CONFIG_USER_ONLY
> SubchDev *css_find_subch(uint8_t m, uint8_t cssid, uint8_t ssid,
> uint16_t schid);
> bool css_subch_visible(SubchDev *sch);
> @@ -262,7 +261,6 @@ int css_enable_mss(void);
> IOInstEnding css_do_rsch(SubchDev *sch);
> int css_do_rchp(uint8_t cssid, uint8_t chpid);
> bool css_present(uint8_t cssid);
> -#endif
>
> extern const PropertyInfo css_devid_ro_propinfo;
>
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 34/37] include/system: Remove ifndef CONFIG_USER_ONLY
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (32 preceding siblings ...)
2025-03-13 3:45 ` [PATCH 33/37] include/hw/s390x: Remove ifndef CONFIG_USER_ONLY in css.h Richard Henderson
@ 2025-03-13 3:45 ` Richard Henderson
2025-03-13 10:18 ` Philippe Mathieu-Daudé
2025-03-13 21:02 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 35/37] include/qemu: Remove ifndef CONFIG_USER_ONLY from accel.h Richard Henderson
` (4 subsequent siblings)
38 siblings, 2 replies; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:45 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
This is include/system, so CONFIG_USER_ONLY will never be true.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/system/cpu-timers.h | 2 +-
include/system/qtest.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/include/system/cpu-timers.h b/include/system/cpu-timers.h
index 64ae54f6d6..f10cb5e7d4 100644
--- a/include/system/cpu-timers.h
+++ b/include/system/cpu-timers.h
@@ -30,7 +30,7 @@ typedef enum {
ICOUNT_ADAPTATIVE,
} ICountMode;
-#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY)
+#ifdef CONFIG_TCG
extern ICountMode use_icount;
#define icount_enabled() (use_icount)
#else
diff --git a/include/system/qtest.h b/include/system/qtest.h
index 6ddddc501b..84b1f8c6ee 100644
--- a/include/system/qtest.h
+++ b/include/system/qtest.h
@@ -23,7 +23,6 @@ static inline bool qtest_enabled(void)
return qtest_allowed;
}
-#ifndef CONFIG_USER_ONLY
void G_GNUC_PRINTF(2, 3) qtest_sendf(CharBackend *chr, const char *fmt, ...);
void qtest_set_command_cb(bool (*pc_cb)(CharBackend *chr, gchar **words));
bool qtest_driver(void);
@@ -33,6 +32,5 @@ void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Error **
void qtest_server_set_send_handler(void (*send)(void *, const char *),
void *opaque);
void qtest_server_inproc_recv(void *opaque, const char *buf);
-#endif
#endif
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 34/37] include/system: Remove ifndef CONFIG_USER_ONLY
2025-03-13 3:45 ` [PATCH 34/37] include/system: Remove ifndef CONFIG_USER_ONLY Richard Henderson
@ 2025-03-13 10:18 ` Philippe Mathieu-Daudé
2025-03-13 21:02 ` Pierrick Bouvier
1 sibling, 0 replies; 115+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-03-13 10:18 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pierrick.bouvier, pbonzini
On 13/3/25 04:45, Richard Henderson wrote:
> This is include/system, so CONFIG_USER_ONLY will never be true.
Ideally yes. I started moving headers in include/system/ to clarify
APIs, but that doesn't mean some of these APIs aren't being
(incorrectly) used in user emulation.
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/system/cpu-timers.h | 2 +-
> include/system/qtest.h | 2 --
> 2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/include/system/cpu-timers.h b/include/system/cpu-timers.h
> index 64ae54f6d6..f10cb5e7d4 100644
> --- a/include/system/cpu-timers.h
> +++ b/include/system/cpu-timers.h
> @@ -30,7 +30,7 @@ typedef enum {
> ICOUNT_ADAPTATIVE,
> } ICountMode;
>
> -#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY)
> +#ifdef CONFIG_TCG
> extern ICountMode use_icount;
> #define icount_enabled() (use_icount)
> #else
> #define icount_enabled() ICOUNT_DISABLED
> #endif
For example accel/tcg/tcg-all.c include this header in user and
gets icount_enabled() = 0.
So first we'd need preparatory changes in to form of:
-- >8 --
diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c
index c1a30b01219..daa629e5b72 100644
--- a/accel/tcg/tcg-all.c
+++ b/accel/tcg/tcg-all.c
@@ -74,4 +74,7 @@ DECLARE_INSTANCE_CHECKER(TCGState, TCG_STATE,
static bool default_mttcg_enabled(void)
{
+#ifdef CONFIG_USER_ONLY
+ return false;
+#else
if (icount_enabled()) {
return false;
@@ -85,4 +88,5 @@ static bool default_mttcg_enabled(void)
return false;
#endif
+#endif
}
---
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 34/37] include/system: Remove ifndef CONFIG_USER_ONLY
2025-03-13 3:45 ` [PATCH 34/37] include/system: Remove ifndef CONFIG_USER_ONLY Richard Henderson
2025-03-13 10:18 ` Philippe Mathieu-Daudé
@ 2025-03-13 21:02 ` Pierrick Bouvier
1 sibling, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 21:02 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:45, Richard Henderson wrote:
> This is include/system, so CONFIG_USER_ONLY will never be true.
>
Some build configurations have this symbol missing.
https://github.com/pbo-linaro/qemu-ci/actions/runs/13826820446
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/system/cpu-timers.h | 2 +-
> include/system/qtest.h | 2 --
> 2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/include/system/cpu-timers.h b/include/system/cpu-timers.h
> index 64ae54f6d6..f10cb5e7d4 100644
> --- a/include/system/cpu-timers.h
> +++ b/include/system/cpu-timers.h
> @@ -30,7 +30,7 @@ typedef enum {
> ICOUNT_ADAPTATIVE,
> } ICountMode;
>
> -#if defined(CONFIG_TCG) && !defined(CONFIG_USER_ONLY)
> +#ifdef CONFIG_TCG
> extern ICountMode use_icount;
> #define icount_enabled() (use_icount)
> #else
> diff --git a/include/system/qtest.h b/include/system/qtest.h
> index 6ddddc501b..84b1f8c6ee 100644
> --- a/include/system/qtest.h
> +++ b/include/system/qtest.h
> @@ -23,7 +23,6 @@ static inline bool qtest_enabled(void)
> return qtest_allowed;
> }
>
> -#ifndef CONFIG_USER_ONLY
> void G_GNUC_PRINTF(2, 3) qtest_sendf(CharBackend *chr, const char *fmt, ...);
> void qtest_set_command_cb(bool (*pc_cb)(CharBackend *chr, gchar **words));
> bool qtest_driver(void);
> @@ -33,6 +32,5 @@ void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Error **
> void qtest_server_set_send_handler(void (*send)(void *, const char *),
> void *opaque);
> void qtest_server_inproc_recv(void *opaque, const char *buf);
> -#endif
>
> #endif
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 35/37] include/qemu: Remove ifndef CONFIG_USER_ONLY from accel.h
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (33 preceding siblings ...)
2025-03-13 3:45 ` [PATCH 34/37] include/system: Remove ifndef CONFIG_USER_ONLY Richard Henderson
@ 2025-03-13 3:45 ` Richard Henderson
2025-03-13 21:03 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 36/37] target/riscv: Remove ifndef CONFIG_USER_ONLY from cpu_cfg.h Richard Henderson
` (3 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:45 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
While setup_post and has_memory will not be used for
CONFIG_USER_ONLY, let the struct have constant layout.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/qemu/accel.h | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/include/qemu/accel.h b/include/qemu/accel.h
index 972a849a2b..fbd3d897fe 100644
--- a/include/qemu/accel.h
+++ b/include/qemu/accel.h
@@ -38,13 +38,13 @@ typedef struct AccelClass {
const char *name;
int (*init_machine)(MachineState *ms);
-#ifndef CONFIG_USER_ONLY
+ bool (*cpu_common_realize)(CPUState *cpu, Error **errp);
+ void (*cpu_common_unrealize)(CPUState *cpu);
+
+ /* system related hooks */
void (*setup_post)(MachineState *ms, AccelState *accel);
bool (*has_memory)(MachineState *ms, AddressSpace *as,
hwaddr start_addr, hwaddr size);
-#endif
- bool (*cpu_common_realize)(CPUState *cpu, Error **errp);
- void (*cpu_common_unrealize)(CPUState *cpu);
/* gdbstub related hooks */
int (*gdbstub_supported_sstep_flags)(void);
@@ -78,12 +78,10 @@ const char *current_accel_name(void);
void accel_init_interfaces(AccelClass *ac);
-#ifndef CONFIG_USER_ONLY
int accel_init_machine(AccelState *accel, MachineState *ms);
/* Called just before os_setup_post (ie just before drop OS privs) */
void accel_setup_post(MachineState *ms);
-#endif /* !CONFIG_USER_ONLY */
/**
* accel_cpu_instance_init:
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 35/37] include/qemu: Remove ifndef CONFIG_USER_ONLY from accel.h
2025-03-13 3:45 ` [PATCH 35/37] include/qemu: Remove ifndef CONFIG_USER_ONLY from accel.h Richard Henderson
@ 2025-03-13 21:03 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 21:03 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:45, Richard Henderson wrote:
> While setup_post and has_memory will not be used for
> CONFIG_USER_ONLY, let the struct have constant layout.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/qemu/accel.h | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/include/qemu/accel.h b/include/qemu/accel.h
> index 972a849a2b..fbd3d897fe 100644
> --- a/include/qemu/accel.h
> +++ b/include/qemu/accel.h
> @@ -38,13 +38,13 @@ typedef struct AccelClass {
>
> const char *name;
> int (*init_machine)(MachineState *ms);
> -#ifndef CONFIG_USER_ONLY
> + bool (*cpu_common_realize)(CPUState *cpu, Error **errp);
> + void (*cpu_common_unrealize)(CPUState *cpu);
> +
> + /* system related hooks */
> void (*setup_post)(MachineState *ms, AccelState *accel);
> bool (*has_memory)(MachineState *ms, AddressSpace *as,
> hwaddr start_addr, hwaddr size);
> -#endif
> - bool (*cpu_common_realize)(CPUState *cpu, Error **errp);
> - void (*cpu_common_unrealize)(CPUState *cpu);
>
> /* gdbstub related hooks */
> int (*gdbstub_supported_sstep_flags)(void);
> @@ -78,12 +78,10 @@ const char *current_accel_name(void);
>
> void accel_init_interfaces(AccelClass *ac);
>
> -#ifndef CONFIG_USER_ONLY
> int accel_init_machine(AccelState *accel, MachineState *ms);
>
> /* Called just before os_setup_post (ie just before drop OS privs) */
> void accel_setup_post(MachineState *ms);
> -#endif /* !CONFIG_USER_ONLY */
>
> /**
> * accel_cpu_instance_init:
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 36/37] target/riscv: Remove ifndef CONFIG_USER_ONLY from cpu_cfg.h
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (34 preceding siblings ...)
2025-03-13 3:45 ` [PATCH 35/37] include/qemu: Remove ifndef CONFIG_USER_ONLY from accel.h Richard Henderson
@ 2025-03-13 3:45 ` Richard Henderson
2025-03-13 21:03 ` Pierrick Bouvier
2025-03-13 3:45 ` [PATCH 37/37] meson: Only allow CONFIG_USER_ONLY from certain source sets Richard Henderson
` (2 subsequent siblings)
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:45 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
While RISCVCPUConfig.satp_mode is unused for user-only,
this header is used from disas/riscv.h, whose users are
only built once. The savings of 4 bytes isn't worth it.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/riscv/cpu_cfg.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/target/riscv/cpu_cfg.h b/target/riscv/cpu_cfg.h
index 8a843482cc..cfe371b829 100644
--- a/target/riscv/cpu_cfg.h
+++ b/target/riscv/cpu_cfg.h
@@ -196,9 +196,7 @@ struct RISCVCPUConfig {
bool short_isa_string;
-#ifndef CONFIG_USER_ONLY
RISCVSATPMap satp_mode;
-#endif
};
typedef struct RISCVCPUConfig RISCVCPUConfig;
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 36/37] target/riscv: Remove ifndef CONFIG_USER_ONLY from cpu_cfg.h
2025-03-13 3:45 ` [PATCH 36/37] target/riscv: Remove ifndef CONFIG_USER_ONLY from cpu_cfg.h Richard Henderson
@ 2025-03-13 21:03 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 21:03 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:45, Richard Henderson wrote:
> While RISCVCPUConfig.satp_mode is unused for user-only,
> this header is used from disas/riscv.h, whose users are
> only built once. The savings of 4 bytes isn't worth it.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> target/riscv/cpu_cfg.h | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/target/riscv/cpu_cfg.h b/target/riscv/cpu_cfg.h
> index 8a843482cc..cfe371b829 100644
> --- a/target/riscv/cpu_cfg.h
> +++ b/target/riscv/cpu_cfg.h
> @@ -196,9 +196,7 @@ struct RISCVCPUConfig {
>
> bool short_isa_string;
>
> -#ifndef CONFIG_USER_ONLY
> RISCVSATPMap satp_mode;
> -#endif
> };
>
> typedef struct RISCVCPUConfig RISCVCPUConfig;
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* [PATCH 37/37] meson: Only allow CONFIG_USER_ONLY from certain source sets
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (35 preceding siblings ...)
2025-03-13 3:45 ` [PATCH 36/37] target/riscv: Remove ifndef CONFIG_USER_ONLY from cpu_cfg.h Richard Henderson
@ 2025-03-13 3:45 ` Richard Henderson
2025-03-13 20:50 ` Pierrick Bouvier
2025-03-13 13:56 ` [PATCH 00/37] accel/tcg, codebase: Build once patches Alex Bennée
2025-03-13 16:36 ` Pierrick Bouvier
38 siblings, 1 reply; 115+ messages in thread
From: Richard Henderson @ 2025-03-13 3:45 UTC (permalink / raw)
To: qemu-devel; +Cc: pierrick.bouvier, pbonzini, philmd
Poison CONFIG_USER_ONLY and CONFIG_SOFTMMU unless
the compilation unit is in specific_ss, libuser_ss,
or libsystem_ss. This is intended to prevent files
being incorrectly added to common_ss.
Remove #ifndef CONFIG_USER_ONLY / #error / #endif blocks.
All they do is trigger the poison error.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/poison.h | 5 +++++
include/hw/hw.h | 4 ----
include/system/confidential-guest-support.h | 4 ----
include/system/replay.h | 4 ----
include/system/xen.h | 4 ----
meson.build | 6 ++++--
6 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/include/exec/poison.h b/include/exec/poison.h
index 8ed04b3108..a6ffe4577f 100644
--- a/include/exec/poison.h
+++ b/include/exec/poison.h
@@ -67,4 +67,9 @@
#pragma GCC poison CONFIG_WHPX
#pragma GCC poison CONFIG_XEN
+#ifndef COMPILING_SYSTEM_VS_USER
+#pragma GCC poison CONFIG_USER_ONLY
+#pragma GCC poison CONFIG_SOFTMMU
+#endif
+
#endif
diff --git a/include/hw/hw.h b/include/hw/hw.h
index 045c1c8b09..1b33d12b7f 100644
--- a/include/hw/hw.h
+++ b/include/hw/hw.h
@@ -1,10 +1,6 @@
#ifndef QEMU_HW_H
#define QEMU_HW_H
-#ifdef CONFIG_USER_ONLY
-#error Cannot include hw/hw.h from user emulation
-#endif
-
G_NORETURN void hw_error(const char *fmt, ...) G_GNUC_PRINTF(1, 2);
#endif
diff --git a/include/system/confidential-guest-support.h b/include/system/confidential-guest-support.h
index b68c4bebbc..ea46b50c56 100644
--- a/include/system/confidential-guest-support.h
+++ b/include/system/confidential-guest-support.h
@@ -18,10 +18,6 @@
#ifndef QEMU_CONFIDENTIAL_GUEST_SUPPORT_H
#define QEMU_CONFIDENTIAL_GUEST_SUPPORT_H
-#ifdef CONFIG_USER_ONLY
-#error Cannot include system/confidential-guest-support.h from user emulation
-#endif
-
#include "qom/object.h"
#define TYPE_CONFIDENTIAL_GUEST_SUPPORT "confidential-guest-support"
diff --git a/include/system/replay.h b/include/system/replay.h
index 8926d8cf4b..1c87c97fdd 100644
--- a/include/system/replay.h
+++ b/include/system/replay.h
@@ -11,10 +11,6 @@
#ifndef SYSTEM_REPLAY_H
#define SYSTEM_REPLAY_H
-#ifdef CONFIG_USER_ONLY
-#error Cannot include this header from user emulation
-#endif
-
#include "exec/replay-core.h"
#include "qapi/qapi-types-misc.h"
#include "qapi/qapi-types-run-state.h"
diff --git a/include/system/xen.h b/include/system/xen.h
index 990c19a8ef..4ca384c409 100644
--- a/include/system/xen.h
+++ b/include/system/xen.h
@@ -10,10 +10,6 @@
#ifndef SYSTEM_XEN_H
#define SYSTEM_XEN_H
-#ifdef CONFIG_USER_ONLY
-#error Cannot include system/xen.h from user emulation
-#endif
-
#include "exec/cpu-common.h"
#ifdef COMPILING_PER_TARGET
diff --git a/meson.build b/meson.build
index 3869e5bfbc..c2c71b6f8a 100644
--- a/meson.build
+++ b/meson.build
@@ -4043,7 +4043,8 @@ common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss)
libuser_ss = libuser_ss.apply({})
libuser = static_library('user',
libuser_ss.sources() + genh,
- c_args: '-DCONFIG_USER_ONLY',
+ c_args: ['-DCONFIG_USER_ONLY',
+ '-DCOMPILING_SYSTEM_VS_USER'],
dependencies: libuser_ss.dependencies(),
build_by_default: false)
libuser = declare_dependency(objects: libuser.extract_all_objects(recursive: false),
@@ -4053,7 +4054,8 @@ common_ss.add(when: 'CONFIG_USER_ONLY', if_true: libuser)
libsystem_ss = libsystem_ss.apply({})
libsystem = static_library('system',
libsystem_ss.sources() + genh,
- c_args: '-DCONFIG_SOFTMMU',
+ c_args: ['-DCONFIG_SOFTMMU',
+ '-DCOMPILING_SYSTEM_VS_USER'],
dependencies: libsystem_ss.dependencies(),
build_by_default: false)
libsystem = declare_dependency(objects: libsystem.extract_all_objects(recursive: false),
--
2.43.0
^ permalink raw reply related [flat|nested] 115+ messages in thread* Re: [PATCH 37/37] meson: Only allow CONFIG_USER_ONLY from certain source sets
2025-03-13 3:45 ` [PATCH 37/37] meson: Only allow CONFIG_USER_ONLY from certain source sets Richard Henderson
@ 2025-03-13 20:50 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 20:50 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:45, Richard Henderson wrote:
> Poison CONFIG_USER_ONLY and CONFIG_SOFTMMU unless
> the compilation unit is in specific_ss, libuser_ss,
> or libsystem_ss. This is intended to prevent files
> being incorrectly added to common_ss.
>
> Remove #ifndef CONFIG_USER_ONLY / #error / #endif blocks.
> All they do is trigger the poison error.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/exec/poison.h | 5 +++++
> include/hw/hw.h | 4 ----
> include/system/confidential-guest-support.h | 4 ----
> include/system/replay.h | 4 ----
> include/system/xen.h | 4 ----
> meson.build | 6 ++++--
> 6 files changed, 9 insertions(+), 18 deletions(-)
>
> diff --git a/include/exec/poison.h b/include/exec/poison.h
> index 8ed04b3108..a6ffe4577f 100644
> --- a/include/exec/poison.h
> +++ b/include/exec/poison.h
> @@ -67,4 +67,9 @@
> #pragma GCC poison CONFIG_WHPX
> #pragma GCC poison CONFIG_XEN
>
> +#ifndef COMPILING_SYSTEM_VS_USER
> +#pragma GCC poison CONFIG_USER_ONLY
> +#pragma GCC poison CONFIG_SOFTMMU
> +#endif
> +
> #endif
> diff --git a/include/hw/hw.h b/include/hw/hw.h
> index 045c1c8b09..1b33d12b7f 100644
> --- a/include/hw/hw.h
> +++ b/include/hw/hw.h
> @@ -1,10 +1,6 @@
> #ifndef QEMU_HW_H
> #define QEMU_HW_H
>
> -#ifdef CONFIG_USER_ONLY
> -#error Cannot include hw/hw.h from user emulation
> -#endif
> -
> G_NORETURN void hw_error(const char *fmt, ...) G_GNUC_PRINTF(1, 2);
>
> #endif
> diff --git a/include/system/confidential-guest-support.h b/include/system/confidential-guest-support.h
> index b68c4bebbc..ea46b50c56 100644
> --- a/include/system/confidential-guest-support.h
> +++ b/include/system/confidential-guest-support.h
> @@ -18,10 +18,6 @@
> #ifndef QEMU_CONFIDENTIAL_GUEST_SUPPORT_H
> #define QEMU_CONFIDENTIAL_GUEST_SUPPORT_H
>
> -#ifdef CONFIG_USER_ONLY
> -#error Cannot include system/confidential-guest-support.h from user emulation
> -#endif
> -
> #include "qom/object.h"
>
> #define TYPE_CONFIDENTIAL_GUEST_SUPPORT "confidential-guest-support"
> diff --git a/include/system/replay.h b/include/system/replay.h
> index 8926d8cf4b..1c87c97fdd 100644
> --- a/include/system/replay.h
> +++ b/include/system/replay.h
> @@ -11,10 +11,6 @@
> #ifndef SYSTEM_REPLAY_H
> #define SYSTEM_REPLAY_H
>
> -#ifdef CONFIG_USER_ONLY
> -#error Cannot include this header from user emulation
> -#endif
> -
> #include "exec/replay-core.h"
> #include "qapi/qapi-types-misc.h"
> #include "qapi/qapi-types-run-state.h"
> diff --git a/include/system/xen.h b/include/system/xen.h
> index 990c19a8ef..4ca384c409 100644
> --- a/include/system/xen.h
> +++ b/include/system/xen.h
> @@ -10,10 +10,6 @@
> #ifndef SYSTEM_XEN_H
> #define SYSTEM_XEN_H
>
> -#ifdef CONFIG_USER_ONLY
> -#error Cannot include system/xen.h from user emulation
> -#endif
> -
> #include "exec/cpu-common.h"
>
> #ifdef COMPILING_PER_TARGET
> diff --git a/meson.build b/meson.build
> index 3869e5bfbc..c2c71b6f8a 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -4043,7 +4043,8 @@ common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss)
> libuser_ss = libuser_ss.apply({})
> libuser = static_library('user',
> libuser_ss.sources() + genh,
> - c_args: '-DCONFIG_USER_ONLY',
> + c_args: ['-DCONFIG_USER_ONLY',
> + '-DCOMPILING_SYSTEM_VS_USER'],
> dependencies: libuser_ss.dependencies(),
> build_by_default: false)
> libuser = declare_dependency(objects: libuser.extract_all_objects(recursive: false),
> @@ -4053,7 +4054,8 @@ common_ss.add(when: 'CONFIG_USER_ONLY', if_true: libuser)
> libsystem_ss = libsystem_ss.apply({})
> libsystem = static_library('system',
> libsystem_ss.sources() + genh,
> - c_args: '-DCONFIG_SOFTMMU',
> + c_args: ['-DCONFIG_SOFTMMU',
> + '-DCOMPILING_SYSTEM_VS_USER'],
> dependencies: libsystem_ss.dependencies(),
> build_by_default: false)
> libsystem = declare_dependency(objects: libsystem.extract_all_objects(recursive: false),
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
^ permalink raw reply [flat|nested] 115+ messages in thread
* Re: [PATCH 00/37] accel/tcg, codebase: Build once patches
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (36 preceding siblings ...)
2025-03-13 3:45 ` [PATCH 37/37] meson: Only allow CONFIG_USER_ONLY from certain source sets Richard Henderson
@ 2025-03-13 13:56 ` Alex Bennée
2025-03-13 16:36 ` Pierrick Bouvier
38 siblings, 0 replies; 115+ messages in thread
From: Alex Bennée @ 2025-03-13 13:56 UTC (permalink / raw)
To: Richard Henderson; +Cc: qemu-devel, pierrick.bouvier, pbonzini, philmd
Richard Henderson <richard.henderson@linaro.org> writes:
> All this is working toward building accel/tcg/translator.c once,
> but it got late and I decided to stop at a convenient milestone.
>
<snip>
>
> I know there is overlap with other in-flight patches, but it
> seemed easiest to just start from master.
I guess that was why the re-base fails with:
[2210/6843] Compiling C object libcommon.a.p/hw_vfio_migration.c.o
FAILED: libcommon.a.p/hw_vfio_migration.c.o
cc -m64 -Ilibcommon.a.p -I../../common-user/host/x86_64 -I../../linux-user/include/host/x86_64 -I../../linux-user/include -Isubprojects/libvduse -I../../subprojects/libvduse -I/usr/include/capstone -I/usr/include/p11-kit-1 -I/usr/include/pixman-1 -I/usr/include/libpng16 -I/usr/include/spice-server -I/usr/include/spice-1 -I/usr/include/libusb-1.0 -I/usr/include/SDL2 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/gio-unix-2.0 -I/usr/include/slirp -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/x86_64-linux-gnu -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/vte-2.91 -I/usr/include/virgl -I/usr/include/cacard -I/usr/include/nss -I/usr/include/nspr -I/usr/include/PCSC -I/usr/include/pipewire-0.3 -I/usr/include/spa-0.2 -I/usr/include/fuse3 -I/usr/include/uuid -fdiagnostics-color=auto -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -fstack-protector-strong -Wempty-body -Wendif-labels -Wexpansion-to-defined -Wformat-security -Wformat-y2k -Wignored-qualifiers -Wimplicit-fallthrough=2 -Winit-self -Wmissing-format-attribute -Wmissing-prototypes -Wnested-externs -Wold-style-declaration -Wold-style-definition -Wredundant-decls -Wshadow=local -Wstrict-prototypes -Wtype-limits -Wundef -Wvla -Wwrite-strings -Wno-missing-include-dirs -Wno-psabi -Wno-shift-negative-value -isystem /home/alex/lsrc/qemu.git/linux-headers -isystem linux-headers -iquote . -iquote /home/alex/lsrc/qemu.git -iquote /home/alex/lsrc/qemu.git/include -iquote /home/alex/lsrc/qemu.git/host/include/x86_64 -iquote /home/alex/lsrc/qemu.git/host/include/generic -iquote /home/alex/lsrc/qemu.git/tcg/i386 -pthread -mcx16 -msse2 -D_GNU_SOURCE -D_LARGEFILE_SOURCE -fno-strict-aliasing -fno-common -fwrapv -ftrivial-auto-var-init=zero -fzero-call-used-regs=used-gpr -fPIE -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D__USE_LARGEFILE64 -DUSE_POSIX_ACLS=1 -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -DNCURSES_WIDECHAR=1 -D_REENTRANT -DSTRUCT_IOVEC_DEFINED -MD -MQ libcommon.a.p/hw_vfio_migration.c.o -MF libcommon.a.p/hw_vfio_migration.c.o.d -o libcommon.a.p/hw_vfio_migration.c.o -c ../../hw/vfio/migration.c
In file included from ../../hw/vfio/migration.c:30:
/home/alex/lsrc/qemu.git/include/system/ram_addr.h:22:10: fatal error: cpu.h: No such file or directory
22 | #include "cpu.h"
| ^~~~~~~
compilation terminated.
[2211/6843] Compiling C object libcommon.a.p/hw_vfio_iommufd.c.o
FAILED: libcommon.a.p/hw_vfio_iommufd.c.o
cc -m64 -Ilibcommon.a.p -I../../common-user/host/x86_64 -I../../linux-user/include/host/x86_64 -I../../linux-user/include -Isubprojects/libvduse -I../../subprojects/libvduse -I/usr/include/capstone -I/usr/include/p11-kit-1 -I/usr/include/pixman-1 -I/usr/include/libpng16 -I/usr/include/spice-server -I/usr/include/spice-1 -I/usr/include/libusb-1.0 -I/usr/include/SDL2 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/gio-unix-2.0 -I/usr/include/slirp -I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/fribidi -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/x86_64-linux-gnu -I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/vte-2.91 -I/usr/include/virgl -I/usr/include/cacard -I/usr/include/nss -I/usr/include/nspr -I/usr/include/PCSC -I/usr/include/pipewire-0.3 -I/usr/include/spa-0.2 -I/usr/include/fuse3 -I/usr/include/uuid -fdiagnostics-color=auto -Wall -Winvalid-pch -Werror -std=gnu11 -O2 -fstack-protector-strong -Wempty-body -Wendif-labels -Wexpansion-to-defined -Wformat-security -Wformat-y2k -Wignored-qualifiers -Wimplicit-fallthrough=2 -Winit-self -Wmissing-format-attribute -Wmissing-prototypes -Wnested-externs -Wold-style-declaration -Wold-style-definition -Wredundant-decls -Wshadow=local -Wstrict-prototypes -Wtype-limits -Wundef -Wvla -Wwrite-strings -Wno-missing-include-dirs -Wno-psabi -Wno-shift-negative-value -isystem /home/alex/lsrc/qemu.git/linux-headers -isystem linux-headers -iquote . -iquote /home/alex/lsrc/qemu.git -iquote /home/alex/lsrc/qemu.git/include -iquote /home/alex/lsrc/qemu.git/host/include/x86_64 -iquote /home/alex/lsrc/qemu.git/host/include/generic -iquote /home/alex/lsrc/qemu.git/tcg/i386 -pthread -mcx16 -msse2 -D_GNU_SOURCE -D_LARGEFILE_SOURCE -fno-strict-aliasing -fno-common -fwrapv -ftrivial-auto-var-init=zero -fzero-call-used-regs=used-gpr -fPIE -D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D__USE_LARGEFILE64 -DUSE_POSIX_ACLS=1 -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -DNCURSES_WIDECHAR=1 -D_REENTRANT -DSTRUCT_IOVEC_DEFINED -MD -MQ libcommon.a.p/hw_vfio_iommufd.c.o -MF libcommon.a.p/hw_vfio_iommufd.c.o.d -o libcommon.a.p/hw_vfio_iommufd.c.o -c ../../hw/vfio/iommufd.c
In file included from ../../hw/vfio/iommufd.c:28:
/home/alex/lsrc/qemu.git/include/system/ram_addr.h:22:10: fatal error: cpu.h: No such file or directory
22 | #include "cpu.h"
| ^~~~~~~
compilation terminated.
I'll see if I can bisect...
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 00/37] accel/tcg, codebase: Build once patches
2025-03-13 3:44 [PATCH 00/37] accel/tcg, codebase: Build once patches Richard Henderson
` (37 preceding siblings ...)
2025-03-13 13:56 ` [PATCH 00/37] accel/tcg, codebase: Build once patches Alex Bennée
@ 2025-03-13 16:36 ` Pierrick Bouvier
2025-03-13 17:48 ` Philippe Mathieu-Daudé
38 siblings, 1 reply; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 16:36 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: pbonzini, philmd
On 3/12/25 20:44, Richard Henderson wrote:
> All this is working toward building accel/tcg/translator.c once,
> but it got late and I decided to stop at a convenient milestone.
>
> In the process, I discovered that we have already added files to
> common_ss which indirectly depend on CONFIG_USER_ONLY. Sometimes
> this is harmless, and sometimes it really is not. For instance,
> plugin/api.c is affected by different translation-block.h layout.
>
Maybe it's finally a good reason to tackle user/system at the same time
we make the rest of the files common.
> The only solution I can see is to poison CONFIG_USER_ONLY outside
> of specific contexts. I hoisted some existing magic in tcg/ and
> gdbstub/ to build separate shared_libraries for user and system,
> as that's the only way to add extra command-line -Defines.
>
It's a good approach (make common + poison is what prevent regressions
and ensure we progress).
Working on target code, I found the need to have a common-{arch} lib,
allowing to share code between variants of a given arch (arm vs
aarch64), with a specific define too.
s/shared_libraries/static_libraries
As you mention, it's the only way, static libs used in our meson is just
a hack to apply flags to a set of files, and in the end, object files
are aggregated to create a final binary, without any intermediate file.
I guess that was the only way to "make it work" for a project lacking
proper libraries in the first place.
> Ideally, we would reuse the existing user_ss and system_ss source
> sets for these new static_libraries. But in order for that to work,
> we'd need to construct the configuration_data sets to apply, and it
> wasn't immediately obvious what the correct sets would be. Getting
> that wrong would silently omit files from the build, which could be
> hard to diagnose. I thought it would be quicker and safer to create
> new source sets with only unconditional files.
>
> I know there is overlap with other in-flight patches, but it
> seemed easiest to just start from master.
>
It's probably the best way, even though we'll have rebase conflicts.
Stacking series is something not convenient, a nightmare to apply, and
does not scale when having several people working on the same topic.
>
> r~
>
>
> Richard Henderson (37):
> accel/tcg: Build user-exec-stub.c once
> accel/tcg: Build plugin-gen.c once
> include/exec: Use vaddr for *_mmu guest memory access routines
> include/exec: Split out cpu-ldst-common.h
> include/exec: Inline *_mmuidx_ra memory operations
> include/exec: Inline *_data_ra memory operations
> include/exec: Inline *_data memory operations
> include/exec: Inline *_code memory operations
> accel/tcg: Perform aligned atomic reads in translator_ld
> accel/tcg: Use cpu_ld*_code_mmu in translator.c
> accel/tcg: Implement translator_ld*_end
> accel/tcg: Remove mmap_lock/unlock from watchpoint.c
> include/exec: Split out mmap-lock.h
> include/system: Move exec/memory.h to system/memory.h
> include/system: Move exec/address-spaces.h to system/address-spaces.h
> include/system: Move exec/ioport.h to system/ioport.h
> meson: Introduce top-level libuser_ss and libsystem_ss
> gdbstub: Move syscalls.c out of common_ss
> accel/tcg: Use libuser_ss and libsystem_ss
> target/mips: Protect semihosting call with CONFIG_SEMIHOSTING
> target/xtensa: Protect semihosting call with CONFIG_SEMIHOSTING
> semihosting: Move user-only implementation out-of-line
> include/system: Move exec/ram_addr.h to system/ram_addr.h
> include/system: Move exec/ramblock.h to system/ramblock.h
> common-user: Split out watchpoint-stub.c
> hw/core: Move unconditional files to libsystem_ss, libuser_ss
> system: Move watchpoint.c to libsystem_ss
> plugins: Move api.c, core.c to libuser_ss, libsystem_ss
> include/exec: Split out cpu-mmu-index.h
> include/exec: Drop ifndef CONFIG_USER_ONLY from cpu-common.h
> include/hw/core: Drop ifndef CONFIG_USER_ONLY from cpu.h
> include/hw/intc: Remove ifndef CONFIG_USER_ONLY from armv7m_nvic.h
> include/hw/s390x: Remove ifndef CONFIG_USER_ONLY in css.h
> include/system: Remove ifndef CONFIG_USER_ONLY
> include/qemu: Remove ifndef CONFIG_USER_ONLY from accel.h
> target/riscv: Remove ifndef CONFIG_USER_ONLY from cpu_cfg.h
> meson: Only allow CONFIG_USER_ONLY from certain source sets
>
> accel/tcg/atomic_template.h | 16 +-
> accel/tcg/internal-target.h | 1 +
> hw/arm/strongarm.h | 2 +-
> hw/display/apple-gfx.h | 2 +-
> hw/display/framebuffer.h | 2 +-
> hw/display/vga_int.h | 4 +-
> hw/hyperv/hv-balloon-our_range_memslots.h | 2 +-
> hw/intc/ioapic_internal.h | 2 +-
> hw/net/i82596.h | 4 +-
> hw/net/pcnet.h | 2 +-
> hw/s390x/ipl.h | 2 +-
> hw/tpm/tpm_ppi.h | 2 +-
> hw/usb/hcd-uhci.h | 2 +-
> hw/vfio/pci.h | 2 +-
> hw/virtio/vhost-iova-tree.h | 2 +-
> include/exec/cpu-all.h | 9 +-
> include/exec/cpu-common.h | 26 -
> include/exec/cpu-ldst-common.h | 122 +++++
> include/exec/cpu-mmu-index.h | 33 ++
> include/exec/cpu_ldst.h | 540 +++++++++++++-------
> include/exec/mmap-lock.h | 33 ++
> include/exec/page-protection.h | 22 -
> include/exec/poison.h | 5 +
> include/exec/translator.h | 50 +-
> include/hw/acpi/acpi.h | 2 +-
> include/hw/acpi/ich9_tco.h | 2 +-
> include/hw/arm/fsl-imx25.h | 2 +-
> include/hw/arm/fsl-imx31.h | 2 +-
> include/hw/arm/fsl-imx6.h | 2 +-
> include/hw/arm/fsl-imx6ul.h | 2 +-
> include/hw/arm/omap.h | 2 +-
> include/hw/arm/stm32l4x5_soc.h | 2 +-
> include/hw/boards.h | 2 +-
> include/hw/char/parallel-isa.h | 2 +-
> include/hw/char/parallel.h | 2 +-
> include/hw/char/riscv_htif.h | 2 +-
> include/hw/char/serial-mm.h | 2 +-
> include/hw/char/serial.h | 2 +-
> include/hw/core/cpu.h | 33 --
> include/hw/display/macfb.h | 2 +-
> include/hw/dma/i8257.h | 2 +-
> include/hw/fsi/aspeed_apb2opb.h | 2 +-
> include/hw/fsi/cfam.h | 2 +-
> include/hw/fsi/fsi-master.h | 2 +-
> include/hw/fsi/fsi.h | 2 +-
> include/hw/fsi/lbus.h | 2 +-
> include/hw/gpio/npcm7xx_gpio.h | 2 +-
> include/hw/hw.h | 4 -
> include/hw/i2c/npcm7xx_smbus.h | 2 +-
> include/hw/i2c/pm_smbus.h | 2 +-
> include/hw/i386/apic_internal.h | 2 +-
> include/hw/i386/x86.h | 2 +-
> include/hw/ide/ahci.h | 2 +-
> include/hw/ide/ide-bus.h | 2 +-
> include/hw/intc/armv7m_nvic.h | 14 -
> include/hw/ipmi/ipmi.h | 2 +-
> include/hw/isa/apm.h | 2 +-
> include/hw/isa/isa.h | 4 +-
> include/hw/m68k/q800.h | 2 +-
> include/hw/mem/npcm7xx_mc.h | 2 +-
> include/hw/mem/pc-dimm.h | 2 +-
> include/hw/mips/mips.h | 2 +-
> include/hw/misc/auxbus.h | 2 +-
> include/hw/misc/ivshmem-flat.h | 2 +-
> include/hw/misc/lasi.h | 2 +-
> include/hw/misc/mac_via.h | 2 +-
> include/hw/misc/npcm7xx_mft.h | 2 +-
> include/hw/misc/npcm_clk.h | 2 +-
> include/hw/misc/npcm_gcr.h | 2 +-
> include/hw/misc/pvpanic.h | 2 +-
> include/hw/net/dp8393x.h | 2 +-
> include/hw/net/msf2-emac.h | 2 +-
> include/hw/nubus/nubus.h | 2 +-
> include/hw/nvram/mac_nvram.h | 2 +-
> include/hw/nvram/npcm7xx_otp.h | 2 +-
> include/hw/pci-host/fsl_imx8m_phy.h | 2 +-
> include/hw/pci-host/pam.h | 2 +-
> include/hw/pci-host/remote.h | 2 +-
> include/hw/pci/pci.h | 2 +-
> include/hw/pci/pcie_host.h | 2 +-
> include/hw/pci/shpc.h | 2 +-
> include/hw/ppc/mac_dbdma.h | 2 +-
> include/hw/ppc/pnv_lpc.h | 2 +-
> include/hw/ppc/pnv_occ.h | 2 +-
> include/hw/ppc/pnv_sbe.h | 2 +-
> include/hw/ppc/pnv_xscom.h | 2 +-
> include/hw/ppc/ppc4xx.h | 2 +-
> include/hw/ppc/vof.h | 4 +-
> include/hw/ppc/xics.h | 2 +-
> include/hw/register.h | 2 +-
> include/hw/remote/proxy-memory-listener.h | 2 +-
> include/hw/s390x/css.h | 2 -
> include/hw/sh4/sh_intc.h | 2 +-
> include/hw/southbridge/ich9.h | 2 +-
> include/hw/sysbus.h | 2 +-
> include/hw/timer/npcm7xx_timer.h | 2 +-
> include/hw/tricore/triboard.h | 2 +-
> include/hw/tricore/tricore.h | 2 +-
> include/hw/usb.h | 2 +-
> include/hw/vfio/vfio-common.h | 2 +-
> include/hw/vfio/vfio-container-base.h | 2 +-
> include/hw/virtio/vhost-backend.h | 2 +-
> include/hw/virtio/vhost.h | 2 +-
> include/hw/virtio/virtio.h | 2 +-
> include/hw/xen/xen-pvh-common.h | 2 +-
> include/hw/xtensa/mx_pic.h | 2 +-
> include/qemu/accel.h | 10 +-
> include/qemu/iova-tree.h | 2 +-
> include/qemu/reserved-region.h | 2 +-
> include/semihosting/semihost.h | 29 +-
> include/{exec => system}/address-spaces.h | 8 +-
> include/system/confidential-guest-support.h | 4 -
> include/system/cpu-timers.h | 2 +-
> include/system/dma.h | 4 +-
> include/system/hostmem.h | 2 +-
> include/{exec => system}/ioport.h | 8 +-
> include/system/kvm_int.h | 2 +-
> include/{exec => system}/memory.h | 8 +-
> include/system/qtest.h | 2 -
> include/{exec => system}/ram_addr.h | 9 +-
> include/{exec => system}/ramblock.h | 9 +-
> include/system/replay.h | 4 -
> include/system/vhost-user-backend.h | 2 +-
> include/system/xen.h | 4 -
> migration/rdma.h | 2 +-
> rust/wrapper.h | 4 +-
> target/i386/hvf/vmx.h | 2 +-
> target/loongarch/cpu.h | 2 +-
> target/mips/cpu.h | 2 +-
> target/riscv/cpu_cfg.h | 2 -
> accel/hvf/hvf-accel-ops.c | 2 +-
> accel/kvm/kvm-all.c | 4 +-
> accel/tcg/cpu-exec.c | 1 +
> accel/tcg/cputlb.c | 40 +-
> accel/tcg/plugin-gen.c | 13 +-
> accel/tcg/tb-maint.c | 1 +
> accel/tcg/translate-all.c | 3 +-
> accel/tcg/translator.c | 120 +++--
> accel/tcg/user-exec.c | 48 +-
> accel/tcg/watchpoint.c | 3 -
> backends/tpm/tpm_util.c | 2 +-
> block/blkio.c | 4 +-
> common-user/watchpoint-stub.c | 28 +
> disas/disas-mon.c | 2 +-
> hw/acpi/erst.c | 4 +-
> hw/arm/aspeed_ast10x0.c | 2 +-
> hw/arm/bananapi_m2u.c | 2 +-
> hw/arm/collie.c | 2 +-
> hw/arm/exynos4_boards.c | 2 +-
> hw/arm/fsl-imx31.c | 2 +-
> hw/arm/fsl-imx8mp.c | 2 +-
> hw/arm/imx8mp-evk.c | 2 +-
> hw/arm/integratorcp.c | 2 +-
> hw/arm/kzm.c | 2 +-
> hw/arm/microbit.c | 2 +-
> hw/arm/mps2-tz.c | 2 +-
> hw/arm/mps2.c | 2 +-
> hw/arm/mps3r.c | 2 +-
> hw/arm/msf2-soc.c | 2 +-
> hw/arm/msf2-som.c | 2 +-
> hw/arm/musca.c | 2 +-
> hw/arm/omap1.c | 2 +-
> hw/arm/omap_sx1.c | 2 +-
> hw/arm/orangepi.c | 2 +-
> hw/arm/stellaris.c | 2 +-
> hw/arm/stm32f100_soc.c | 2 +-
> hw/arm/stm32f205_soc.c | 2 +-
> hw/arm/stm32f405_soc.c | 2 +-
> hw/arm/stm32l4x5_soc.c | 2 +-
> hw/avr/atmega.c | 4 +-
> hw/block/fdc-isa.c | 2 +-
> hw/block/fdc-sysbus.c | 2 +-
> hw/char/goldfish_tty.c | 2 +-
> hw/char/omap_uart.c | 2 +-
> hw/char/riscv_htif.c | 2 +-
> hw/core/cpu-system.c | 4 +-
> hw/core/loader-fit.c | 2 +-
> hw/core/loader.c | 2 +-
> hw/core/null-machine.c | 2 +-
> hw/core/sysbus.c | 2 +-
> hw/display/edid-region.c | 2 +-
> hw/display/virtio-gpu-udmabuf.c | 2 +-
> hw/dma/rc4030.c | 2 +-
> hw/hyperv/hv-balloon.c | 4 +-
> hw/hyperv/hyperv.c | 4 +-
> hw/i386/acpi-common.c | 2 +-
> hw/i386/acpi-microvm.c | 2 +-
> hw/i386/kvm/xen_evtchn.c | 2 +-
> hw/i386/kvm/xen_gnttab.c | 2 +-
> hw/i386/kvm/xen_overlay.c | 2 +-
> hw/i386/pc_piix.c | 2 +-
> hw/i386/sgx-epc.c | 2 +-
> hw/i386/sgx.c | 2 +-
> hw/i386/vapic.c | 2 +-
> hw/ide/ahci-sysbus.c | 2 +-
> hw/input/lasips2.c | 2 +-
> hw/intc/loongarch_extioi.c | 2 +-
> hw/intc/mips_gic.c | 2 +-
> hw/intc/ompic.c | 2 +-
> hw/intc/riscv_aplic.c | 2 +-
> hw/intc/riscv_imsic.c | 2 +-
> hw/loongarch/virt.c | 2 +-
> hw/mem/memory-device.c | 2 +-
> hw/microblaze/petalogix_ml605_mmu.c | 2 +-
> hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +-
> hw/microblaze/xlnx-zynqmp-pmu.c | 2 +-
> hw/mips/mipssim.c | 2 +-
> hw/misc/allwinner-h3-dramc.c | 2 +-
> hw/misc/allwinner-r40-dramc.c | 2 +-
> hw/misc/ivshmem-flat.c | 2 +-
> hw/misc/mac_via.c | 2 +-
> hw/net/i82596.c | 2 +-
> hw/net/ne2000.c | 2 +-
> hw/nvram/fw_cfg.c | 2 +-
> hw/openrisc/openrisc_sim.c | 2 +-
> hw/openrisc/virt.c | 2 +-
> hw/pci-bridge/pci_bridge_dev.c | 2 +-
> hw/pci-host/mv64361.c | 2 +-
> hw/pci-host/remote.c | 2 +-
> hw/ppc/pegasos2.c | 2 +-
> hw/ppc/pnv_homer.c | 2 +-
> hw/ppc/pnv_psi.c | 2 +-
> hw/ppc/ppc405_uc.c | 2 +-
> hw/ppc/ppc4xx_sdram.c | 2 +-
> hw/ppc/prep_systemio.c | 2 +-
> hw/ppc/rs6000_mc.c | 2 +-
> hw/ppc/sam460ex.c | 2 +-
> hw/ppc/spapr.c | 2 +-
> hw/ppc/spapr_caps.c | 2 +-
> hw/ppc/spapr_ovec.c | 2 +-
> hw/ppc/spapr_pci.c | 2 +-
> hw/ppc/vof.c | 2 +-
> hw/remote/iommu.c | 4 +-
> hw/remote/machine.c | 2 +-
> hw/remote/memory.c | 2 +-
> hw/remote/proxy-memory-listener.c | 4 +-
> hw/remote/vfio-user-obj.c | 2 +-
> hw/riscv/microblaze-v-generic.c | 2 +-
> hw/riscv/opentitan.c | 2 +-
> hw/riscv/shakti_c.c | 2 +-
> hw/s390x/css.c | 2 +-
> hw/s390x/s390-pci-inst.c | 2 +-
> hw/s390x/s390-skeys.c | 2 +-
> hw/s390x/s390-stattrib-kvm.c | 2 +-
> hw/s390x/s390-stattrib.c | 2 +-
> hw/s390x/s390-virtio-ccw.c | 2 +-
> hw/s390x/virtio-ccw.c | 2 +-
> hw/sparc/sun4m_iommu.c | 2 +-
> hw/sparc64/sun4u_iommu.c | 2 +-
> hw/timer/hpet.c | 2 +-
> hw/timer/sh_timer.c | 2 +-
> hw/tpm/tpm_crb.c | 2 +-
> hw/vfio/ap.c | 2 +-
> hw/vfio/ccw.c | 2 +-
> hw/vfio/common.c | 6 +-
> hw/vfio/container.c | 6 +-
> hw/vfio/iommufd.c | 2 +-
> hw/vfio/migration.c | 2 +-
> hw/vfio/platform.c | 4 +-
> hw/vfio/spapr.c | 4 +-
> hw/virtio/vhost-user.c | 2 +-
> hw/virtio/vhost-vdpa.c | 2 +-
> hw/virtio/virtio-balloon.c | 2 +-
> hw/virtio/virtio-bus.c | 2 +-
> hw/virtio/virtio-mem.c | 2 +-
> hw/xtensa/sim.c | 2 +-
> hw/xtensa/virt.c | 2 +-
> hw/xtensa/xtensa_memory.c | 2 +-
> hw/xtensa/xtfpga.c | 2 +-
> linux-user/arm/cpu_loop.c | 1 +
> linux-user/elfload.c | 1 +
> linux-user/flatload.c | 1 +
> linux-user/mmap.c | 1 +
> linux-user/syscall.c | 1 +
> migration/dirtyrate.c | 4 +-
> migration/file.c | 2 +-
> migration/multifd-nocomp.c | 2 +-
> migration/multifd-qatzip.c | 2 +-
> migration/multifd-qpl.c | 2 +-
> migration/multifd-uadk.c | 2 +-
> migration/multifd-zero-page.c | 2 +-
> migration/multifd-zlib.c | 2 +-
> migration/multifd-zstd.c | 2 +-
> migration/multifd.c | 2 +-
> migration/postcopy-ram.c | 2 +-
> migration/ram.c | 2 +-
> migration/rdma.c | 2 +-
> migration/savevm.c | 2 +-
> monitor/hmp-cmds-target.c | 4 +-
> monitor/hmp-cmds.c | 4 +-
> semihosting/uaccess.c | 1 +
> semihosting/user.c | 30 ++
> stubs/ram-block.c | 2 +-
> system/dirtylimit.c | 2 +-
> system/ioport.c | 6 +-
> system/memory.c | 6 +-
> system/memory_mapping.c | 4 +-
> system/physmem.c | 6 +-
> system/qtest.c | 4 +-
> target/arm/gdbstub64.c | 3 +
> target/arm/helper.c | 1 +
> target/arm/hvf/hvf.c | 2 +-
> target/arm/kvm.c | 2 +-
> target/arm/tcg/mte_helper.c | 2 +-
> target/avr/helper.c | 2 +-
> target/hppa/mem_helper.c | 1 +
> target/i386/cpu-apic.c | 2 +-
> target/i386/cpu.c | 2 +-
> target/i386/kvm/xen-emu.c | 2 +-
> target/i386/nvmm/nvmm-all.c | 4 +-
> target/i386/sev.c | 2 +-
> target/i386/tcg/system/misc_helper.c | 2 +-
> target/i386/tcg/system/tcg-cpu.c | 2 +-
> target/i386/tcg/translate.c | 1 +
> target/i386/whpx/whpx-all.c | 4 +-
> target/loongarch/cpu_helper.c | 1 +
> target/loongarch/kvm/kvm.c | 2 +-
> target/microblaze/helper.c | 1 +
> target/microblaze/mmu.c | 1 +
> target/mips/cpu.c | 3 +-
> target/openrisc/translate.c | 1 +
> target/ppc/kvm.c | 2 +-
> target/riscv/kvm/kvm-cpu.c | 2 +-
> target/s390x/kvm/kvm.c | 2 +-
> target/s390x/mmu_helper.c | 2 +-
> target/s390x/sigp.c | 2 +-
> target/s390x/tcg/excp_helper.c | 2 +-
> target/sparc/cpu.c | 1 +
> target/sparc/mmu_helper.c | 1 +
> target/tricore/helper.c | 1 +
> target/xtensa/cpu.c | 2 +-
> target/xtensa/dbg_helper.c | 2 +-
> target/xtensa/mmu_helper.c | 1 +
> target/xtensa/translate.c | 13 +-
> tests/qtest/fuzz/generic_fuzz.c | 4 +-
> tests/qtest/fuzz/qos_fuzz.c | 2 +-
> tests/qtest/fuzz/qtest_wrappers.c | 2 +-
> tests/unit/test-resv-mem.c | 2 +-
> ui/console.c | 2 +-
> util/vfio-helpers.c | 2 +-
> MAINTAINERS | 8 +-
> accel/tcg/ldst_common.c.inc | 335 +-----------
> accel/tcg/meson.build | 25 +-
> common-user/meson.build | 1 +
> docs/devel/memory.rst | 2 +-
> gdbstub/meson.build | 36 +-
> hw/core/meson.build | 4 +-
> hw/display/apple-gfx.m | 2 +-
> meson.build | 24 +
> plugins/meson.build | 5 +-
> scripts/analyze-inclusions | 2 +-
> semihosting/meson.build | 2 +
> system/meson.build | 5 +-
> tcg/meson.build | 23 +-
> 354 files changed, 1211 insertions(+), 1229 deletions(-)
> create mode 100644 include/exec/cpu-ldst-common.h
> create mode 100644 include/exec/cpu-mmu-index.h
> create mode 100644 include/exec/mmap-lock.h
> rename include/{exec => system}/address-spaces.h (89%)
> rename include/{exec => system}/ioport.h (96%)
> rename include/{exec => system}/memory.h (99%)
> rename include/{exec => system}/ram_addr.h (99%)
> rename include/{exec => system}/ramblock.h (96%)
> create mode 100644 common-user/watchpoint-stub.c
> create mode 100644 semihosting/user.c
>
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 00/37] accel/tcg, codebase: Build once patches
2025-03-13 16:36 ` Pierrick Bouvier
@ 2025-03-13 17:48 ` Philippe Mathieu-Daudé
2025-03-13 20:13 ` Pierrick Bouvier
0 siblings, 1 reply; 115+ messages in thread
From: Philippe Mathieu-Daudé @ 2025-03-13 17:48 UTC (permalink / raw)
To: Pierrick Bouvier, Richard Henderson, qemu-devel; +Cc: pbonzini, Peter Maydell
On 13/3/25 17:36, Pierrick Bouvier wrote:
> On 3/12/25 20:44, Richard Henderson wrote:
>> All this is working toward building accel/tcg/translator.c once,
>> but it got late and I decided to stop at a convenient milestone.
>>
>> In the process, I discovered that we have already added files to
>> common_ss which indirectly depend on CONFIG_USER_ONLY. Sometimes
>> this is harmless, and sometimes it really is not. For instance,
>> plugin/api.c is affected by different translation-block.h layout.
>>
>
> Maybe it's finally a good reason to tackle user/system at the same time
> we make the rest of the files common.
>
>> The only solution I can see is to poison CONFIG_USER_ONLY outside
>> of specific contexts. I hoisted some existing magic in tcg/ and
>> gdbstub/ to build separate shared_libraries for user and system,
>> as that's the only way to add extra command-line -Defines.
>>
>
> It's a good approach (make common + poison is what prevent regressions
> and ensure we progress).
> Working on target code, I found the need to have a common-{arch} lib,
> allowing to share code between variants of a given arch (arm vs
> aarch64), with a specific define too.
Are really ARM & Aarch64 different architectures (QEMU wise)?
^ permalink raw reply [flat|nested] 115+ messages in thread* Re: [PATCH 00/37] accel/tcg, codebase: Build once patches
2025-03-13 17:48 ` Philippe Mathieu-Daudé
@ 2025-03-13 20:13 ` Pierrick Bouvier
0 siblings, 0 replies; 115+ messages in thread
From: Pierrick Bouvier @ 2025-03-13 20:13 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Richard Henderson, qemu-devel
Cc: pbonzini, Peter Maydell
On 3/13/25 10:48, Philippe Mathieu-Daudé wrote:
> On 13/3/25 17:36, Pierrick Bouvier wrote:
>> On 3/12/25 20:44, Richard Henderson wrote:
>>> All this is working toward building accel/tcg/translator.c once,
>>> but it got late and I decided to stop at a convenient milestone.
>>>
>>> In the process, I discovered that we have already added files to
>>> common_ss which indirectly depend on CONFIG_USER_ONLY. Sometimes
>>> this is harmless, and sometimes it really is not. For instance,
>>> plugin/api.c is affected by different translation-block.h layout.
>>>
>>
>> Maybe it's finally a good reason to tackle user/system at the same time
>> we make the rest of the files common.
>>
>>> The only solution I can see is to poison CONFIG_USER_ONLY outside
>>> of specific contexts. I hoisted some existing magic in tcg/ and
>>> gdbstub/ to build separate shared_libraries for user and system,
>>> as that's the only way to add extra command-line -Defines.
>>>
>>
>> It's a good approach (make common + poison is what prevent regressions
>> and ensure we progress).
>> Working on target code, I found the need to have a common-{arch} lib,
>> allowing to share code between variants of a given arch (arm vs
>> aarch64), with a specific define too.
>
> Are really ARM & Aarch64 different architectures (QEMU wise)?
>
Not really, but as long as we have #ifdef TARGET_AARCH64,
the cu is duplicated, and it brings a lot of issues (symbols, type
difference, multiple board type definition, etc).
^ permalink raw reply [flat|nested] 115+ messages in thread