From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: laurent@vivier.eu
Subject: [PATCH 06/15] linux-user: Use abi_llong not int64_t in syscall_defs.h
Date: Sat, 3 Jun 2023 15:23:46 -0700 [thread overview]
Message-ID: <20230603222355.1379711-7-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230603222355.1379711-1-richard.henderson@linaro.org>
Be careful not to change linux_dirent64, which is a host structure.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/syscall_defs.h | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 0af7249330..2846a8cfa5 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -1455,8 +1455,8 @@ struct target_stat64 {
unsigned char __pad2[6];
unsigned short st_rdev;
- int64_t st_size;
- int64_t st_blksize;
+ abi_llong st_size;
+ abi_llong st_blksize;
unsigned char __pad4[4];
unsigned int st_blocks;
@@ -1514,7 +1514,7 @@ struct target_stat64 {
unsigned char __pad3[8];
- int64_t st_size;
+ abi_llong st_size;
unsigned int st_blksize;
unsigned char __pad4[8];
@@ -1630,10 +1630,10 @@ struct QEMU_PACKED target_stat64 {
abi_ullong st_rdev;
abi_ullong __pad1;
- int64_t st_size;
+ abi_llong st_size;
abi_int st_blksize;
abi_uint __pad2;
- int64_t st_blocks; /* Number 512-byte blocks allocated. */
+ abi_llong st_blocks;
int target_st_atime;
unsigned int target_st_atime_nsec;
@@ -1760,7 +1760,7 @@ struct target_stat {
int st_gid;
abi_ulong st_rdev;
abi_ulong st_pad1[3]; /* Reserved for st_rdev expansion */
- int64_t st_size;
+ abi_llong st_size;
abi_long target_st_atime;
abi_ulong target_st_atime_nsec; /* Reserved for st_atime expansion */
abi_long target_st_mtime;
@@ -1769,7 +1769,7 @@ struct target_stat {
abi_ulong target_st_ctime_nsec; /* Reserved for st_ctime expansion */
abi_ulong st_blksize;
abi_ulong st_pad2;
- int64_t st_blocks;
+ abi_llong st_blocks;
};
#elif defined(TARGET_ABI_MIPSO32)
@@ -1824,7 +1824,7 @@ struct target_stat64 {
abi_ulong st_rdev;
abi_ulong st_pad1[3]; /* Reserved for st_rdev expansion */
- int64_t st_size;
+ abi_llong st_size;
/*
* Actually this should be timestruc_t st_atime, st_mtime and st_ctime
@@ -1842,7 +1842,7 @@ struct target_stat64 {
abi_ulong st_blksize;
abi_ulong st_pad2;
- int64_t st_blocks;
+ abi_llong st_blocks;
};
#elif defined(TARGET_ALPHA)
@@ -2051,7 +2051,7 @@ struct target_stat64 {
unsigned int st_uid; /* User ID of the file's owner. */
unsigned int st_gid; /* Group ID of the file's group. */
abi_ullong st_rdev; /* Device number, if device. */
- int64_t st_size; /* Size of file, in bytes. */
+ abi_llong st_size; /* Size of file, in bytes. */
abi_ulong st_blksize; /* Optimal block size for I/O. */
abi_ulong __unused2;
abi_ullong st_blocks; /* Number 512-byte blocks allocated. */
@@ -2105,10 +2105,10 @@ struct target_stat64 {
unsigned int st_gid;
abi_ullong st_rdev;
abi_ullong __pad1;
- int64_t st_size;
+ abi_llong st_size;
int st_blksize;
int __pad2;
- int64_t st_blocks;
+ abi_llong st_blocks;
int target_st_atime;
unsigned int target_st_atime_nsec;
int target_st_mtime;
@@ -2165,9 +2165,9 @@ struct target_stat64 {
abi_uint st_gid;
abi_ullong st_rdev;
abi_uint _pad2;
- int64_t st_size;
+ abi_llong st_size;
abi_int st_blksize;
- int64_t st_blocks;
+ abi_llong st_blocks;
abi_int target_st_atime;
abi_uint target_st_atime_nsec;
abi_int target_st_mtime;
@@ -2790,7 +2790,7 @@ struct target_user_cap_data {
#define TARGET_SYSLOG_ACTION_SIZE_BUFFER 10
struct target_statx_timestamp {
- int64_t tv_sec;
+ abi_llong tv_sec;
abi_uint tv_nsec;
abi_int __reserved;
};
--
2.34.1
next prev 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 ` [PATCH 04/15] linux-user: Use abi_int not int32_t " Richard Henderson
2023-06-05 12:52 ` 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 ` Richard Henderson [this message]
2023-06-05 12:54 ` [PATCH 06/15] linux-user: Use abi_llong not int64_t " 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-7-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 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 NNTP newsgroup(s).