From patchwork Sat Jun 3 22:23:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 688804 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp1479611wru; Sat, 3 Jun 2023 15:26:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ46ExTgGoRlaEaAQWFRnR23e9vo3LqKNNfn/TxpsPUX5SegGNJaebTYXC8+qTTeUG4dGAwk X-Received: by 2002:ad4:5dee:0:b0:626:cf8:8431 with SMTP id jn14-20020ad45dee000000b006260cf88431mr3806242qvb.45.1685831196775; Sat, 03 Jun 2023 15:26:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685831196; cv=none; d=google.com; s=arc-20160816; b=JRUF5xcf0R3pZlpVXLNIN10Vjox60/63YzKxxwhQeg1Xa5ucs3LpH+Un5XivQfL3Mj uTUl2uHLVq17ftzKTgoG3V3jdLR+nYYYN6uBtBZZaskTDZ8XQ4HSdc8I4aJeb3TAGWIX DiNJvzDLYHIP1b1m6pKZpb2HKAo1+HjeQeibb1g3eKpLnIIp9HgfKZg+hzCAUY8b0BsV lq8Sg2Pb256hbVDZ6GP9wZ+RDKFXK58ydtZR1hCPrUnRM0Hh2T1BZOn2M1canwr1DxBe UwjgJW4y+gs5vsLZc9rtdiKjqu3gmPys4Pe4wuIu7u1o7Y33GQeWufg04LYRDCkNhphQ RVYQ== 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=Vgo+Ng3v7arrdUy09g80WefJ7XRN/HnbdioLfJzQH3E=; b=vlWkD26Bx9kTMH5SUSHbp73jdsmWSeMHMZXQxsvRaSnActanVxGLR/b+kR+W6zFLs9 0QmyH4jfHqFC7hiXHj0hsl3fIrR+cZ/Ok85WJe7/oD0VnwieG/w5/IM3MABmuX8QFutw dOutXNHNQJA5usXIbtRtXUtmQuo7ekAbBp9SX0itWapEUmswyKfBhEqn6yRSzdfNKnu8 6rqheyarH5Sh0ugjrRjqSocHtQWhsARC0aPb49wNoOC/rV9GxVHguhmi2alyFS6H7uOP eaQHlo7EefVD1wadtYn7dqQHOF9pkrQcDto2OW0wka7C4/qBIwwBNt0TtTPQy5oSGpVZ 7N+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e4vBPIOz; 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 fq8-20020a056214258800b00620e47ae4f3si2871000qvb.364.2023.06.03.15.26.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 03 Jun 2023 15:26:36 -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=e4vBPIOz; 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 1q5ZfI-0006zm-DB; Sat, 03 Jun 2023 18:24:04 -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 1q5ZfH-0006ze-HT for qemu-devel@nongnu.org; Sat, 03 Jun 2023 18:24:03 -0400 Received: from mail-oa1-x2c.google.com ([2001:4860:4864:20::2c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q5ZfF-0004vv-RP for qemu-devel@nongnu.org; Sat, 03 Jun 2023 18:24:03 -0400 Received: by mail-oa1-x2c.google.com with SMTP id 586e51a60fabf-1a26f26ebb8so2518369fac.2 for ; Sat, 03 Jun 2023 15:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685831040; x=1688423040; 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=Vgo+Ng3v7arrdUy09g80WefJ7XRN/HnbdioLfJzQH3E=; b=e4vBPIOzJg0s3v8oFrGBQE7lSWtwVCQm2FyF+uRKw9Oxf7oY/CF/H92GiclftIz3qs +XWXaKv2cO1p0pOkeIxC8Ic6GMmDaE85uSXuPwrASkxsn9nokEwWRTcc4A0gTOn39Tqj bLeqVSzIioFn90qQQO7gccJ3YTixBfacpbVEIv9KEn7RCaQ8NGw1MrOQxQZoUI5ZACEy OIVZ8j7mscTNY5c8ebqaKgS8AFZGtG0XD6Uk3oDeEwutGWK4c8ZVHrs4V1V4tPlKhV32 lsg5mXlvDyIRtwX1ZA5a4teBQH8adY/gnnMTaGUp/W+N6a0ISg8jPvncujNn1VzfOYLR H7Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685831040; x=1688423040; 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=Vgo+Ng3v7arrdUy09g80WefJ7XRN/HnbdioLfJzQH3E=; b=Gt2AJRapFK6MDcrJNuwmc/fOYWfW6iX5qcfa1kkPh53O2j0ofh3sFgRhNiarM16Qqr pTcUrBlelysBH2eV74qYkSUXinEe2r+wjHdsfMasxQ+2UokUQZ73RxPDxuShaSxRusmf mf7LVFwC1L6tlznf3vXPy3hyJ6Qv5i+RcBlzBB+gVCRM7l4uqp3AfXDisAcxdeIcMpvb weQOFxYvOecwiEC45IFVwTpv5V4haFTC689wqtT2JE+VO+qnEpSQDC+EYm5oGRuu/VZV ZM3hnr5BYaiHGQpByPCoKFjR4h3GEy0r9JbeeoY6v/7pHFclqS8cM5Fn1fKdOQwUGfnk Yuaw== X-Gm-Message-State: AC+VfDxzSfJLjNxzpmsaw3EVBAXh1fHA7T16z7zE0/yYNLcR4aGsVSca S6AnupgfgY1iaa/RKoNKB3BuWWapbvGPU6cKFnA= X-Received: by 2002:a05:6358:52d3:b0:127:b79b:c08c with SMTP id z19-20020a05635852d300b00127b79bc08cmr10963579rwz.8.1685831040279; Sat, 03 Jun 2023 15:24:00 -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.23.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jun 2023 15:23:59 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: laurent@vivier.eu Subject: [PATCH 04/15] linux-user: Use abi_int not int32_t in syscall_defs.h Date: Sat, 3 Jun 2023 15:23:44 -0700 Message-Id: <20230603222355.1379711-5-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=2001:4860:4864:20::2c; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x2c.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 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, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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 Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé --- 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 {