[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/13] linux-user: move ppc socket.h definitions to p
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PULL 09/13] linux-user: move ppc socket.h definitions to ppc/sockbits.h |
Date: |
Fri, 25 May 2018 10:17:50 +0200 |
Change conditional #ifdef part by #undef of the symbols
redefined for PPC relative to generic/socket.h
Signed-off-by: Laurent Vivier <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Message-Id: <address@hidden>
---
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
--
2.14.3
- [Qemu-devel] [PULL 00/13] Linux user for 2.13 patches, Laurent Vivier, 2018/05/25
- [Qemu-devel] [PULL 09/13] linux-user: move ppc socket.h definitions to ppc/sockbits.h,
Laurent Vivier <=
- [Qemu-devel] [PULL 04/13] linux-user: Fix payload size logic in host_to_target_cmsg(), Laurent Vivier, 2018/05/25
- [Qemu-devel] [PULL 13/13] gdbstub: Clarify what gdb_handlesig() is doing, Laurent Vivier, 2018/05/25
- [Qemu-devel] [PULL 01/13] linux-user: Assert on bad type in thunk_type_align() and thunk_type_size(), Laurent Vivier, 2018/05/25
- [Qemu-devel] [PULL 05/13] linux-user: move mips socket.h definitions to mips/sockbits.h, Laurent Vivier, 2018/05/25
- [Qemu-devel] [PULL 12/13] linux-user: define TARGET_SO_REUSEPORT, Laurent Vivier, 2018/05/25
- [Qemu-devel] [PULL 03/13] linux-user: update comments to point to tcg_exec_init(), Laurent Vivier, 2018/05/25
- [Qemu-devel] [PULL 06/13] linux-user: move alpha socket.h definitions to alpha/sockbits.h, Laurent Vivier, 2018/05/25
- [Qemu-devel] [PULL 08/13] linux-user: move socket.h generic definitions to generic/sockbits.h, Laurent Vivier, 2018/05/25
- [Qemu-devel] [PULL 02/13] linux-user: update netlink emulation, Laurent Vivier, 2018/05/25
- [Qemu-devel] [PULL 11/13] linux-user: copy sparc/sockbits.h definitions from linux, Laurent Vivier, 2018/05/25