From patchwork Sat Jul 15 13:52:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 703221 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e4d:0:b0:314:25da:8dc4 with SMTP id r13csp157257wrt; Sat, 15 Jul 2023 06:55:47 -0700 (PDT) X-Google-Smtp-Source: APBJJlEsG26Uj+bSVhJyuH7foprMexRSjYjITZFDshW2As59w1PkyBJN/AC+kkPsTOKQbVHaGoZ9 X-Received: by 2002:a0c:ab19:0:b0:61b:7bac:aeb7 with SMTP id h25-20020a0cab19000000b0061b7bacaeb7mr6004789qvb.40.1689429347188; Sat, 15 Jul 2023 06:55:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689429347; cv=none; d=google.com; s=arc-20160816; b=DdJq69labRio3jkMLPTiYt7Vz0qaW6w0aRE6hbdmwO0mNJsNGGJNtjaVDpj9hxxkpw vpXQd9SkpQ4JjdKm7s6TC+8m9FE1Dgy/bM9lFmVL37ACKbcJQklL4KisJBsJrGlpRzea mON3wBUMAF+GkXBszctYJHLnqt8cl2oEOsG9x5nj+Eesk7IgTiMFUaE87eFemIf72IED XeX6dePfQogo7ZnD58m7kw4Vu9OoFEp3ghD0rYPnwbh23vRLnIEh5EhUdixboIY3yP7z twfy69P3a3X7NxcgUHAUrfY4qzKSDkr6vRlep2SSwFsTLRJYEOXrZYOfAIs91PzHd7ZJ PpZQ== 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=0axJfNA+Z363BLcyj9VA5KZ1tFbJa96aH9vwiYFI9Ic=; fh=i1mkeM7bD/ppus3C3v+92ltBBCUUU0zBXrpbYjAjHqE=; b=O9cKzLV2AAFUoayFH+9rXcDhCiHlmXYqecTI79QmGvBlhK5lvGl0n5q9H8/p8UrgOw p9Be+JS/Zj821HX2kPvW4PqKYb6vy1FAnmNJ15MJA+mjH9SfLOMK4cTgr6xh6xPOgJr5 Kf0CGxU4N7I30Z09DBrwIkbU4EXyYKHg3IWlnndMQkhmJlsLTF4DX15VqQ/6QYkNRSt4 6x4V6DbW7rqLJfxECZVkfdUQdqzTF3xKcEudena5B9zl5VZMzme/OOfE2WkpdGC31VJt CgJH6TYnXWyQqHGCX/J059A9T30Vyw6jtcD9KSKW+DaZtxxGO13Ko5jVL+4DI29TfvoR 72Pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SrdTNYG8; 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 a14-20020a0cca8e000000b00636cec467casi5835127qvk.108.2023.07.15.06.55.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 Jul 2023 06:55:47 -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=SrdTNYG8; 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 1qKfiw-0004TL-AE; Sat, 15 Jul 2023 09:54:14 -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 1qKfiG-00042M-6V for qemu-devel@nongnu.org; Sat, 15 Jul 2023 09:53:32 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qKfiE-0001F4-An for qemu-devel@nongnu.org; Sat, 15 Jul 2023 09:53:31 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-3fbc5d5742bso26493635e9.2 for ; Sat, 15 Jul 2023 06:53:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689429209; x=1692021209; 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=0axJfNA+Z363BLcyj9VA5KZ1tFbJa96aH9vwiYFI9Ic=; b=SrdTNYG8tCX/BbtFwlVg943r8hTttT+hCQnr8BXmQEfEsbRLXryuNOKwWKssjIQQsJ zi2fR4G1y0WH6T/watMyvXjZZoA4hsccM2HtBFJdKkt1g6i9Be5WnR2TaGXXYzuOKT7G fToGp5zuGlwwweAYL9o+4UusvVt33ht4gE+WvavlMN/040q8mBNy8zKF2CXLDlouc+NR VoJUHH8biOvXBU+506/eTaAoyz21qgWqoNFD/A91fj30qbmKYlmDK3GI97lLQw2OPSVq 97L7vAiFrcCTm471NgtxypfRUpk1UBuhReHoJK/SM65nka56rmemxSCLAhLXSjdxjZmS aXlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689429209; x=1692021209; 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=0axJfNA+Z363BLcyj9VA5KZ1tFbJa96aH9vwiYFI9Ic=; b=VB8HYET6LW9sepEVBbJIkJf4HUE5RyrGFSO/1/Dd+co/n5hFWSb5O6dCTx1pjQIsTX 93o/umSeLOxeH++DRafuhQ8eIWphqsC3cQtGMnFJejxAuJ3kWcu/ksnPwYB8pkPu9N01 7wyGAjsKTfKJoS1F27hGr5oqvy5iFyw+j2f4fGyVZjDS2Cd6o1wSH2WTgWZ+YkXxBkjg DzVsJvWs+XhpI/rrbiGKh2gzUsehaSva9hzFHchhcaZj4RhZUfc4cn4jMZ4yz+rDpcuR veR4p2sZk99MEL2o8MDQoGFE0f3wpuMgDPdgWkxqaKo6n4vcZBJ7AdAjuZMyzAOaXjYX oI3w== X-Gm-Message-State: ABy/qLaUegI0cRNs5PNrsToTuHusz1Qgi8xqsSgE292P6sH59SdLD6cZ V1NtHFkBKJQUtsG1YictqdO/g0NFvBk5R7Z98xQqrw== X-Received: by 2002:a05:600c:da:b0:3f7:f584:5796 with SMTP id u26-20020a05600c00da00b003f7f5845796mr7046903wmm.2.1689429208813; Sat, 15 Jul 2023 06:53:28 -0700 (PDT) Received: from stoup.lan ([51.219.12.49]) by smtp.gmail.com with ESMTPSA id k10-20020a5d66ca000000b00313f9085119sm13838014wrw.113.2023.07.15.06.53.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jul 2023 06:53:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 11/47] linux-user: Use abi_ushort not unsigned short in syscall_defs.h Date: Sat, 15 Jul 2023 14:52:41 +0100 Message-Id: <20230715135317.7219-12-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230715135317.7219-1-richard.henderson@linaro.org> References: <20230715135317.7219-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x32d.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 Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- linux-user/syscall_defs.h | 90 +++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 442a8aefe3..21ca03b0f4 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -432,7 +432,7 @@ typedef struct { struct target_dirent { abi_long d_ino; abi_long d_off; - unsigned short d_reclen; + abi_ushort d_reclen; char d_name[]; }; @@ -1210,19 +1210,19 @@ struct target_rtc_pll_info { #define TARGET_NCC 8 struct target_termio { - unsigned short c_iflag; /* input mode flags */ - unsigned short c_oflag; /* output mode flags */ - unsigned short c_cflag; /* control mode flags */ - unsigned short c_lflag; /* local mode flags */ + abi_ushort c_iflag; /* input mode flags */ + abi_ushort c_oflag; /* output mode flags */ + abi_ushort c_cflag; /* control mode flags */ + abi_ushort c_lflag; /* local mode flags */ unsigned char c_line; /* line discipline */ unsigned char c_cc[TARGET_NCC]; /* control characters */ }; struct target_winsize { - unsigned short ws_row; - unsigned short ws_col; - unsigned short ws_xpixel; - unsigned short ws_ypixel; + abi_ushort ws_row; + abi_ushort ws_col; + abi_ushort ws_xpixel; + abi_ushort ws_ypixel; }; #include "termbits.h" @@ -1328,15 +1328,15 @@ struct target_winsize { || defined(TARGET_CRIS) #define TARGET_STAT_HAVE_NSEC struct target_stat { - unsigned short st_dev; - unsigned short __pad1; + abi_ushort st_dev; + abi_ushort __pad1; abi_ulong st_ino; - unsigned short st_mode; - unsigned short st_nlink; - unsigned short st_uid; - unsigned short st_gid; - unsigned short st_rdev; - unsigned short __pad2; + abi_ushort st_mode; + abi_ushort st_nlink; + abi_ushort st_uid; + abi_ushort st_gid; + abi_ushort st_rdev; + abi_ushort __pad2; abi_ulong st_size; abi_ulong st_blksize; abi_ulong st_blocks; @@ -1355,7 +1355,7 @@ struct target_stat { */ #define TARGET_HAS_STRUCT_STAT64 struct target_stat64 { - unsigned short st_dev; + abi_ushort st_dev; unsigned char __pad0[10]; #define TARGET_STAT64_HAS_BROKEN_ST_INO 1 @@ -1367,7 +1367,7 @@ struct target_stat64 { abi_ulong st_uid; abi_ulong st_gid; - unsigned short st_rdev; + abi_ushort st_rdev; unsigned char __pad3[10]; abi_llong st_size; @@ -1442,7 +1442,7 @@ struct target_stat { #define TARGET_HAS_STRUCT_STAT64 struct target_stat64 { unsigned char __pad0[6]; - unsigned short st_dev; + abi_ushort st_dev; abi_ullong st_ino; abi_ullong st_nlink; @@ -1453,7 +1453,7 @@ struct target_stat64 { abi_uint st_gid; unsigned char __pad2[6]; - unsigned short st_rdev; + abi_ushort st_rdev; abi_llong st_size; abi_llong st_blksize; @@ -1477,13 +1477,13 @@ struct target_stat64 { #define TARGET_STAT_HAVE_NSEC struct target_stat { - unsigned short st_dev; + abi_ushort st_dev; abi_ulong st_ino; - unsigned short st_mode; + abi_ushort st_mode; short st_nlink; - unsigned short st_uid; - unsigned short st_gid; - unsigned short st_rdev; + abi_ushort st_uid; + abi_ushort st_gid; + abi_ushort st_rdev; abi_long st_size; abi_long target_st_atime; abi_ulong target_st_atime_nsec; @@ -1499,7 +1499,7 @@ struct target_stat { #define TARGET_HAS_STRUCT_STAT64 struct target_stat64 { unsigned char __pad0[6]; - unsigned short st_dev; + abi_ushort st_dev; abi_ullong st_ino; @@ -1510,7 +1510,7 @@ struct target_stat64 { abi_uint st_gid; unsigned char __pad2[6]; - unsigned short st_rdev; + abi_ushort st_rdev; unsigned char __pad3[8]; @@ -1544,7 +1544,7 @@ struct target_stat { abi_uint st_mode; #else abi_uint st_mode; - unsigned short st_nlink; + abi_ushort st_nlink; #endif abi_uint st_uid; abi_uint st_gid; @@ -1598,7 +1598,7 @@ struct target_stat { abi_ulong st_dev; abi_ulong st_ino; abi_uint st_mode; - unsigned short st_nlink; + abi_ushort st_nlink; abi_uint st_uid; abi_uint st_gid; abi_ulong st_rdev; @@ -1647,15 +1647,15 @@ struct QEMU_PACKED target_stat64 { #elif defined(TARGET_M68K) struct target_stat { - unsigned short st_dev; - unsigned short __pad1; - abi_ulong st_ino; - unsigned short st_mode; - unsigned short st_nlink; - unsigned short st_uid; - unsigned short st_gid; - unsigned short st_rdev; - unsigned short __pad2; + abi_ushort st_dev; + abi_ushort __pad1; + abi_ulong st_ino; + abi_ushort st_mode; + abi_ushort st_nlink; + abi_ushort st_uid; + abi_ushort st_gid; + abi_ushort st_rdev; + abi_ushort __pad2; abi_ulong st_size; abi_ulong st_blksize; abi_ulong st_blocks; @@ -1895,10 +1895,10 @@ struct target_stat64 { struct target_stat { abi_ulong st_dev; abi_ulong st_ino; - unsigned short st_mode; - unsigned short st_nlink; - unsigned short st_uid; - unsigned short st_gid; + abi_ushort st_mode; + abi_ushort st_nlink; + abi_ushort st_uid; + abi_ushort st_gid; abi_ulong st_rdev; abi_ulong st_size; abi_ulong st_blksize; @@ -2619,8 +2619,8 @@ struct target_sysinfo { abi_ulong bufferram; /* Memory used by buffers */ abi_ulong totalswap; /* Total swap space size */ abi_ulong freeswap; /* swap space still available */ - unsigned short procs; /* Number of current processes */ - unsigned short pad; /* explicit padding for m68k */ + abi_ushort procs; /* Number of current processes */ + abi_ushort pad; /* explicit padding for m68k */ abi_ulong totalhigh; /* Total high memory size */ abi_ulong freehigh; /* Available high memory size */ abi_uint mem_unit; /* Memory unit size in bytes */