qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio

linux-user: move ppc socket.h definitions to ppc/sockbits.h

Change conditional #ifdef part by #undef of the symbols
redefined for PPC relative to generic/socket.h

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20180519092956.15134-6-laurent@vivier.eu>

+25 -9
-9
linux-user/generic/sockbits.h
··· 30 30 #define TARGET_SO_LINGER 13 31 31 #define TARGET_SO_BSDCOMPAT 14 32 32 /* To add :#define TARGET_SO_REUSEPORT 15 */ 33 - #if defined(TARGET_PPC) 34 - #define TARGET_SO_RCVLOWAT 16 35 - #define TARGET_SO_SNDLOWAT 17 36 - #define TARGET_SO_RCVTIMEO 18 37 - #define TARGET_SO_SNDTIMEO 19 38 - #define TARGET_SO_PASSCRED 20 39 - #define TARGET_SO_PEERCRED 21 40 - #else 41 33 #define TARGET_SO_PASSCRED 16 42 34 #define TARGET_SO_PEERCRED 17 43 35 #define TARGET_SO_RCVLOWAT 18 44 36 #define TARGET_SO_SNDLOWAT 19 45 37 #define TARGET_SO_RCVTIMEO 20 46 38 #define TARGET_SO_SNDTIMEO 21 47 - #endif 48 39 49 40 /* Security levels - as per NRL IPv6 - don't actually do anything */ 50 41 #define TARGET_SO_SECURITY_AUTHENTICATION 22
+25
linux-user/ppc/sockbits.h
··· 1 + /* 2 + * This program is free software; you can redistribute it and/or modify 3 + * it under the terms of the GNU General Public License version 2 as 4 + * published by the Free Software Foundation, or (at your option) any 5 + * later version. See the COPYING file in the top-level directory. 6 + */ 7 + 8 + #ifndef PPC_SOCKBITS_H 9 + #define PPC_SOCKBITS_H 10 + 1 11 #include "../generic/sockbits.h" 12 + 13 + #undef TARGET_SO_RCVLOWAT 14 + #define TARGET_SO_RCVLOWAT 16 15 + #undef TARGET_SO_SNDLOWAT 16 + #define TARGET_SO_SNDLOWAT 17 17 + #undef TARGET_SO_RCVTIMEO 18 + #define TARGET_SO_RCVTIMEO 18 19 + #undef TARGET_SO_SNDTIMEO 20 + #define TARGET_SO_SNDTIMEO 19 21 + #undef TARGET_SO_PASSCRED 22 + #define TARGET_SO_PASSCRED 20 23 + #undef TARGET_SO_PEERCRED 24 + #define TARGET_SO_PEERCRED 21 25 + 26 + #endif