All of lore.kernel.org
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: laurent@vivier.eu
Subject: [PATCH 04/15] linux-user: Use abi_int not int32_t in syscall_defs.h
Date: Sat,  3 Jun 2023 15:23:44 -0700	[thread overview]
Message-ID: <20230603222355.1379711-5-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230603222355.1379711-1-richard.henderson@linaro.org>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 linux-user/syscall_defs.h | 60 +++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 414d88a9ec..caaa895bec 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -501,7 +501,7 @@ int do_sigaction(int sig, const struct target_sigaction *act,
 #endif
 
 #if defined(TARGET_ALPHA)
-typedef int32_t target_old_sa_flags;
+typedef abi_int target_old_sa_flags;
 #else
 typedef abi_ulong target_old_sa_flags;
 #endif
@@ -1631,7 +1631,7 @@ struct QEMU_PACKED target_stat64 {
     uint64_t __pad1;
 
     int64_t  st_size;
-    int32_t  st_blksize;
+    abi_int  st_blksize;
     abi_uint __pad2;
     int64_t st_blocks;      /* Number 512-byte blocks allocated. */
 
@@ -2192,20 +2192,20 @@ typedef struct {
 #ifdef TARGET_MIPS
 #ifdef TARGET_ABI_MIPSN32
 struct target_statfs {
-    int32_t                 f_type;
-    int32_t                 f_bsize;
-    int32_t                 f_frsize;       /* Fragment size - unsupported */
-    int32_t                 f_blocks;
-    int32_t                 f_bfree;
-    int32_t                 f_files;
-    int32_t                 f_ffree;
-    int32_t                 f_bavail;
+    abi_int                 f_type;
+    abi_int                 f_bsize;
+    abi_int                 f_frsize;       /* Fragment size - unsupported */
+    abi_int                 f_blocks;
+    abi_int                 f_bfree;
+    abi_int                 f_files;
+    abi_int                 f_ffree;
+    abi_int                 f_bavail;
 
     /* Linux specials */
     target_fsid_t           f_fsid;
-    int32_t                 f_namelen;
-    int32_t                 f_flags;
-    int32_t                 f_spare[5];
+    abi_int                 f_namelen;
+    abi_int                 f_flags;
+    abi_int                 f_spare[5];
 };
 #else
 struct target_statfs {
@@ -2276,34 +2276,34 @@ struct target_statfs64 {
 };
 #elif defined(TARGET_S390X)
 struct target_statfs {
-    int32_t  f_type;
-    int32_t  f_bsize;
+    abi_int  f_type;
+    abi_int  f_bsize;
     abi_long f_blocks;
     abi_long f_bfree;
     abi_long f_bavail;
     abi_long f_files;
     abi_long f_ffree;
     kernel_fsid_t f_fsid;
-    int32_t  f_namelen;
-    int32_t  f_frsize;
-    int32_t  f_flags;
-    int32_t  f_spare[4];
+    abi_int  f_namelen;
+    abi_int  f_frsize;
+    abi_int  f_flags;
+    abi_int  f_spare[4];
 
 };
 
 struct target_statfs64 {
-    int32_t  f_type;
-    int32_t  f_bsize;
+    abi_int  f_type;
+    abi_int  f_bsize;
     abi_long f_blocks;
     abi_long f_bfree;
     abi_long f_bavail;
     abi_long f_files;
     abi_long f_ffree;
     kernel_fsid_t f_fsid;
-    int32_t  f_namelen;
-    int32_t  f_frsize;
-    int32_t  f_flags;
-    int32_t  f_spare[4];
+    abi_int  f_namelen;
+    abi_int  f_frsize;
+    abi_int  f_flags;
+    abi_int  f_spare[4];
 };
 #else
 struct target_statfs {
@@ -2718,21 +2718,21 @@ struct target_ucred {
     abi_uint gid;
 };
 
-typedef int32_t target_timer_t;
+typedef abi_int target_timer_t;
 
 #define TARGET_SIGEV_MAX_SIZE 64
 
 /* This is architecture-specific but most architectures use the default */
 #ifdef TARGET_MIPS
-#define TARGET_SIGEV_PREAMBLE_SIZE (sizeof(int32_t) * 2 + sizeof(abi_long))
+#define TARGET_SIGEV_PREAMBLE_SIZE (sizeof(abi_int) * 2 + sizeof(abi_long))
 #else
-#define TARGET_SIGEV_PREAMBLE_SIZE (sizeof(int32_t) * 2         \
+#define TARGET_SIGEV_PREAMBLE_SIZE (sizeof(abi_int) * 2         \
                                     + sizeof(target_sigval_t))
 #endif
 
 #define TARGET_SIGEV_PAD_SIZE ((TARGET_SIGEV_MAX_SIZE           \
                                 - TARGET_SIGEV_PREAMBLE_SIZE)   \
-                               / sizeof(int32_t))
+                               / sizeof(abi_int))
 
 struct target_sigevent {
     target_sigval_t sigev_value;
@@ -2792,7 +2792,7 @@ struct target_user_cap_data {
 struct target_statx_timestamp {
     int64_t tv_sec;
     abi_uint tv_nsec;
-    int32_t __reserved;
+    abi_int __reserved;
 };
 
 struct target_statx {
-- 
2.34.1



  parent reply	other threads:[~2023-06-03 22:26 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-03 22:23 [PATCH 00/15] linux-user: Fix syscalls_def.h for target abi Richard Henderson
2023-06-03 22:23 ` [PATCH 01/15] linux-user: Reformat syscall_defs.h Richard Henderson
2023-06-05 13:02   ` Philippe Mathieu-Daudé
2023-06-03 22:23 ` [PATCH 02/15] linux-user: Remove #if 0 block in syscall_defs.h Richard Henderson
2023-06-05 12:58   ` Philippe Mathieu-Daudé
2023-06-03 22:23 ` [PATCH 03/15] linux-user: Use abi_uint not uint32_t " Richard Henderson
2023-06-03 22:23 ` Richard Henderson [this message]
2023-06-05 12:52   ` [PATCH 04/15] linux-user: Use abi_int not int32_t " Philippe Mathieu-Daudé
2023-06-03 22:23 ` [PATCH 05/15] linux-user: Use abi_ullong not uint64_t " Richard Henderson
2023-06-05 12:53   ` Philippe Mathieu-Daudé
2023-06-03 22:23 ` [PATCH 06/15] linux-user: Use abi_llong not int64_t " Richard Henderson
2023-06-05 12:54   ` Philippe Mathieu-Daudé
2023-06-03 22:23 ` [PATCH 07/15] linux-user: Use abi_uint not unsigned int " Richard Henderson
2023-06-03 22:23 ` [PATCH 08/15] linux-user: Use abi_ullong not unsigned long long " Richard Henderson
2023-06-05 12:56   ` Philippe Mathieu-Daudé
2023-06-03 22:23 ` [PATCH 09/15] linux-user: Use abi_llong not " Richard Henderson
2023-06-05 12:55   ` Philippe Mathieu-Daudé
2023-06-03 22:23 ` [PATCH 10/15] linux-user: Use abi_int not int " Richard Henderson
2023-06-03 22:23 ` [PATCH 11/15] linux-user: Use abi_ushort not unsigned short " Richard Henderson
2023-06-05 12:57   ` Philippe Mathieu-Daudé
2023-06-03 22:23 ` [PATCH 12/15] linux-user: Use abi_short not " Richard Henderson
2023-06-05 12:57   ` Philippe Mathieu-Daudé
2023-06-03 22:23 ` [PATCH 13/15] linux-user: Use abi_uint not unsigned " Richard Henderson
2023-06-05 12:57   ` Philippe Mathieu-Daudé
2023-06-03 22:23 ` [PATCH 14/15] include/exec/user: Set ABI_LLONG_ALIGNMENT to 4 for microblaze Richard Henderson
2023-06-03 22:23 ` [PATCH 15/15] include/exec/user: Set ABI_LLONG_ALIGNMENT to 4 for nios2 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=20230603222355.1379711-5-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=laurent@vivier.eu \
    --cc=qemu-devel@nongnu.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.