From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: laurent@vivier.eu
Subject: [PATCH 08/15] linux-user: Use abi_ullong not unsigned long long in syscall_defs.h
Date: Sat, 3 Jun 2023 15:23:48 -0700 [thread overview]
Message-ID: <20230603222355.1379711-9-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 | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 20986bd1d3..45ebacd4b4 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -1385,13 +1385,13 @@ struct target_stat64 {
abi_ulong target_st_ctime;
abi_ulong target_st_ctime_nsec;
- unsigned long long st_ino;
+ abi_ullong st_ino;
} QEMU_PACKED;
#ifdef TARGET_ARM
#define TARGET_HAS_STRUCT_STAT64
struct target_eabi_stat64 {
- unsigned long long st_dev;
+ abi_ullong st_dev;
abi_uint __pad1;
abi_ulong __st_ino;
abi_uint st_mode;
@@ -1400,13 +1400,13 @@ struct target_eabi_stat64 {
abi_ulong st_uid;
abi_ulong st_gid;
- unsigned long long st_rdev;
+ abi_ullong st_rdev;
abi_uint __pad2[2];
long long st_size;
abi_ulong st_blksize;
abi_uint __pad3;
- unsigned long long st_blocks;
+ abi_ullong st_blocks;
abi_ulong target_st_atime;
abi_ulong target_st_atime_nsec;
@@ -1417,7 +1417,7 @@ struct target_eabi_stat64 {
abi_ulong target_st_ctime;
abi_ulong target_st_ctime_nsec;
- unsigned long long st_ino;
+ abi_ullong st_ino;
} QEMU_PACKED;
#endif
@@ -1568,14 +1568,14 @@ struct target_stat {
#if !defined(TARGET_PPC64)
#define TARGET_HAS_STRUCT_STAT64
struct QEMU_PACKED target_stat64 {
- unsigned long long st_dev;
- unsigned long long st_ino;
+ abi_ullong st_dev;
+ abi_ullong st_ino;
abi_uint st_mode;
abi_uint st_nlink;
abi_uint st_uid;
abi_uint st_gid;
- unsigned long long st_rdev;
- unsigned long long __pad0;
+ abi_ullong st_rdev;
+ abi_ullong __pad0;
long long st_size;
int st_blksize;
abi_uint __pad1;
@@ -1674,7 +1674,7 @@ struct target_stat {
*/
#define TARGET_HAS_STRUCT_STAT64
struct target_stat64 {
- unsigned long long st_dev;
+ abi_ullong st_dev;
unsigned char __pad1[2];
#define TARGET_STAT64_HAS_BROKEN_ST_INO 1
@@ -1686,7 +1686,7 @@ struct target_stat64 {
abi_ulong st_uid;
abi_ulong st_gid;
- unsigned long long st_rdev;
+ abi_ullong st_rdev;
unsigned char __pad3[2];
long long st_size;
@@ -1704,7 +1704,7 @@ struct target_stat64 {
abi_ulong target_st_ctime;
abi_ulong target_st_ctime_nsec;
- unsigned long long st_ino;
+ abi_ullong st_ino;
} QEMU_PACKED;
#elif defined(TARGET_ABI_MIPSN64)
@@ -1918,7 +1918,7 @@ struct target_stat {
*/
#define TARGET_HAS_STRUCT_STAT64
struct QEMU_PACKED target_stat64 {
- unsigned long long st_dev;
+ abi_ullong st_dev;
unsigned char __pad0[4];
#define TARGET_STAT64_HAS_BROKEN_ST_INO 1
@@ -1930,13 +1930,13 @@ struct QEMU_PACKED target_stat64 {
abi_ulong st_uid;
abi_ulong st_gid;
- unsigned long long st_rdev;
+ abi_ullong st_rdev;
unsigned char __pad3[4];
long long st_size;
abi_ulong st_blksize;
- unsigned long long st_blocks; /* Number 512-byte blocks allocated. */
+ abi_ullong st_blocks; /* Number 512-byte blocks allocated. */
abi_ulong target_st_atime;
abi_ulong target_st_atime_nsec;
@@ -1947,7 +1947,7 @@ struct QEMU_PACKED target_stat64 {
abi_ulong target_st_ctime;
abi_ulong target_st_ctime_nsec;
- unsigned long long st_ino;
+ abi_ullong st_ino;
};
#elif defined(TARGET_I386) && !defined(TARGET_ABI32)
--
2.34.1
next prev parent reply other threads:[~2023-06-03 22:27 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 ` [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 ` Richard Henderson [this message]
2023-06-05 12:56 ` [PATCH 08/15] linux-user: Use abi_ullong not unsigned long long " 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-9-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).