| Message ID | 20240418192525.97451-15-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | include/exec: Rework (part 2) | expand |
On 25/4/24 09:39, Anton Johansson wrote: > On 18/04/24, Philippe Mathieu-Daudé wrote: >> The include/user/ directory contains the user-emulation >> specific headers. Move guest-base.h there too. >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >> --- >> include/exec/cpu-all.h | 2 +- >> include/{exec => }/user/guest-base.h | 4 ++-- >> tcg/tcg.c | 2 +- >> 3 files changed, 4 insertions(+), 4 deletions(-) >> rename include/{exec => }/user/guest-base.h (72%) > > Patch looks good, but the difference between user/ and exec/user is not > entirely clear to me :) Neither it is for me. In next batch (part 3) all headers are moved to user/. > Reviewed-by: Anton Johansson <anjo@rev.ng> Thanks!
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index 78848f018c..027f19e052 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -65,7 +65,7 @@ #if defined(CONFIG_USER_ONLY) #include "exec/user/abitypes.h" -#include "exec/user/guest-base.h" +#include "user/guest-base.h" extern bool have_guest_base; diff --git a/include/exec/user/guest-base.h b/include/user/guest-base.h similarity index 72% rename from include/exec/user/guest-base.h rename to include/user/guest-base.h index afe2ab7fbb..1e42bca5db 100644 --- a/include/exec/user/guest-base.h +++ b/include/user/guest-base.h @@ -4,8 +4,8 @@ * Copyright (c) 2003 Fabrice Bellard */ -#ifndef EXEC_USER_GUEST_BASE_H -#define EXEC_USER_GUEST_BASE_H +#ifndef USER_GUEST_BASE_H +#define USER_GUEST_BASE_H extern uintptr_t guest_base; diff --git a/tcg/tcg.c b/tcg/tcg.c index 0c0bb9d169..6a32656cd4 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -57,7 +57,7 @@ #include "tcg-internal.h" #include "tcg/perf.h" #ifdef CONFIG_USER_ONLY -#include "exec/user/guest-base.h" +#include "user/guest-base.h" #endif /* Forward declarations for functions declared in tcg-target.c.inc and
The include/user/ directory contains the user-emulation specific headers. Move guest-base.h there too. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- include/exec/cpu-all.h | 2 +- include/{exec => }/user/guest-base.h | 4 ++-- tcg/tcg.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename include/{exec => }/user/guest-base.h (72%)