From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Richard Henderson" <richard.henderson@linaro.org>
Subject: [PULL 04/14] user: Move 'abitypes.h' from 'exec/user' to 'user'
Date: Fri, 3 May 2024 17:36:03 +0200 [thread overview]
Message-ID: <20240503153613.38709-5-philmd@linaro.org> (raw)
In-Reply-To: <20240503153613.38709-1-philmd@linaro.org>
Keep all user emulation headers under the same user/ directory.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240503125202.35667-1-philmd@linaro.org>
---
bsd-user/qemu.h | 2 +-
include/exec/cpu-all.h | 2 +-
include/exec/user/thunk.h | 2 +-
include/{exec => }/user/abitypes.h | 4 ++--
include/user/syscall-trace.h | 2 +-
linux-user/qemu.h | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
rename include/{exec => }/user/abitypes.h (97%)
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 8629f0dcde..a0c1ad7efa 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -22,7 +22,7 @@
#include "exec/cpu_ldst.h"
#include "exec/exec-all.h"
-#include "exec/user/abitypes.h"
+#include "user/abitypes.h"
extern char **environ;
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index e75ec13cd0..032c6d990e 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -64,7 +64,7 @@
/* MMU memory access macros */
#if defined(CONFIG_USER_ONLY)
-#include "exec/user/abitypes.h"
+#include "user/abitypes.h"
/*
* If non-zero, the guest virtual address space is a contiguous subset
diff --git a/include/exec/user/thunk.h b/include/exec/user/thunk.h
index 2ebfecf58e..9f35c888f9 100644
--- a/include/exec/user/thunk.h
+++ b/include/exec/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/include/exec/user/abitypes.h b/include/user/abitypes.h
similarity index 97%
rename from include/exec/user/abitypes.h
rename to include/user/abitypes.h
index 3ec1969368..5c9a955631 100644
--- a/include/exec/user/abitypes.h
+++ b/include/user/abitypes.h
@@ -1,5 +1,5 @@
-#ifndef EXEC_USER_ABITYPES_H
-#define EXEC_USER_ABITYPES_H
+#ifndef USER_ABITYPES_H
+#define USER_ABITYPES_H
#ifndef CONFIG_USER_ONLY
#error Cannot include this header from system emulation
diff --git a/include/user/syscall-trace.h b/include/user/syscall-trace.h
index b48b2b2d0a..9bd7ca19c8 100644
--- a/include/user/syscall-trace.h
+++ b/include/user/syscall-trace.h
@@ -10,7 +10,7 @@
#ifndef SYSCALL_TRACE_H
#define SYSCALL_TRACE_H
-#include "exec/user/abitypes.h"
+#include "user/abitypes.h"
#include "gdbstub/user.h"
#include "qemu/plugin.h"
#include "trace/trace-root.h"
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 4777856b52..263f445ff1 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -4,7 +4,7 @@
#include "cpu.h"
#include "exec/cpu_ldst.h"
-#include "exec/user/abitypes.h"
+#include "user/abitypes.h"
#include "syscall_defs.h"
#include "target_syscall.h"
--
2.41.0
next prev parent reply other threads:[~2024-05-03 15:37 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-03 15:35 [PULL 00/14] Accel / SH4 / UI patches for 2024-05-03 Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 01/14] accel/nvmm: Fix NULL dereference in nvmm_init_vcpu() Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 02/14] accel/whpx: Fix NULL dereference in whpx_init_vcpu() Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 03/14] exec: Include missing license in 'exec/cpu-common.h' Philippe Mathieu-Daudé
2024-05-03 15:36 ` Philippe Mathieu-Daudé [this message]
2024-05-03 15:36 ` [PULL 05/14] user: Move 'thunk.h' from 'exec/user' to 'user' Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 06/14] coverity: Update user emulation regexp Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 07/14] plugins/api: Only include 'exec/ram_addr.h' with system emulation Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 08/14] plugins: Update stale comment Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 09/14] MAINTAINERS: Update my email address Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 10/14] target/sh4: Fix ADDV opcode Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 11/14] target/sh4: Fix SUBV opcode Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 12/14] target/sh4: Rename TCGv variables as manual for ADDV opcode Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 13/14] target/sh4: Rename TCGv variables as manual for SUBV opcode Philippe Mathieu-Daudé
2024-05-03 15:36 ` [PULL 14/14] ui/cocoa.m: Drop old macOS-10.12-and-earlier compat ifdefs Philippe Mathieu-Daudé
2024-05-04 2:01 ` [PULL 00/14] Accel / SH4 / UI patches for 2024-05-03 Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240503153613.38709-5-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).