From patchwork Sun Apr 1 19:24:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 10319225 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 DB12060247 for ; Sun, 1 Apr 2018 19:25:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B876228E81 for ; Sun, 1 Apr 2018 19:25:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A91F528E89; Sun, 1 Apr 2018 19:25:26 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, FROM_LOCAL_NOVOWEL, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 6E98F28E81 for ; Sun, 1 Apr 2018 19:25:25 +0000 (UTC) Received: from localhost ([::1]:57205 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f2ibU-0000RI-1U for patchwork-qemu-devel@patchwork.kernel.org; Sun, 01 Apr 2018 15:25:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57379) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f2iam-0008Kx-A2 for qemu-devel@nongnu.org; Sun, 01 Apr 2018 15:24:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f2ial-0005gA-9z for qemu-devel@nongnu.org; Sun, 01 Apr 2018 15:24:40 -0400 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]:37077) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f2ial-0005fp-1h for qemu-devel@nongnu.org; Sun, 01 Apr 2018 15:24:39 -0400 Received: by mail-lf0-x244.google.com with SMTP id m200-v6so12417610lfm.4 for ; Sun, 01 Apr 2018 12:24:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=/MdA1jyp6CQEka9H5V/ACaZ/lbgCzrot1kNIW/hJZ+A=; b=YLXTjzKn13B8c4thK7TYD0fJG8KB3M4+c+PPVJG1SJDFltVnnr04BWsKoq/v0kKrgh bmIANxyHnB4H090bPCoatM/of5KBHLOJpwLvbclBanHN3feVMbGTVhUzOCBOWMzAyObi ckmvDRK0Oyg3yd2W0U2ICkLq1RCjcHq6sxfASBwoms6+Po3rt+oqFbNqk4SpQjtMJMvB OtJmz9vWYrkvlHdEyrhPP4Lgl6KI3M5eq5fQCuoZ+Nj/FL4NANOHMt6FC5rYKz5LZ1Id qbQXnf08uMzCk0SKFFvRTamsFDenZGkrq+nmTqzSkcWTL4bVaczSV0XhIi/vlPHvX56W fcgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/MdA1jyp6CQEka9H5V/ACaZ/lbgCzrot1kNIW/hJZ+A=; b=oze6mw6ZZ13zf131BueKJQPBNPQNDlfdX5koQ2QlcV5lBuIuC5ThzSE5LaBdkRtaUv Hrvrmy1TBzDCm1BH1UYq/cPkV9lXOR9OEPetiGvHw2UvmuBGUYolT4Um5RdQ7vlY8AM+ eredM3QZlhEi964Av/d0URVk937bEDKM6T9IX2dPX+FoRMjnYbRpak9oVN2K3T2oOROc oLKqRIABj4cDnHWKPHYA/8f6gDHZ9lxou86GVzkCRCSTKdCkAx2LXFYLwm0DTEQfnwM4 cGE9Dx+OAZkLaaykhehpXeDil3u5jp2Xw22Irhvi+WsYscvxxlCMG/yualyNj9gACc43 GmPw== X-Gm-Message-State: ALQs6tAF5zeWWuA93ZJlqKOXE7G8A7kDDgzm44QQaYKQc8Z7h4LzX3bj QR4mIBW/Olfoeg5XVenTiCS5WA== X-Google-Smtp-Source: AIpwx4+wmAd/fDfTrViraFoM4TtJ9YpeEslS4osS0JNZqUElxEf+75kyvMZMO9jOB9bVG6IHij8b1g== X-Received: by 10.46.29.1 with SMTP id d1mr4165428ljd.22.1522610677307; Sun, 01 Apr 2018 12:24:37 -0700 (PDT) Received: from octofox.hsd1.ca.comcast.net. (jcmvbkbc-1-pt.tunnel.tserv24.sto1.ipv6.he.net. [2001:470:27:1fa::2]) by smtp.gmail.com with ESMTPSA id j64sm2304756ljb.61.2018.04.01.12.24.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 01 Apr 2018 12:24:36 -0700 (PDT) From: Max Filippov To: qemu-devel@nongnu.org Date: Sun, 1 Apr 2018 12:24:21 -0700 Message-Id: <20180401192421.29712-1-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.11.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::244 Subject: [Qemu-devel] [PATCH] target/xtensa: linux-user: fix sysv IPC structures 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP - make target_ipc_perm fields match kernel definitions for xtensa; - add target_semid64_ds with proper order of times and reserved fields for little/big endian specific for xtensa; - fix order of times and reserved fields of target_shmid_ds for little/big endian; - fix types of shm_cpid, shm_lpid and shm_nattch fields of target_shmid_ds to match kernel definitions for xtensa. These changes fix guest ipcs output and fix glibc testsuite tests sysvipc/test-sysvsem and sysvipc/test-sysvshm. Signed-off-by: Max Filippov --- linux-user/xtensa/target_structs.h | 44 ++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/linux-user/xtensa/target_structs.h b/linux-user/xtensa/target_structs.h index 020e20e242fc..a3c854b53731 100644 --- a/linux-user/xtensa/target_structs.h +++ b/linux-user/xtensa/target_structs.h @@ -8,21 +8,53 @@ struct target_ipc_perm { abi_uint cuid; /* Creator's user ID. */ abi_uint cgid; /* Creator's group ID. */ abi_uint mode; /* Read/write permission. */ - abi_ushort __seq; /* Sequence number. */ + abi_ulong __seq; /* Sequence number. */ + abi_ulong __unused1; + abi_ulong __unused2; }; +struct target_semid64_ds { + struct target_ipc_perm sem_perm; +#ifdef TARGET_WORDS_BIGENDIAN + abi_ulong __unused1; + abi_ulong sem_otime; + abi_ulong __unused2; + abi_ulong sem_ctime; +#else + abi_ulong sem_otime; + abi_ulong __unused1; + abi_ulong sem_ctime; + abi_ulong __unused2; +#endif + abi_ulong sem_nsems; + abi_ulong __unused3; + abi_ulong __unused4; +}; +#define TARGET_SEMID64_DS + struct target_shmid_ds { struct target_ipc_perm shm_perm; /* operation permission struct */ - abi_int shm_segsz; /* size of segment in bytes */ + abi_long shm_segsz; /* size of segment in bytes */ +#ifdef TARGET_WORDS_BIGENDIAN + abi_ulong __unused1; abi_long shm_atime; /* time of last shmat() */ + abi_ulong __unused2; abi_long shm_dtime; /* time of last shmdt() */ + abi_ulong __unused3; abi_long shm_ctime; /* time of last change by shmctl() */ - abi_ushort shm_cpid; /* pid of creator */ - abi_ushort shm_lpid; /* pid of last shmop */ - abi_ushort shm_nattch; /* number of current attaches */ - abi_ushort shm_unused; /* compatibility */ +#else + abi_long shm_atime; /* time of last shmat() */ + abi_ulong __unused1; + abi_long shm_dtime; /* time of last shmdt() */ abi_ulong __unused2; + abi_long shm_ctime; /* time of last change by shmctl() */ abi_ulong __unused3; +#endif + abi_uint shm_cpid; /* pid of creator */ + abi_uint shm_lpid; /* pid of last shmop */ + abi_ulong shm_nattch; /* number of current attaches */ + abi_ulong __unused4; + abi_ulong __unused5; }; #endif