From patchwork Mon Aug 29 21:07:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandar Markovic X-Patchwork-Id: 9304455 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 322B66077C for ; Mon, 29 Aug 2016 21:08:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 220DC288B2 for ; Mon, 29 Aug 2016 21:08:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 163CF28975; Mon, 29 Aug 2016 21:08:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 02A59288B2 for ; Mon, 29 Aug 2016 21:08:30 +0000 (UTC) Received: from localhost ([::1]:45766 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1beTnB-0006l6-1S for patchwork-qemu-devel@patchwork.kernel.org; Mon, 29 Aug 2016 17:08:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37448) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1beTmk-0006kf-2s for qemu-devel@nongnu.org; Mon, 29 Aug 2016 17:08:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1beTmd-0003Z3-HE for qemu-devel@nongnu.org; Mon, 29 Aug 2016 17:08:00 -0400 Received: from mx2.rt-rk.com ([89.216.37.149]:43298 helo=mail.rt-rk.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1beTmd-0003Yj-AA for qemu-devel@nongnu.org; Mon, 29 Aug 2016 17:07:55 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.rt-rk.com (Postfix) with ESMTP id 09A0E1A4150; Mon, 29 Aug 2016 23:07:52 +0200 (CEST) X-Virus-Scanned: amavisd-new at rt-rk.com Received: from mcs19.ba.imgtec.org (unknown [82.117.201.26]) by mail.rt-rk.com (Postfix) with ESMTPSA id DBD4E1A44F7; Mon, 29 Aug 2016 23:07:51 +0200 (CEST) From: Aleksandar Markovic To: riku.voipio@iki.fi Date: Mon, 29 Aug 2016 23:07:33 +0200 Message-Id: <1472504853-42497-4-git-send-email-aleksandar.markovic@rt-rk.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1472504853-42497-1-git-send-email-aleksandar.markovic@rt-rk.com> References: <1472504853-42497-1-git-send-email-aleksandar.markovic@rt-rk.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 89.216.37.149 Subject: [Qemu-devel] [PATCH 3/3] linux-user: Fix structure target_semid64_ds definition for Mips 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: qemu-devel@nongnu.org, petar.jovanovic@imgtec.com, aleksandar.markovic@imgtec.com, aleksandar.rikalo@imgtec.com, miodrag.dinic@imgtec.com, leon.alrae@imgtec.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Aleksandar Markovic This patch corrects target_semid64_ds structure definition for Mips. See, for example definition of semid64_ds for Mips in Linux kernel: arch/mips/include/uapi/asm/sembuf.h#L13. This patch will also fix certain semaphore-related LTP tests for Mips, if they are executed in Qemu user mode for any Mips platform. Signed-off-by: Miodrag Dinic Reviewed-by: Peter Maydell Reviewed-by: Peter Maydell --- linux-user/mips/target_structs.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/linux-user/mips/target_structs.h b/linux-user/mips/target_structs.h index fbd9955..6875506 100644 --- a/linux-user/mips/target_structs.h +++ b/linux-user/mips/target_structs.h @@ -45,4 +45,23 @@ struct target_shmid_ds { abi_ulong __unused2; }; +#define TARGET_SEMID64_DS +/* + * http://lxr.free-electrons.com/source/arch/mips/include/uapi/asm/sembuf.h#L13 + * + * The semid64_ds structure for the MIPS architecture. + * Note extra padding because this structure is passed back and forth + * between kernel and user space. + * + * MIPS uses the same structure layout for both 32bit and 64bit variants. + */ +struct target_semid64_ds { + struct target_ipc_perm sem_perm; + abi_ulong sem_otime; + abi_ulong sem_ctime; + abi_ulong sem_nsems; + abi_ulong __unused3; + abi_ulong __unused4; +}; + #endif