From patchwork Fri May 25 08:17:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 920291 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 40sfL23cGCz9s1b for ; Fri, 25 May 2018 18:19:21 +1000 (AEST) Received: from localhost ([::1]:42377 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fM7wS-0001n1-9n for incoming@patchwork.ozlabs.org; Fri, 25 May 2018 04:19:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fM7vd-0001kO-CA for qemu-devel@nongnu.org; Fri, 25 May 2018 04:18:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fM7vZ-0008Gc-IE for qemu-devel@nongnu.org; Fri, 25 May 2018 04:18:25 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:52041) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fM7vZ-0008Fa-9S for qemu-devel@nongnu.org; Fri, 25 May 2018 04:18:21 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.183]) with ESMTPSA (Nemesis) id 0Lc8iD-1g2dt20hvh-00jWdk; Fri, 25 May 2018 10:18:13 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Fri, 25 May 2018 10:17:50 +0200 Message-Id: <20180525081754.29506-10-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180525081754.29506-1-laurent@vivier.eu> References: <20180525081754.29506-1-laurent@vivier.eu> X-Provags-ID: V03:K1:NO5rS5lCxjppOeXCkMIvNa2GFmEUtCuE+g+ydCKrATAWIwkJ0I2 hdE06PjpBI9x2N+MzzAy4d+YFI70H0LQ7eaQkW9u7MEnroZ5l2yIHjhFEbiAAZE/LtQHpwi R2Y5Q6Tz+jc6xPkr3TxlNZfUAgszvkqgQHXDk1OAdctrvo5hxrmWD1wMtiDE9+SEJx4VW6I +4i2QMUyxmSbknDLHHu1A== X-UI-Out-Filterresults: notjunk:1; V01:K0:ZUtZSqeur+k=:AQi6tDwf7W/1aFlwoec1Mm x6gMGaN7Z0rnAad1xcuQODQq6d9VhDiCJAUM6kBYpRzdhIXpBA0mMOljWhcVdD7Ju+XWkRPjk XtE88p1lwB3dVtxCv/AizMUmtrshJPJy7M5Whato59aih43nfKPBcft7A1wBoT/GipAON/Djm MpkQCwCsqLWgn1NQqXwMClvPrZR7eWh05yqU13LsYgZmp11aj2PMbJfEKI9MwjDIhS9g/pUyh +J7rXqUAEhVDHvwiUM+GNsKJLmqCvycJwI71uGyx6Xe7/fGceUJn/9SzJzMOJdKJaLTWUIfd+ K4AEulew0t/BU6UgTMNxSBd3ibz6ilsJcezy+9P9NY9SbnuCvqy0m3wuDWvQi1dGpj9d77HDj ETPEke2N3EB3vOCBExE7OdwW8rrvmI+xgawaOtL+BVjNSe9KMjbTrjzRrrgkMxIRdQg66BpJU ZpY1H+C4amNq7eK0Wgzt44SYBgliMMX7d//KZdYcn40rtRmxD7L23VhvI2oNSCeTqKBNSV30J PJGj57OgOSPkvlIm25Ukjmnm3vp7qNrjhHTPFVB1cEki/NGpml6MR17uXRGnjqyvtKjaETjKX KEXmZL59WP3hS7iPB3N3AaFqiETRVdeqaVpIeTTxFWUSLeQixb1KEdxx8S25mJozQu9rIM/0F K8kr1IOeAvYJ6nmmkrvKei1EfokwRQJRHoX0pANtsjERTJ0g3HRFx4tX4EPXIReBOpNs= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.75 Subject: [Qemu-devel] [PULL 09/13] 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: Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Change conditional #ifdef part by #undef of the symbols redefined for PPC relative to generic/socket.h Signed-off-by: Laurent Vivier Reviewed-by: Peter Maydell Message-Id: <20180519092956.15134-6-laurent@vivier.eu> --- linux-user/generic/sockbits.h | 9 --------- linux-user/ppc/sockbits.h | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/linux-user/generic/sockbits.h b/linux-user/generic/sockbits.h index 093faf0a48..99505f1f85 100644 --- a/linux-user/generic/sockbits.h +++ b/linux-user/generic/sockbits.h @@ -30,21 +30,12 @@ #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 #define TARGET_SO_PASSCRED 16 #define TARGET_SO_PEERCRED 17 #define TARGET_SO_RCVLOWAT 18 #define TARGET_SO_SNDLOWAT 19 #define TARGET_SO_RCVTIMEO 20 #define TARGET_SO_SNDTIMEO 21 -#endif /* Security levels - as per NRL IPv6 - don't actually do anything */ #define TARGET_SO_SECURITY_AUTHENTICATION 22 diff --git a/linux-user/ppc/sockbits.h b/linux-user/ppc/sockbits.h index 0e4c8f012d..ee453347a3 100644 --- a/linux-user/ppc/sockbits.h +++ b/linux-user/ppc/sockbits.h @@ -1 +1,26 @@ +/* + * 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 + #include "../generic/sockbits.h" + +#undef TARGET_SO_RCVLOWAT +#define TARGET_SO_RCVLOWAT 16 +#undef TARGET_SO_SNDLOWAT +#define TARGET_SO_SNDLOWAT 17 +#undef TARGET_SO_RCVTIMEO +#define TARGET_SO_RCVTIMEO 18 +#undef TARGET_SO_SNDTIMEO +#define TARGET_SO_SNDTIMEO 19 +#undef TARGET_SO_PASSCRED +#define TARGET_SO_PASSCRED 20 +#undef TARGET_SO_PEERCRED +#define TARGET_SO_PEERCRED 21 + +#endif