diff mbox series

[1/2] linux-user/arm: Move target_oabi_flock64 out of target_structs.h

Message ID 20220107042600.149852-2-richard.henderson@linaro.org
State New
Headers show
Series linux-user: Move target_struct.h generic definitions to generic/ | expand

Commit Message

Richard Henderson Jan. 7, 2022, 4:25 a.m. UTC 
Place it next to copy_from/to_user_oabi_flock64, the only users,
inside the existing target-specific ifdef.  This leaves only
generic ipc structs in target_structs.h.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/arm/target_structs.h | 8 --------
 linux-user/syscall.c            | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

Comments

Laurent Vivier Jan. 8, 2022, 5:57 p.m. UTC | #1 
Le 07/01/2022 à 05:25, Richard Henderson a écrit :
> Place it next to copy_from/to_user_oabi_flock64, the only users,
> inside the existing target-specific ifdef.  This leaves only
> generic ipc structs in target_structs.h.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   linux-user/arm/target_structs.h | 8 --------
>   linux-user/syscall.c            | 8 ++++++++
>   2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/linux-user/arm/target_structs.h b/linux-user/arm/target_structs.h
> index 339b070bf1..25bf8dd3a5 100644
> --- a/linux-user/arm/target_structs.h
> +++ b/linux-user/arm/target_structs.h
> @@ -48,12 +48,4 @@ struct target_shmid_ds {
>       abi_ulong __unused4;
>       abi_ulong __unused5;
>   };
> -
> -struct target_oabi_flock64 {
> -    abi_short l_type;
> -    abi_short l_whence;
> -    abi_llong l_start;
> -    abi_llong l_len;
> -    abi_int   l_pid;
> -} QEMU_PACKED;
>   #endif
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index ce9d64896c..ca6e0b8fb0 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -6927,6 +6927,14 @@ typedef abi_long from_flock64_fn(struct flock64 *fl, abi_ulong target_addr);
>   typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock64 *fl);
>   
>   #if defined(TARGET_ARM) && TARGET_ABI_BITS == 32
> +struct target_oabi_flock64 {
> +    abi_short l_type;
> +    abi_short l_whence;
> +    abi_llong l_start;
> +    abi_llong l_len;
> +    abi_int   l_pid;
> +} QEMU_PACKED;
> +
>   static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
>                                                      abi_ulong target_flock_addr)
>   {

Applied to my linux-user-for-7.0 branch.

Thanks,
Laurent
Laurent Vivier Jan. 8, 2022, 5:58 p.m. UTC | #2 
Le 07/01/2022 à 05:25, Richard Henderson a écrit :
> Place it next to copy_from/to_user_oabi_flock64, the only users,
> inside the existing target-specific ifdef.  This leaves only
> generic ipc structs in target_structs.h.
> 
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   linux-user/arm/target_structs.h | 8 --------
>   linux-user/syscall.c            | 8 ++++++++
>   2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/linux-user/arm/target_structs.h b/linux-user/arm/target_structs.h
> index 339b070bf1..25bf8dd3a5 100644
> --- a/linux-user/arm/target_structs.h
> +++ b/linux-user/arm/target_structs.h
> @@ -48,12 +48,4 @@ struct target_shmid_ds {
>       abi_ulong __unused4;
>       abi_ulong __unused5;
>   };
> -
> -struct target_oabi_flock64 {
> -    abi_short l_type;
> -    abi_short l_whence;
> -    abi_llong l_start;
> -    abi_llong l_len;
> -    abi_int   l_pid;
> -} QEMU_PACKED;
>   #endif
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index ce9d64896c..ca6e0b8fb0 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -6927,6 +6927,14 @@ typedef abi_long from_flock64_fn(struct flock64 *fl, abi_ulong target_addr);
>   typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock64 *fl);
>   
>   #if defined(TARGET_ARM) && TARGET_ABI_BITS == 32
> +struct target_oabi_flock64 {
> +    abi_short l_type;
> +    abi_short l_whence;
> +    abi_llong l_start;
> +    abi_llong l_len;
> +    abi_int   l_pid;
> +} QEMU_PACKED;
> +
>   static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
>                                                      abi_ulong target_flock_addr)
>   {

Reviewed-by: Laurent Vivier <laurent@vivier.eu>
diff mbox series

Patch

diff --git a/linux-user/arm/target_structs.h b/linux-user/arm/target_structs.h
index 339b070bf1..25bf8dd3a5 100644
--- a/linux-user/arm/target_structs.h
+++ b/linux-user/arm/target_structs.h
@@ -48,12 +48,4 @@  struct target_shmid_ds {
     abi_ulong __unused4;
     abi_ulong __unused5;
 };
-
-struct target_oabi_flock64 {
-    abi_short l_type;
-    abi_short l_whence;
-    abi_llong l_start;
-    abi_llong l_len;
-    abi_int   l_pid;
-} QEMU_PACKED;
 #endif
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index ce9d64896c..ca6e0b8fb0 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -6927,6 +6927,14 @@  typedef abi_long from_flock64_fn(struct flock64 *fl, abi_ulong target_addr);
 typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock64 *fl);
 
 #if defined(TARGET_ARM) && TARGET_ABI_BITS == 32
+struct target_oabi_flock64 {
+    abi_short l_type;
+    abi_short l_whence;
+    abi_llong l_start;
+    abi_llong l_len;
+    abi_int   l_pid;
+} QEMU_PACKED;
+
 static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
                                                    abi_ulong target_flock_addr)
 {