From patchwork Sat May 19 09:29:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 916808 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 40p0Nk2SDYz9s4w for ; Sat, 19 May 2018 19:39:02 +1000 (AEST) Received: from localhost ([::1]:42374 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJyKK-0005s3-3C for incoming@patchwork.ozlabs.org; Sat, 19 May 2018 05:39:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJyCc-0008V6-Ap for qemu-devel@nongnu.org; Sat, 19 May 2018 05:31:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJyCY-0003L7-E7 for qemu-devel@nongnu.org; Sat, 19 May 2018 05:31:02 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:37683) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fJyCY-0003Jd-4B for qemu-devel@nongnu.org; Sat, 19 May 2018 05:30:58 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.183]) with ESMTPSA (Nemesis) id 0M9XvL-1f6zt23jhf-00CznP; Sat, 19 May 2018 11:30:16 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Sat, 19 May 2018 11:29:53 +0200 Message-Id: <20180519092956.15134-6-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180519092956.15134-1-laurent@vivier.eu> References: <20180519092956.15134-1-laurent@vivier.eu> X-Provags-ID: V03:K1:o423Ts2BaVnkRfuLuacIEFewko8Ig7rzW88M/HnnriW8OCWw7Yb mCirwp12cE5WKJh7kMgN+7bpne9zs+81i73aGzRKLF8j2xNyScwN14vVZo7TkCznruAEsYk A+13zpxhry/BcKiT65O4Ew57xYTG8lsstBRnaRIMLsedQbhyMF4TpP2kmzgI6BEjJg1Bh+T Cmx47qUzT5fYGApwISSCQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:24lzgbtWyDo=:ARS//R9ZjAe9tMIh58H8XD xdlAi+/mCmZfKLDjZ4qGIZxZWIP6/nIh5MFyL/zRDVCAgYXBeViIg91BB5rC8qZOYfDGUTCU8 Bpt30pBirYkJD+Gdz2fgR913PdoNGI8Uh/g2X23+KH6TxAMOvtjoAUBBsPORKbMpTRKBvAnLn rYBTTvBaZ1urXjzyl5QBhDzFBOWHfsM+RinPv7DfKXvLWM3Rb+z3QYMbES/yzXdfrldnSSl8M HbwIBr0ndW+22/Se9xY/1Cn9/IymERg+8rVsvgnSdZG/fbWPVantpJgP0s7hgWrZwIoAm8Ibd fN/J4ww4d4dmPniGaXI7fup82HDbwY/chxnGy40KVETwiuX6X2HYTQv1h0IdV1+cwNACp7TBP JCSXTqJfFS/qeNaFW7l/joJs+I0E9RHkQCbLMR/1zExM8UbCffz9TcLK2Q1JTJj9MuB7MRkJ/ kfIPlopuW9FB4sEVh9EbCU4SB+uzO2thcp1cbnuFLdWlQF70JYsLQUtsUEEglsLxpAWPZQ9pu L0zhDWplgPMOdXazyInFOP5hRsvgJLCAkZX3vgcgodCiGAb+Zc6oL6raNO/RLrKMqD8SVJo79 QWMQaoB6IiLESTKORxEfyQcsL5s2b1LlEKTXWlhLay9E5fZJAW66nnf20l2JNX2MAbzZBOCel StvHppRzmDoLoWeiqeVraOoQwnO7FKC0EuNDzPhUAbqkScHC3ZG1zrdynJ6tuUwblZLE= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PATCH v3 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" 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 --- 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