From owner-svn-src-head@FreeBSD.ORG  Sun Mar  1 11:01:01 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D133410656D7;
	Sun,  1 Mar 2009 11:01:01 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 610C78FC19;
	Sun,  1 Mar 2009 11:01:01 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n21B114E041466;
	Sun, 1 Mar 2009 11:01:01 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n21B11eV041462;
	Sun, 1 Mar 2009 11:01:01 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200903011101.n21B11eV041462@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 1 Mar 2009 11:01:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189225 - in head/sys: net netinet netinet6 netipsec
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Mar 2009 11:01:02 -0000

Author: bz
Date: Sun Mar  1 11:01:00 2009
New Revision: 189225
URL: http://svn.freebsd.org/changeset/base/189225

Log:
  Add size-guards evaluated at compile-time to the main struct vnet_*
  which are not in a module of their own like gif.
  
  Single kernel compiles and universe will fail if the size of the struct
  changes. Th expected values are given in sys/vimage.h.
  See the comments where how to handle this.
  
  Requested by:	peter

Modified:
  head/sys/net/vnet.h
  head/sys/netinet/vinet.h
  head/sys/netinet6/vinet6.h
  head/sys/netipsec/vipsec.h

Modified: head/sys/net/vnet.h
==============================================================================
--- head/sys/net/vnet.h	Sun Mar  1 10:51:34 2009	(r189224)
+++ head/sys/net/vnet.h	Sun Mar  1 11:01:00 2009	(r189225)
@@ -56,6 +56,9 @@ struct vnet_net {
 	int	_ether_ipfw;
 };
 
+/* Size guard. See sys/vimage.h. */
+VIMAGE_CTASSERT(SIZEOF_vnet_net, sizeof(struct vnet_net));
+
 #ifndef VIMAGE
 #ifndef VIMAGE_GLOBALS
 extern struct vnet_net vnet_net_0;

Modified: head/sys/netinet/vinet.h
==============================================================================
--- head/sys/netinet/vinet.h	Sun Mar  1 10:51:34 2009	(r189224)
+++ head/sys/netinet/vinet.h	Sun Mar  1 11:01:00 2009	(r189225)
@@ -196,6 +196,9 @@ struct vnet_inet {
 	int	_fw_one_pass;
 };
 
+/* Size guard. See sys/vimage.h. */
+VIMAGE_CTASSERT(SIZEOF_vnet_inet, sizeof(struct vnet_inet));
+
 #ifndef VIMAGE
 #ifndef VIMAGE_GLOBALS
 extern struct vnet_inet vnet_inet_0;

Modified: head/sys/netinet6/vinet6.h
==============================================================================
--- head/sys/netinet6/vinet6.h	Sun Mar  1 10:51:34 2009	(r189224)
+++ head/sys/netinet6/vinet6.h	Sun Mar  1 11:01:00 2009	(r189225)
@@ -155,6 +155,9 @@ struct vnet_inet6 {
 	struct ip6_pktopts		_ip6_opts;
 };
 
+/* Size guard. See sys/vimage.h. */
+VIMAGE_CTASSERT(SIZEOF_vnet_inet6, sizeof(struct vnet_inet6));
+
 #ifndef VIMAGE
 #ifndef VIMAGE_GLOBALS
 extern struct vnet_inet6 vnet_inet6_0;

Modified: head/sys/netipsec/vipsec.h
==============================================================================
--- head/sys/netipsec/vipsec.h	Sun Mar  1 10:51:34 2009	(r189224)
+++ head/sys/netipsec/vipsec.h	Sun Mar  1 11:01:00 2009	(r189225)
@@ -107,6 +107,9 @@ struct vnet_ipsec {
 	LIST_HEAD(, secspacq)	_spacqtree;
 };
 
+/* Size guard. See sys/vimage.h. */
+VIMAGE_CTASSERT(SIZEOF_vnet_ipsec, sizeof(struct vnet_ipsec));
+
 #ifndef VIMAGE
 #ifndef VIMAGE_GLOBALS
 extern struct vnet_ipsec vnet_ipsec_0;