From patchwork Wed May 9 23:11:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 911215 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40hByr3XpNz9s34 for ; Thu, 10 May 2018 09:15:00 +1000 (AEST) Received: from localhost ([::1]:59405 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGYIU-0001p1-30 for incoming@patchwork.ozlabs.org; Wed, 09 May 2018 19:14:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fGYFe-00082Y-CP for qemu-devel@nongnu.org; Wed, 09 May 2018 19:12:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fGYFa-0002oo-Ne for qemu-devel@nongnu.org; Wed, 09 May 2018 19:12:02 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:49815) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fGYFa-0002nr-Da for qemu-devel@nongnu.org; Wed, 09 May 2018 19:11:58 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MLOsc-1fG0HQ1O2k-000aFg; Thu, 10 May 2018 01:11:38 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 10 May 2018 01:11:19 +0200 Message-Id: <20180509231123.20864-3-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180509231123.20864-1-laurent@vivier.eu> References: <20180509231123.20864-1-laurent@vivier.eu> X-Provags-ID: V03:K1:oUYZRzdGf9a6J+qoku/TljNnm5Hl/K3IGM7SfJY3YKHs/nkOEd6 WRLtK2U6ik+G6bVm/aPfeInOwyXMlYw+P/aPjTwxfrDWqp5Uv2d1yELjmwhrP1h2EJB/di0 aGz/vIOYFKKASabLyr5MrsBbS9Qw2VuwtiW9ezS9ToiZTdahHhoMJwRamNmqBejQT4qxx8A RHD8CsL8W165sGZhRNQsA== X-UI-Out-Filterresults: notjunk:1; V01:K0:nnORT89IdjQ=:n9I00EQhvYvSMkATWZ4KNM pw3ky1q/znUgE81JazICtQH1LX0yApyJbNVfoDDxlJKCGJtrFQWdpq+jiv06mtYRak0RHuXnh 3N3cVGdVippB0y10zdoWIKD7h4cqwLzf0xtGXKsDjmRi/a2ZJreO+uOsRvLPPC6DXo62M8JtI tfrZ8Evy6BNoO2MciKNqdmp5rsD7Ng5awnh9GeR7R4y4QeCKGl5X32pNPn6Z2LbYTopoVT1Wr J2jYUJpOKpO70jbhPb7IjhPjQvrEqF5yzrS7OWhzp+1ieHiLY3h5y6Ek5jRX2IIT/+qQ/HrcY ENm5xf66TGbpDPmz4QwRUCGgOTCb5XgfFxq8fKxiA46Vc3LPm4M2c/Qao5+tHQYZSXYnxwkij q9mCpD2qtaxmD/R5Y/m74+Xot4iUndqxdwMaTMtLXNgeBHC9CI/zLqJPQtI6mojCMSKQetGmQ cZGom8QaHkMgUVfuIS0EXykKws0Pl5zRN1aVGdvyn+RspkKCENYWNZ41W6K8cuqgHO7axW2UA SrgKt44Co1u4fvXXhrRfiC36ouCgB5RYZQO2f4msUnPATUvwnw/Oqw2eV9+qSDv5ZDWiaqbBZ TJvucuHDqeeZS4EOeLXg2hdPkDwPX0rjsVDlJGMSNUTV6g18qnvkM6+nYomrdTTXtSYwmwYU9 IwF7RUpdw7jIlXst125AP3i0C1mZG9foDzZXivx248Ex24ab38tHrk/qFiGVQvzX8hzM= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.75 Subject: [Qemu-devel] [PATCH v2 2/6] linux-user: fix flock/flock64 padding X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Max Filippov , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" include/uapi/asm-generic/fcntl.h insert a padding macro at the end of the structures flock and flock64. This macro is defined to "short __unused;" on sparc, and "long pad[4]" on mips. Signed-off-by: Laurent Vivier Reviewed-by: Max Filippov --- linux-user/syscall_defs.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index ec3f561685..e4cd87cc00 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -2643,6 +2643,17 @@ struct target_statfs64 { #define TARGET_O_SYNC (TARGET___O_SYNC | TARGET_O_DSYNC) #endif +#if defined(TARGET_SPARC) +#define TARGET_ARCH_FLOCK_PAD abi_short __unused; +#define TARGET_ARCH_FLOCK64_PAD abi_short __unused; +#elif defined(TARGET_MIPS) +#define TARGET_ARCH_FLOCK_PAD abi_long pad[4]; +#define TARGET_ARCH_FLOCK64_PAD +#else +#define TARGET_ARCH_FLOCK_PAD +#define TARGET_ARCH_FLOCK64_PAD +#endif + struct target_flock { short l_type; short l_whence; @@ -2652,9 +2663,7 @@ struct target_flock { abi_long l_sysid; #endif int l_pid; -#if defined(TARGET_MIPS) - abi_long pad[4]; -#endif + TARGET_ARCH_FLOCK_PAD }; struct target_flock64 { @@ -2663,6 +2672,7 @@ struct target_flock64 { abi_llong l_start; abi_llong l_len; abi_int l_pid; + TARGET_ARCH_FLOCK64_PAD }; struct target_f_owner_ex {