From patchwork Tue Jan 11 19:52:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 531163 Delivered-To: patch@linaro.org Received: by 2002:ad5:544f:0:0:0:0:0 with SMTP id a15csp3798627imp; Tue, 11 Jan 2022 12:19:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJxJi6RwpLU0EwKwJ6mMYfiGlzlGUnh5lDAkeGKLcOWY/gs1HZFE15WP38XyhL27ErOXx/C6 X-Received: by 2002:a05:6902:84:: with SMTP id h4mr5766326ybs.722.1641932396989; Tue, 11 Jan 2022 12:19:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1641932396; cv=none; d=google.com; s=arc-20160816; b=Z9M8HSkpVRw55SCF4u5Ppht4iTFwL2v+Lo+NwU4PbqbGpEUIulhUzV/HQ9ML85MlW7 i8ksveJPOIIyl+ZKd0VM6QiBA/JytGwLYzHs+a7ML23mkwyXP+8DSai7ePQT/ceowkQ1 fmzUumY58yaZ3NSUF78LL7gVEG/5Mx2iFNp9/BCUU+NAfJq6NC3F/urvo+0ko11Y4VYt 8WxD8TY5uEIZunoOw8qi0cYID2bT1er6IVH9Vc8LpAd8mTX9EpImW4L4NJnwmEcccfjH MCSNMRaBkpZTfei6MuhxMMWJ69HZKUIzb5J7d3IAjxALbEtChP2l+kf/wRyOVY+7OuTB w0Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc: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:to:from; bh=qXQz/15cKU8SvoeIZWESu9+ouKgsRc2rrrXf5LFIVAc=; b=QI4Vdkb7vCLxjiYtx9ACdGwRHZ+m+3KJ074OgJ8LVh7vveLkqSD0lfuGDu98QKza+e 5MDosx3HimagQpjUBjuszsfIYTpeCPa+dn5kW3kc0QOtxtgBxHRBu40RMJxh1SuOtCn/ +xn+XtezZKxdIhtm2iJVIHHuBtmxy/TbnXRLGtZ5ZvDwA+LOtbuLkL7WLoUpjp4mM6Vf gmcVpSZKSnio61iq6GFRaDpIsE9Jl6PcCtz8k4HXrQGhEBcmz8CM5u/SE1ixJJuymakR b+Tn45U46s435lWuuNglFYP+18GXGPT24UqcG1dmdGNmexiIuNotFc/510IE/OzL7Jw2 PVdw== ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x8si8658064ybk.831.2022.01.11.12.19.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Jan 2022 12:19:56 -0800 (PST) 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; 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" Received: from localhost ([::1]:51160 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7Nca-0000bJ-EA for patch@linaro.org; Tue, 11 Jan 2022 15:19:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7NCd-00086U-Im for qemu-devel@nongnu.org; Tue, 11 Jan 2022 14:53:07 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:40921) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7NCb-0008I0-6o for qemu-devel@nongnu.org; Tue, 11 Jan 2022 14:53:07 -0500 Received: from quad ([82.142.23.158]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MAwPf-1nDfng1Nmr-00BH9T; Tue, 11 Jan 2022 20:53:01 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 25/30] linux-user/arm: Move target_oabi_flock64 out of target_structs.h Date: Tue, 11 Jan 2022 20:52:42 +0100 Message-Id: <20220111195247.1737641-26-laurent@vivier.eu> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220111195247.1737641-1-laurent@vivier.eu> References: <20220111195247.1737641-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:8ADUk6klj619kaP88H9mi5v3mUrFA5nPGnOoX+DGoCqHBWYln9G hOwMCzjWZAyTteX0ysiY/djJCCOOXTpukwbQpjUHCzRBGZjqM9pjCT+H5hjmjlVk1jPZh46 vkUQTNz9Y+tAvHVOPG/pSIInnhT7jb8N0UuoeHR0TmUSUlscCkInDp40uU/cJaILCqEtHkO vjOTYqp8hRLORioD+xcCQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:LFJMGnzhBMY=:qtJ7ZcqTEYFtkOVuU/O3Mz OmhrQDEDsUwwuiiR/FcCP8L4daCE0r5QwYYmEE003TMoWfnkkq4ttJbHEHHkEWTifNLQ48crx qyH8KuFabN36NVjwn0SRo2jfiVci2hkcfKRHoDdFQD6sUs5MutdIeEcX911bNMHGAUhZ6FHRd vJJ0QOIhox+8ZqJeIiZd51GgHu/VvTyB2XonrvaY3s2oTDL2RvwzLBOEmapw+15JeE2rIO5+a zghkCxUB0wLh0TcU+FJw4ZqUxg5ybehMxhZmbS7Fq3BFyA7uDhvujEmLyvaVRI9jMqXDV4alb RCtrDcMdQabG7cLR01cmtVQcUWIEf+bLxcyEXu+n5P9XdgWp5GAa9Jaib3Bo574YAQk24rEYb 6E77579DHWPbZw5sxWVg3gaatXVng324uIkBHPUeQ2oNzJAdPRqwhMqjPtEGmNoJAGSXTIrRl TaI73VZdqed+wFZt67+ism7QOlFCjoiY4VrLbQzQAC82d+aerGtdBLJSinIi7c8hMOXtMy++a Fg8fLYdPBGMnzhqCzkOFvXxh/86qkLe7E96SzVjhZzALXvMDesxlHlnpxmg9w8Xe5l/XKtHoi EQ3Sg47Iyyp62MCb/LIRZEM4C3Czk69St0K5eAQRQqro9g3UmCmz5gseQVJiBVEKHcL2VMA9+ Q/GsqwVi2GwUaAAtlJVVTA3p02QjOSrbvLDiUmHQYbu1/SkpDwBc7OhAIF1ZpRKAIhOM= Received-SPF: none client-ip=212.227.17.24; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_NONE=0.001 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: , Cc: Richard Henderson , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Place it next to copy_from/to_user_oabi_flock64, the only users, inside the existing target-specific ifdef. This leaves only generic ipc structs in target_structs.h. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Laurent Vivier Message-Id: <20220107042600.149852-2-richard.henderson@linaro.org> Signed-off-by: Laurent Vivier --- linux-user/arm/target_structs.h | 8 -------- linux-user/syscall.c | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/linux-user/arm/target_structs.h b/linux-user/arm/target_structs.h index 339b070bf1a5..25bf8dd3a5c9 100644 --- a/linux-user/arm/target_structs.h +++ b/linux-user/arm/target_structs.h @@ -48,12 +48,4 @@ struct target_shmid_ds { abi_ulong __unused4; abi_ulong __unused5; }; - -struct target_oabi_flock64 { - abi_short l_type; - abi_short l_whence; - abi_llong l_start; - abi_llong l_len; - abi_int l_pid; -} QEMU_PACKED; #endif diff --git a/linux-user/syscall.c b/linux-user/syscall.c index ce9d64896cb8..ca6e0b8fb0a1 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -6927,6 +6927,14 @@ typedef abi_long from_flock64_fn(struct flock64 *fl, abi_ulong target_addr); typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock64 *fl); #if defined(TARGET_ARM) && TARGET_ABI_BITS == 32 +struct target_oabi_flock64 { + abi_short l_type; + abi_short l_whence; + abi_llong l_start; + abi_llong l_len; + abi_int l_pid; +} QEMU_PACKED; + static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl, abi_ulong target_flock_addr) {