From patchwork Sun Jul 9 18:28:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 700868 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp4827838wrs; Sun, 9 Jul 2023 11:33:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlGzMqFWG1fr0fhki5PXnCWxKyGQD5IIy3gGBmtJ3cb3H/4YZZP2ZBRB4YrJCqVTxyOrzyvN X-Received: by 2002:a05:620a:444d:b0:765:404b:b91a with SMTP id w13-20020a05620a444d00b00765404bb91amr12602407qkp.31.1688927620285; Sun, 09 Jul 2023 11:33:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688927620; cv=none; d=google.com; s=arc-20160816; b=AkQUNmLuXTjJDfCiAMmrANU1Th+3tfSjeXLnRzBm0pOfdXxmvah5xuR0SU44lwtvGs Q/MNWkPmQTwcYqF/cEE5ahF0ArxAVxPTJKrL/jDF34K8UNrDN/ZnFs+uZC8hpzTcroYf uJFEt2AWUGiZteQEYYyg2XR22pRssJGtM6PIC27XB5/mi3Cdp+9LLhm6EKfNGbbmjlN9 0pVlEY9CMLIBPGf/t1D7aCU9wPStk73JbyQt4eHeyJ0SSwSBkilQXE5DdSDN5w8eLwIP mREVoCfdWy377al/kNwq1YLqOWAZC+b0Aq+KdOUqJCEQTDkYl+hOUXNwk1TsPI8TlWvk x9aw== 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=aow7z7inlkO3pr/eTAXJ2bbplOH1xZ+KdEP0VBoCQXI=; fh=3IEiF/YPZ00TE94rna3Orj/L+TRFhpuNf7ElRJz3ubE=; b=hBapH6B0kb461SsQwkg7xDHBSttoGgWAGUzyBoLRY2sX98y/W92tLqQGHJlAZr/erW BegvBZc6jsVsukds5Wrbyj/QpX2UpNAybthzYNvEbOcmiG6rsYKmAlgpE8JCanF0i4yK 2Bh2vJK+/bPn9XmkwGPDeuopV3s/DOLl4dXE+65U6BPDZQ9QMwgHIC0kE16uVgbTyylg wpxASAdzk2uInMziTLKr+M2sBNh0m+VQsz8NR2y/pOBZbHA+xDa0IFiT1SS7zL/ULUQi YThCTxWNrr1LKFBDv5dBUGWVnHf5WIVUN6kPlrkigO4hZTmxhPoWwevKlryJMroznazQ BufQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jeFjwKcj; 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 z6-20020a05620a100600b00766f9f2f7d8si4918253qkj.311.2023.07.09.11.33.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 09 Jul 2023 11:33:40 -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=jeFjwKcj; 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 1qIZAP-0008Fy-4x; Sun, 09 Jul 2023 14:29:53 -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 1qIZAJ-0008EQ-Qu for qemu-devel@nongnu.org; Sun, 09 Jul 2023 14:29:49 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qIZAG-0000E7-PL for qemu-devel@nongnu.org; Sun, 09 Jul 2023 14:29:47 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-3fbf1b82de7so27946985e9.1 for ; Sun, 09 Jul 2023 11:29:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1688927383; x=1691519383; 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=aow7z7inlkO3pr/eTAXJ2bbplOH1xZ+KdEP0VBoCQXI=; b=jeFjwKcjjLrlgUlqcVFFT5VdgStte53SosdndOt4tIjZNCNBCq4r5ZCsPz+/droFnY RtoWL1rlIF03MQQi8LCZILp8rwTRCr1ls5VeIFnJTGnVomsj8KhAua4As9DPvgDjXT6y 7JJ46fs8jbtvkjZ8ftYU9RPOHFgRMwqfy7aC3tDEPJuYm7sG1QLWpIrqPKJ0l1paoOJ3 +0kb5KiFOs4bKRY37V8NigfmJjObySFfmzCvMpKn09veOiufjqHJ8vd25WgN4EaQbZRV iirGvtJJvektQsjv3VO7dt7J1eHNnVQK9Lz9BvYp9jesXAEIJbCsliMLdh2lOS4p2JLr wKZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688927383; x=1691519383; 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=aow7z7inlkO3pr/eTAXJ2bbplOH1xZ+KdEP0VBoCQXI=; b=HwwhTowYxmB1oKvDXCwErYF2tELUQYT1nJIwgJ55JoDhNV4bHYNX/pkQcYZr8jtuGT 4K/aLJsx7MdY9x0UO03dM9s9JIS0MYz4ACG5J+jdGksE03BQLc7QEG2c05vTe8mCy7J+ c7VTHhkjLnjL1O5TR7MMgIp69Brp+tlvmRrkHGglr7zn53gv+mo/gPYQxLQwuPzFEeiO FDAq33weZePp05vXABinzoXzgd14A7K7w7hUtRde6hCQjC3kGjERXyVUhu7JC4wEfepo pF0GTpmrYNvxPvYKxhNlwp2oa8SzHlDjNoOvj92Ta/xdejkyoqmF8chxksXL2DtHqoRD t8UQ== X-Gm-Message-State: ABy/qLY6TcQQxGVyBUK2Dl8+CeLpYYdo+k34vbL6eBoexOUFJVLNjsTe 6afCwvGJqcu8fuNAkIQdOOBBedN1ei64ixh8Oh9nEw== X-Received: by 2002:a1c:cc02:0:b0:3fb:4064:7e22 with SMTP id h2-20020a1ccc02000000b003fb40647e22mr3597986wmb.19.1688927383364; Sun, 09 Jul 2023 11:29:43 -0700 (PDT) Received: from stoup.. ([148.252.133.210]) by smtp.gmail.com with ESMTPSA id q15-20020a7bce8f000000b003fbe791a0e8sm8317108wmj.0.2023.07.09.11.29.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jul 2023 11:29:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: laurent@vivier.eu, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 04/45] linux-user: Use abi_int not int32_t in syscall_defs.h Date: Sun, 9 Jul 2023 19:28:20 +0100 Message-Id: <20230709182934.309468-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230709182934.309468-1-richard.henderson@linaro.org> References: <20230709182934.309468-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x329.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 | 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 {