From patchwork Mon May 14 18:19: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: 913186 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 40l8JJ3vV1z9s1B for ; Tue, 15 May 2018 04:25:20 +1000 (AEST) Received: from localhost ([::1]:47612 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fII9t-0000kB-FB for incoming@patchwork.ozlabs.org; Mon, 14 May 2018 14:25:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fII51-0005at-6W for qemu-devel@nongnu.org; Mon, 14 May 2018 14:20:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fII4x-0005i8-8m for qemu-devel@nongnu.org; Mon, 14 May 2018 14:20:15 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:34785) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fII4w-0005h1-UZ for qemu-devel@nongnu.org; Mon, 14 May 2018 14:20:11 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue006 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LhYH7-1eVUuK2Epl-00mv0E; Mon, 14 May 2018 20:19:33 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 14 May 2018 20:19:23 +0200 Message-Id: <20180514181928.18034-3-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180514181928.18034-1-laurent@vivier.eu> References: <20180514181928.18034-1-laurent@vivier.eu> X-Provags-ID: V03:K1:hhYi/Vusdti2Lpq9H7+UHtsH1W3jplLGEcrIEB8DjpEQGckPCnJ 1IJ2D6ihtMYx9CHG2Gxw63n4qVaS5PdlKyqw7UcNhiwy7I5bTrgQgQFDVttFMS4FUFx/sf0 A8PslEN638MRU86QiDPY9X85+jbAGsY8saKvRe3BswEv4cQETlgvFBSiLH2QIxlaaQl04v4 A6IX2nhDKTU9nVN7jvbrw== X-UI-Out-Filterresults: notjunk:1; V01:K0:yr0n+gEyOG4=:bckHsnwNrsbFdSc1bkOhLF IRdo9jCoQOmmnSUi+aH9DCoCJCkCZBg5oHM7DjoQX2SDghaw1tORK84vG0S1iV0yooB2liOI3 mPbxbnr+jDXaqUxzrKM/19EphCfuOu+xvmSuF3MTsKI1W0vyV0hGmNpcDLc7/5Xxp5Q8bb4f6 8bTavjDubDQNz26hLRVlVe77Tir3WvOfKQzjrBaNjsHy65gtaf4pf35JMFoFwdXILt1usB+oQ s6DT+lkXzp9ZRUIgQXz0U9jl+GYFlOvAbipIybc0VsTa/ieS6HhxmoWI1N5gpB08EpdZlHIv+ IQZho3NQj4cgWmtbnGHxWtmVMMnW0tGKTTJdAo2oKE1ifKKuOvh1uooOPTKFy0X0GrSDs56XD Bv305YTDhaneMAIfIK3mNtbBby4DVAYDufuuTEWZjx2oDhxzisiHHfZfCZCyXK0oNh5UsioJM jMNDxpGlEZpocxzFMvDxDcNJcAd1sOBOKQTlBSDH95JZrh6/7tfvNze6Ccf3EdInkrj9IuwRf 2XBBJ6mrULRhm+EkfbtkpIT8HB3O0KsUoAchBjIa0uSw0LYSvTN+2hQckruu2A4lqAC3L/yZE xb4xaJiTbMptwJ98AxEbK9MGfHYNmnW3dbZCnd5ej/TLY95DpHWUoncpxFxUPOGm+v4kmflvE INkPP1uTG8s5ZSuVsn1mv0jrWLkjR8S2Tg8nejUqfVz12UAKWZiauWvX0lS2A5ScU7cY= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.126.131 Subject: [Qemu-devel] [PULL 2/7] 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 Message-Id: <20180509231123.20864-3-laurent@vivier.eu> --- 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 {