From patchwork Sat Jun 3 22:23:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 688807 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp1479855wru; Sat, 3 Jun 2023 15:27:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4ylSTr1Ers3yjTEJ6KSplPgnsbAO4mDzFwmvI26lS5f1Q32pFlc9NSawGWUqoBbBusbrc7 X-Received: by 2002:a05:622a:1c4:b0:3f6:c52e:21bc with SMTP id t4-20020a05622a01c400b003f6c52e21bcmr3309802qtw.19.1685831265235; Sat, 03 Jun 2023 15:27:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685831265; cv=none; d=google.com; s=arc-20160816; b=WF9gj7rGDh1Qw0Z0x1IjrKt/UTPM/sk01Chw/xIxWrTvLcd/v2Uy2ulIdRHtlonEaH axRArT7aFN7RNIeydUSobwaETuinWdw4/mgh/l3dbUOgNt4tknIH8lH0BX8CfrLKTXhr kMGZwH0xw9lIxXY+uTe/sWgb6rdqaYFDhUB4Yek6PZbbqZXkL59DR+qooAw00+ZcWdL+ tDfeeiCmiPCyWzYenLnyqop5BP5Ndn8wFc3sVzuLJSk6QZVGq+5EkgWUqeuB80SwighZ WYfJ24ZRjPzlFAbjc8zTOxny2uYNqCCSqKCygOyRFIo4r8+9I9HgvkCeq2wDpFhzRZJP HJxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=P+vuo8ZiaWyUViHCKEbOretSt8XPKEBBkYyEFRB90aE=; b=K1dG1wsQYehl205M90NL/43vBlUJL65oQb2S38PaUO2Avgr7rjzIWvM/YINSe9opFl 3c70W8dvYmNy+BkYudAXATgcoilylN/zicioJjPLWXxXUdyfTGTeHx2DyW8EtxQIBjaj KKr0smeczIB8VMP/1xDWzEJo6TPfgXAJpht+2xaBgicD/5OmjM/JRkjLuW3aAizeWghd DYmxKwbfV+m/K0v1e7yAizFOnt3QJscf524wL3XkZoa1rvJoVJUVY2aFvtV9XAXfHipu 1fw2+0/C/G5jg77Y6BOWTlfWC0xcO3gEnE/j17Cok4MxOz1OHPXqOhkuG+4kzyHtGabd hycw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nJXo3nm0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id im11-20020a056214246b00b005bff3694a54si2895925qvb.365.2023.06.03.15.27.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 03 Jun 2023 15:27:45 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nJXo3nm0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q5ZfO-00072s-2S; Sat, 03 Jun 2023 18:24:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q5ZfI-0006zr-JS for qemu-devel@nongnu.org; Sat, 03 Jun 2023 18:24:04 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q5ZfG-0004w7-Kl for qemu-devel@nongnu.org; Sat, 03 Jun 2023 18:24:04 -0400 Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-652a6cf1918so1419864b3a.1 for ; Sat, 03 Jun 2023 15:24:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685831041; x=1688423041; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=P+vuo8ZiaWyUViHCKEbOretSt8XPKEBBkYyEFRB90aE=; b=nJXo3nm044N32HBTbTa6PuYml5bAwE7sjPqxyVxTE5LBlEaNtaNw0+yJJpsKJiOmGe EHU/H8XhPFNhkl5Wko3BtMujNe3bMeiBWTRzQcOmBqqtRHxGSdXHc7ljYxNb8emO3wpf 4QBvV7F0fjAwBpf2bp3PKs1tDbMCjfdC5YeuRW6XsYhugVTa/aX+Bnwr3Z33HDEVIlRy k7jdBvxaapB/5e2bNstlfW36pi0UQWHri+q6EaGH6GmRaSH8dtiJQzJE3sAMKBae0u1H sY411k0m+nn76nA5m0NA6UX3zCoc3SlAoeU8paX1BQWrHWhKVrM6r3/9tD8QNMvhTXMS wrBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685831041; x=1688423041; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P+vuo8ZiaWyUViHCKEbOretSt8XPKEBBkYyEFRB90aE=; b=Nz657Vs8wKcY273lif9JfYFokbOMK8HBYf4GtTezJqxjxIsI8G3qYWB9Km41chYHwG o8X9csSHAFhQpgAczUuQ+J0tqLP4z39miIpRybS4dNjxAQtKeuuCJ62VggTizPaUFMDF iHhZ3bbQ/zT1AhAP/SNmigDuZ7+rXdvClJF8BdT7vgBHkiHLYvCRfaWN+o99bt3Lqzx2 bM7Da2rtfxUW73dAFICsOS1P1Lb+ypNn3DA8mRNtuEUypkO/mLJRr1KM3+HIbaa2ZFxD myhcAF5tBf6xb2kXSOzoFK7YpFKUw5roMfI/uCGgmQDLifwTjhWhMjERJCeVkvO71vE2 yyFw== X-Gm-Message-State: AC+VfDxlWPoxpSTe3K8FAL9irLeWwug5sxXHn/WqDyliyeTiUydlNnSP pwD/XhET9M/JgL1Tvy39qkVd2TH/EUwwtJhiOFE= X-Received: by 2002:a05:6a00:a8e:b0:64c:c841:4e8a with SMTP id b14-20020a056a000a8e00b0064cc8414e8amr12689022pfl.22.1685831041098; Sat, 03 Jun 2023 15:24:01 -0700 (PDT) Received: from stoup.. ([2602:ae:1598:4c01:9a37:84b6:b3f0:f301]) by smtp.gmail.com with ESMTPSA id m14-20020aa78a0e000000b0063d2dae6247sm187208pfa.77.2023.06.03.15.24.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jun 2023 15:24:00 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: laurent@vivier.eu Subject: [PATCH 05/15] linux-user: Use abi_ullong not uint64_t in syscall_defs.h Date: Sat, 3 Jun 2023 15:23:45 -0700 Message-Id: <20230603222355.1379711-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230603222355.1379711-1-richard.henderson@linaro.org> References: <20230603222355.1379711-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42f; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Be careful not to change linux_dirent64, which is a host structure. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- linux-user/syscall_defs.h | 72 +++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index caaa895bec..0af7249330 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -1444,8 +1444,8 @@ struct target_stat64 { unsigned char __pad0[6]; unsigned short st_dev; - uint64_t st_ino; - uint64_t st_nlink; + abi_ullong st_ino; + abi_ullong st_nlink; unsigned int st_mode; @@ -1501,7 +1501,7 @@ struct target_stat64 { unsigned char __pad0[6]; unsigned short st_dev; - uint64_t st_ino; + abi_ullong st_ino; unsigned int st_mode; unsigned int st_nlink; @@ -1618,7 +1618,7 @@ struct target_stat { /* FIXME: Microblaze no-mmu user-space has a difference stat64 layout... */ #define TARGET_HAS_STRUCT_STAT64 struct QEMU_PACKED target_stat64 { - uint64_t st_dev; + abi_ullong st_dev; #define TARGET_STAT64_HAS_BROKEN_ST_INO 1 abi_uint pad0; abi_uint __st_ino; @@ -1627,8 +1627,8 @@ struct QEMU_PACKED target_stat64 { abi_uint st_nlink; abi_uint st_uid; abi_uint st_gid; - uint64_t st_rdev; - uint64_t __pad1; + abi_ullong st_rdev; + abi_ullong __pad1; int64_t st_size; abi_int st_blksize; @@ -1641,7 +1641,7 @@ struct QEMU_PACKED target_stat64 { unsigned int target_st_mtime_nsec; int target_st_ctime; unsigned int target_st_ctime_nsec; - uint64_t st_ino; + abi_ullong st_ino; }; #elif defined(TARGET_M68K) @@ -1753,7 +1753,7 @@ struct target_stat { struct target_stat { abi_ulong st_dev; abi_ulong st_pad0[3]; /* Reserved for st_dev expansion */ - uint64_t st_ino; + abi_ullong st_ino; unsigned int st_mode; unsigned int st_nlink; int st_uid; @@ -1813,7 +1813,7 @@ struct target_stat64 { abi_ulong st_dev; abi_ulong st_pad0[3]; /* Reserved for st_dev expansion */ - uint64_t st_ino; + abi_ullong st_ino; unsigned int st_mode; unsigned int st_nlink; @@ -2044,17 +2044,17 @@ struct target_stat { #define TARGET_HAS_STRUCT_STAT64 struct target_stat64 { - uint64_t st_dev; /* Device */ - uint64_t st_ino; /* File serial number */ + abi_ullong st_dev; /* Device */ + abi_ullong st_ino; /* File serial number */ unsigned int st_mode; /* File mode. */ unsigned int st_nlink; /* Link count. */ unsigned int st_uid; /* User ID of the file's owner. */ unsigned int st_gid; /* Group ID of the file's group. */ - uint64_t st_rdev; /* Device number, if device. */ + abi_ullong st_rdev; /* Device number, if device. */ int64_t st_size; /* Size of file, in bytes. */ abi_ulong st_blksize; /* Optimal block size for I/O. */ abi_ulong __unused2; - uint64_t st_blocks; /* Number 512-byte blocks allocated. */ + abi_ullong st_blocks; /* Number 512-byte blocks allocated. */ abi_ulong target_st_atime; /* Time of last access. */ abi_ulong target_st_atime_nsec; abi_ulong target_st_mtime; /* Time of last modification. */ @@ -2097,14 +2097,14 @@ struct target_stat { #if !defined(TARGET_RISCV64) #define TARGET_HAS_STRUCT_STAT64 struct target_stat64 { - uint64_t st_dev; - uint64_t st_ino; + abi_ullong st_dev; + abi_ullong st_ino; unsigned int st_mode; unsigned int st_nlink; unsigned int st_uid; unsigned int st_gid; - uint64_t st_rdev; - uint64_t __pad1; + abi_ullong st_rdev; + abi_ullong __pad1; int64_t st_size; int st_blksize; int __pad2; @@ -2156,14 +2156,14 @@ struct target_stat { #define TARGET_HAS_STRUCT_STAT64 struct target_stat64 { - uint64_t st_dev; + abi_ullong st_dev; abi_uint _pad1; abi_uint _res1; abi_uint st_mode; abi_uint st_nlink; abi_uint st_uid; abi_uint st_gid; - uint64_t st_rdev; + abi_ullong st_rdev; abi_uint _pad2; int64_t st_size; abi_int st_blksize; @@ -2174,7 +2174,7 @@ struct target_stat64 { abi_uint target_st_mtime_nsec; abi_int target_st_ctime; abi_uint target_st_ctime_nsec; - uint64_t st_ino; + abi_ullong st_ino; }; #elif defined(TARGET_LOONGARCH64) @@ -2231,11 +2231,11 @@ struct target_statfs64 { abi_uint f_bsize; abi_uint f_frsize; /* Fragment size - unsupported */ abi_uint __pad; - uint64_t f_blocks; - uint64_t f_bfree; - uint64_t f_files; - uint64_t f_ffree; - uint64_t f_bavail; + abi_ullong f_blocks; + abi_ullong f_bfree; + abi_ullong f_files; + abi_ullong f_ffree; + abi_ullong f_bavail; target_fsid_t f_fsid; abi_uint f_namelen; abi_uint f_flags; @@ -2324,11 +2324,11 @@ struct target_statfs { struct target_statfs64 { abi_uint f_type; abi_uint f_bsize; - uint64_t f_blocks; - uint64_t f_bfree; - uint64_t f_bavail; - uint64_t f_files; - uint64_t f_ffree; + abi_ullong f_blocks; + abi_ullong f_bfree; + abi_ullong f_bavail; + abi_ullong f_files; + abi_ullong f_ffree; target_fsid_t f_fsid; abi_uint f_namelen; abi_uint f_frsize; @@ -2799,7 +2799,7 @@ struct target_statx { /* 0x00 */ abi_uint stx_mask; /* What results were written [uncond] */ abi_uint stx_blksize; /* Preferred general I/O size [uncond] */ - uint64_t stx_attributes; /* Flags conveying information about the file */ + abi_ullong stx_attributes; /* Flags conveying information about the file */ /* 0x10 */ abi_uint stx_nlink; /* Number of hard links */ abi_uint stx_uid; /* User ID of owner */ @@ -2807,10 +2807,10 @@ struct target_statx { uint16_t stx_mode; /* File mode */ uint16_t __spare0[1]; /* 0x20 */ - uint64_t stx_ino; /* Inode number */ - uint64_t stx_size; /* File size */ - uint64_t stx_blocks; /* Number of 512-byte blocks allocated */ - uint64_t stx_attributes_mask; /* Mask to show what is supported */ + abi_ullong stx_ino; /* Inode number */ + abi_ullong stx_size; /* File size */ + abi_ullong stx_blocks; /* Number of 512-byte blocks allocated */ + abi_ullong stx_attributes_mask; /* Mask to show what is supported */ /* 0x40 */ struct target_statx_timestamp stx_atime; /* Last access time */ struct target_statx_timestamp stx_btime; /* File creation time */ @@ -2822,7 +2822,7 @@ struct target_statx { abi_uint stx_dev_major; /* ID of device containing file [uncond] */ abi_uint stx_dev_minor; /* 0x90 */ - uint64_t __spare2[14]; /* Spare space for future expansion */ + abi_ullong __spare2[14]; /* Spare space for future expansion */ /* 0x100 */ };