| Message ID | 20220209230030.93987-4-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | exec: Split some user-mode specific declarations from 'exec/exec-all.h' | expand |
On 2/10/22 10:00, Philippe Mathieu-Daudé wrote: > Avoid spreading the headers in multiple directories, > unify exec/user/ and user/. > > Signed-off-by: Philippe Mathieu-Daudé<f4bug@amsat.org> > --- > bsd-user/qemu.h | 4 ++-- > include/exec/cpu-all.h | 2 +- > include/{exec => }/user/abitypes.h | 0 > include/user/safe-syscall.h | 6 +++--- > include/{exec => }/user/thunk.h | 2 +- > linux-user/qemu.h | 2 +- > linux-user/thunk.c | 2 +- > linux-user/user-internals.h | 2 +- > scripts/coverity-scan/COMPONENTS.md | 2 +- > 9 files changed, 11 insertions(+), 11 deletions(-) > rename include/{exec => }/user/abitypes.h (100%) > rename include/{exec => }/user/thunk.h (99%) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Something I noticed in passing: abitypes.h doesn't need all of cpu.h, only cpu-param.h. r~
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 02921ac8b3..2f67776b0b 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -25,7 +25,7 @@ #undef DEBUG_REMAP -#include "exec/user/abitypes.h" +#include "user/abitypes.h" extern char **environ; @@ -36,7 +36,7 @@ enum BSDType { }; extern enum BSDType bsd_type; -#include "exec/user/thunk.h" +#include "user/thunk.h" #include "target_arch.h" #include "syscall_defs.h" #include "target_syscall.h" diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h index c0f0fab28a..08b2894274 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h @@ -145,7 +145,7 @@ static inline void tswap64s(uint64_t *s) /* MMU memory access macros */ #if defined(CONFIG_USER_ONLY) -#include "exec/user/abitypes.h" +#include "user/abitypes.h" /* On some host systems the guest address space is reserved on the host. * This allows the guest address space to be offset to a convenient location. diff --git a/include/exec/user/abitypes.h b/include/user/abitypes.h similarity index 100% rename from include/exec/user/abitypes.h rename to include/user/abitypes.h diff --git a/include/user/safe-syscall.h b/include/user/safe-syscall.h index 61a04e2b5a..b2cb76e05b 100644 --- a/include/user/safe-syscall.h +++ b/include/user/safe-syscall.h @@ -1,5 +1,5 @@ /* - * safe-syscall.h: prototypes for linux-user signal-race-safe syscalls + * safe-syscall.h: prototypes for user signal-race-safe syscalls * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,8 +15,8 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef LINUX_USER_SAFE_SYSCALL_H -#define LINUX_USER_SAFE_SYSCALL_H +#ifndef USER_SAFE_SYSCALL_H +#define USER_SAFE_SYSCALL_H /** * safe_syscall: diff --git a/include/exec/user/thunk.h b/include/user/thunk.h similarity index 99% rename from include/exec/user/thunk.h rename to include/user/thunk.h index 300a840d58..b5796f4304 100644 --- a/include/exec/user/thunk.h +++ b/include/user/thunk.h @@ -21,7 +21,7 @@ #define THUNK_H #include "cpu.h" -#include "exec/user/abitypes.h" +#include "user/abitypes.h" /* types enums definitions */ diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 7910ce59cc..b6775f112b 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -6,7 +6,7 @@ #undef DEBUG_REMAP -#include "exec/user/abitypes.h" +#include "user/abitypes.h" #include "syscall_defs.h" #include "target_syscall.h" diff --git a/linux-user/thunk.c b/linux-user/thunk.c index dac4bf11c6..cd85bbc825 100644 --- a/linux-user/thunk.c +++ b/linux-user/thunk.c @@ -20,7 +20,7 @@ #include "qemu/log.h" #include "qemu.h" -#include "exec/user/thunk.h" +#include "user/thunk.h" //#define DEBUG diff --git a/linux-user/user-internals.h b/linux-user/user-internals.h index a8fdd6933b..4d0f682aea 100644 --- a/linux-user/user-internals.h +++ b/linux-user/user-internals.h @@ -18,7 +18,7 @@ #ifndef LINUX_USER_USER_INTERNALS_H #define LINUX_USER_USER_INTERNALS_H -#include "exec/user/thunk.h" +#include "user/thunk.h" #include "exec/exec-all.h" #include "qemu/log.h" diff --git a/scripts/coverity-scan/COMPONENTS.md b/scripts/coverity-scan/COMPONENTS.md index cea6695ecd..0571362a45 100644 --- a/scripts/coverity-scan/COMPONENTS.md +++ b/scripts/coverity-scan/COMPONENTS.md @@ -127,7 +127,7 @@ usb ~ (/qemu)?(/hw/usb/.*|/include/hw/usb/.*) user - ~ (/qemu)?(/common-user/.*|/linux-user/.*|/bsd-user/.*|/user-exec\.c|/thunk\.c|/include/exec/user/.*) + ~ (/qemu)?(/common-user/.*|/linux-user/.*|/bsd-user/.*|/user-exec\.c|/thunk\.c|/include/user/.*) util ~ (/qemu)?(/util/.*|/include/qemu/.*)
Avoid spreading the headers in multiple directories, unify exec/user/ and user/. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- bsd-user/qemu.h | 4 ++-- include/exec/cpu-all.h | 2 +- include/{exec => }/user/abitypes.h | 0 include/user/safe-syscall.h | 6 +++--- include/{exec => }/user/thunk.h | 2 +- linux-user/qemu.h | 2 +- linux-user/thunk.c | 2 +- linux-user/user-internals.h | 2 +- scripts/coverity-scan/COMPONENTS.md | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) rename include/{exec => }/user/abitypes.h (100%) rename include/{exec => }/user/thunk.h (99%)