svn commit: r279202 - in user/dchagin/lemul/sys: amd64/linux amd64/linux32 compat/linux i386/linux

[Dmitry Chagin]

Author: dchagin
Date: Mon Feb 23 09:37:10 2015
New Revision: 279202
URL: https://svnweb.freebsd.org/changeset/base/279202

Log:
  Reduce duplication between MD Linux code by moving msg related
  struct definitions out into the compat/linux/linux_socket.h

Modified:
  user/dchagin/lemul/sys/amd64/linux/linux.h
  user/dchagin/lemul/sys/amd64/linux32/linux.h
  user/dchagin/lemul/sys/compat/linux/linux_socket.h
  user/dchagin/lemul/sys/i386/linux/linux.h

Modified: user/dchagin/lemul/sys/amd64/linux/linux.h
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux/linux.h	Mon Feb 23 08:45:42 2015	(r279201)
+++ user/dchagin/lemul/sys/amd64/linux/linux.h	Mon Feb 23 09:37:10 2015	(r279202)
@@ -447,22 +447,6 @@ struct l_sockaddr {
 	char		sa_data[14];
 };
 
-struct l_msghdr {
-	l_uintptr_t	msg_name;
-	l_int		msg_namelen;
-	l_uintptr_t	msg_iov;
-	l_size_t	msg_iovlen;
-	l_uintptr_t	msg_control;
-	l_size_t	msg_controllen;
-	l_uint		msg_flags;
-};
-
-struct l_cmsghdr {
-	l_size_t	cmsg_len;
-	l_int		cmsg_level;
-	l_int		cmsg_type;
-};
-
 struct l_ifmap {
 	l_ulong		mem_start;
 	l_ulong		mem_end;

Modified: user/dchagin/lemul/sys/amd64/linux32/linux.h
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux32/linux.h	Mon Feb 23 08:45:42 2015	(r279201)
+++ user/dchagin/lemul/sys/amd64/linux32/linux.h	Mon Feb 23 09:37:10 2015	(r279202)
@@ -525,22 +525,6 @@ struct l_sockaddr {
 	char		sa_data[14];
 } __packed;
 
-struct l_msghdr {
-	l_uintptr_t	msg_name;
-	l_int		msg_namelen;
-	l_uintptr_t	msg_iov;
-	l_size_t	msg_iovlen;
-	l_uintptr_t	msg_control;
-	l_size_t	msg_controllen;
-	l_uint		msg_flags;
-};
-
-struct l_cmsghdr {
-	l_size_t	cmsg_len;
-	l_int		cmsg_level;
-	l_int		cmsg_type;
-};
-
 struct l_ifmap {
 	l_ulong		mem_start;
 	l_ulong		mem_end;

Modified: user/dchagin/lemul/sys/compat/linux/linux_socket.h
==============================================================================
--- user/dchagin/lemul/sys/compat/linux/linux_socket.h	Mon Feb 23 08:45:42 2015	(r279201)
+++ user/dchagin/lemul/sys/compat/linux/linux_socket.h	Mon Feb 23 09:37:10 2015	(r279202)
@@ -55,6 +55,22 @@
 #define LINUX_SCM_RIGHTS	0x01
 #define LINUX_SCM_CREDENTIALS   0x02
 
+struct l_msghdr {
+	l_uintptr_t	msg_name;
+	l_int		msg_namelen;
+	l_uintptr_t	msg_iov;
+	l_size_t	msg_iovlen;
+	l_uintptr_t	msg_control;
+	l_size_t	msg_controllen;
+	l_uint		msg_flags;
+};
+
+struct l_cmsghdr {
+	l_size_t	cmsg_len;
+	l_int		cmsg_level;
+	l_int		cmsg_type;
+};
+
 /* Ancilliary data object information macros */
 
 #define LINUX_CMSG_ALIGN(len)	roundup2(len, sizeof(l_ulong))

Modified: user/dchagin/lemul/sys/i386/linux/linux.h
==============================================================================
--- user/dchagin/lemul/sys/i386/linux/linux.h	Mon Feb 23 08:45:42 2015	(r279201)
+++ user/dchagin/lemul/sys/i386/linux/linux.h	Mon Feb 23 09:37:10 2015	(r279202)
@@ -504,22 +504,6 @@ struct l_sockaddr {
 	char		sa_data[14];
 };
 
-struct l_msghdr {
-	l_uintptr_t	msg_name;
-	l_int		msg_namelen;
-	l_uintptr_t	msg_iov;
-	l_size_t	msg_iovlen;
-	l_uintptr_t	msg_control;
-	l_size_t	msg_controllen;
-	l_uint		msg_flags;
-};
-
-struct l_cmsghdr {
-	l_size_t	cmsg_len;
-	l_int		cmsg_level;
-	l_int		cmsg_type;
-};
-
 struct l_ifmap {
 	l_ulong		mem_start;
 	l_ulong		mem_end;