From patchwork Wed May 16 20:55:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 914939 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 40mRgK211lz9s1B for ; Thu, 17 May 2018 07:01:17 +1000 (AEST) Received: from localhost ([::1]:40190 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ3Xv-0003cA-23 for incoming@patchwork.ozlabs.org; Wed, 16 May 2018 17:01:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJ3TP-0000AY-MT for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJ3TM-00040O-Lm for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:35 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:32933) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJ3TM-0003zF-Ci for qemu-devel@nongnu.org; Wed, 16 May 2018 16:56:32 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0Mf0OX-1evAvj0QnJ-00OTnv; Wed, 16 May 2018 22:56:02 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 16 May 2018 22:55:40 +0200 Message-Id: <20180516205543.29305-6-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180516205543.29305-1-laurent@vivier.eu> References: <20180516205543.29305-1-laurent@vivier.eu> X-Provags-ID: V03:K1:n6yY7AfqvOSaIEITaeHHXlR9lzCT07Ml7z6mjrT/FYUvgrL8ja+ wc89oDsy0xf+G3pEW2UQHf5YUQXeVhAtlsflK9jZi9m0TS84DfAjEJ6Nj0x4T89hloIR12k ycpaelcIGNvUluTPfJAOqQDrd9mRQrCl6jg6qXR/yLc1XpNMizZ9/lNPjEva0qtP3KCmW/C lTwuFChw59r3YmBIWg+tQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:ynb3wwWu7g0=:vT994GNyjI1zY8xbH0WZXv oJEHOjWfzLscqRIQ+w3KBo/ZXkSBxaPvQMVXJO8ANKUclhLkEE6sfq44G/x63iipN2glR3Yy6 6PWGUX64Nf8hTEbWC+1cey8/62aETp4XItpMpf2PnriLtrihbPjUQ/Lea1h3s8KqsaZ6l6XCN EpekoGJG/IFE2CdClCk+7tqSWmF+oD9NeQEpkt/nIaSX2GUyjpJcstRgQPrOkVXjH1pKWR2jf MJDh1kvUJYUO+xz9MfGFl5p1/OXCzG7ne45DapQ1Tn8EpLaQJbFggSzfQC/FVen2Xy5p4lz/4 myIKqgyvjoYBEx6k6PYFncEP/EKkfszwb7aniIoSMHN2oiS1N7oGnK7Py5UKgv/sg/Lox4c8G VXxjwAf++DpaSsbHI/KMsStBmT1sdQzShNljdJCS4ZFJb6QyrVDnjuw7jMs26IAcV9FPWdGy1 2uWwRQEmcryLWGnLjJDSSKKLTUAcNi26lcTuDI+V+oQfTWlBZefisO2l/y4E34vV98vf7TGjC 4KxerugQ5rYoZ3GTq2lK3gJ2oiITIEhZ67rhqmv49MkEV29E2gjblKTTloFd3lc00MOtlraOF 4I6u9s1Wlsf1Tk1D1DpClypy5V1+Bys61UcaY5qvbnUMSrM1EqQvx4XmfMhmpsh//Tyb5i68V SKl4nMx/kjqlo5688aW0uicrKYxL4lagaaXiAcctT310dzMyarApJyYeCKd/UNz+DqSc= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PATCH v2 5/8] linux-user: move ppc socket.h definitions to ppc/sockbits.h 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: Peter Maydell , Riku Voipio , Mark Cave-Ayland , Laurent Vivier , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Yongbok Kim , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" No code change. Signed-off-by: Laurent Vivier --- linux-user/generic/sockbits.h | 9 +-------- linux-user/ppc/sockbits.h | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/linux-user/generic/sockbits.h b/linux-user/generic/sockbits.h index 093faf0a48..5ad43eb0c8 100644 --- a/linux-user/generic/sockbits.h +++ b/linux-user/generic/sockbits.h @@ -30,14 +30,7 @@ #define TARGET_SO_LINGER 13 #define TARGET_SO_BSDCOMPAT 14 /* To add :#define TARGET_SO_REUSEPORT 15 */ -#if defined(TARGET_PPC) -#define TARGET_SO_RCVLOWAT 16 -#define TARGET_SO_SNDLOWAT 17 -#define TARGET_SO_RCVTIMEO 18 -#define TARGET_SO_SNDTIMEO 19 -#define TARGET_SO_PASSCRED 20 -#define TARGET_SO_PEERCRED 21 -#else +#ifndef TARGET_SO_PASSCRED /* powerpc only differs in these */ #define TARGET_SO_PASSCRED 16 #define TARGET_SO_PEERCRED 17 #define TARGET_SO_RCVLOWAT 18 diff --git a/linux-user/ppc/sockbits.h b/linux-user/ppc/sockbits.h index 0e4c8f012d..3593bc44ac 100644 --- a/linux-user/ppc/sockbits.h +++ b/linux-user/ppc/sockbits.h @@ -1 +1,20 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation, or (at your option) any + * later version. See the COPYING file in the top-level directory. + */ + +#ifndef PPC_SOCKBITS_H +#define PPC_SOCKBITS_H + +#define TARGET_SO_RCVLOWAT 16 +#define TARGET_SO_SNDLOWAT 17 +#define TARGET_SO_RCVTIMEO 18 +#define TARGET_SO_SNDTIMEO 19 +#define TARGET_SO_PASSCRED 20 +#define TARGET_SO_PEERCRED 21 + #include "../generic/sockbits.h" + +#endif