From patchwork Tue May 8 19:40:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 910432 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 40gVH45FbTz9s3G for ; Wed, 9 May 2018 05:41:36 +1000 (AEST) Received: from localhost ([::1]:53054 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG8UQ-0006z1-8Y for incoming@patchwork.ozlabs.org; Tue, 08 May 2018 15:41:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43165) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fG8Te-0006vK-1g for qemu-devel@nongnu.org; Tue, 08 May 2018 15:40:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fG8Ta-0002Ud-S5 for qemu-devel@nongnu.org; Tue, 08 May 2018 15:40:46 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:40795) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fG8Ta-0002Sg-J7 for qemu-devel@nongnu.org; Tue, 08 May 2018 15:40:42 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue001 [212.227.15.167]) with ESMTPSA (Nemesis) id 0M2kwo-1eQmVb10WE-00siad; Tue, 08 May 2018 21:40:33 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 8 May 2018 21:40:23 +0200 Message-Id: <20180508194026.1281-3-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180508194026.1281-1-laurent@vivier.eu> References: <20180508194026.1281-1-laurent@vivier.eu> X-Provags-ID: V03:K1:zwFcZ1GtUaMtCwLS/h5c4fVo4P9uyX7DmHftL6AU1IqPSfRmDNZ mtgBrrQ0Sx5vFeSybqqqp6Vt5lNECpnM6bXof0RPnLIF+N4VJRJ7EMRcxxsPmlFQGgIa1jV mtL+uqPijsxps1FZqptdLWZODsBA7Lh+8TtmR8ObOnVBOtsEVxQukXX0ulPu3WO4/H7Xv5N RCyO8Mk/TW92spn2Zl5hQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:uS8eLRno760=:eJsBVMzaXDCT9+m44DoYho L04nQnDYQlXDaqsfbdnvSlb7ih49EuQv8ACpQgVnRFDyjXQsxGLFmvEwDVkgYrM7tKL4g/oTY 0yCmcc9gCJrvPDYTHqBaFpnBeBxiJRwKTcYK6uUuen+njKpnkwastGRaB+Xe03BZfPzsk5N8E RyX+FNOXOsnJCb4H9Sb0SdDjI3lH88fxa20liLkisx9ivABRTrvln2KBlafJuNzPO6T4sHL8R AFrev2dqMRzs388VdX8gH8e0cFWtq4g4r2hYFZWuG/VVJXltgE78+0/A0ExHfj+ExZJw2MM0v bmf8SUNCA4SOWNBQ2zPzQZtkVRd7jJj0gqK9at0KinseJewEd2OCvLrvXBHUwRlGqo42PJOqk zdHYJy+FlMOunMq6OuySGkvJxAXC8WqQbSBvirXh5DbKEZ9k8awl1/YU3T8RPurwekXrfiJEO QitFoCthbmzr2zEPR/F0JHpehePGEYVBnhcchIsrE4Yi4HBbn4shIaDDKJkPxYR2aAqOgTX1+ OwSILNHKh5EBHN5E/6b3M5aWOU9dH0l1Q+DHTznxvfIIiXca+agDs1NGtGTNW9TDrt9ku4IKX o6bwLNPhiwnoad+gQPvNv0r3/rIGWGhmxqfGGPd6bGrJ05Bm/K35M4pE2b1rO7uygLS+oA3hK EzN7lfKqtVRS2rj2LwH7jrLbzl02uruBk5gDSVefUEmccG5SJ8eXFVmDoSQrFK1L4IwY= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PATCH 2/5] 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: 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 {