From owner-p4-projects@FreeBSD.ORG  Wed Jul 18 15:04:56 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 55AC316A404; Wed, 18 Jul 2007 15:04:56 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2CA6016A402
	for <perforce@FreeBSD.org>; Wed, 18 Jul 2007 15:04:56 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 1CB3413C491
	for <perforce@FreeBSD.org>; Wed, 18 Jul 2007 15:04:56 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6IF4taZ020765
	for <perforce@FreeBSD.org>; Wed, 18 Jul 2007 15:04:55 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6IF4tYW020762
	for perforce@freebsd.org; Wed, 18 Jul 2007 15:04:55 GMT
	(envelope-from zec@FreeBSD.org)
Date: Wed, 18 Jul 2007 15:04:55 GMT
Message-Id: <200707181504.l6IF4tYW020762@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 123692 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Jul 2007 15:04:56 -0000

http://perforce.freebsd.org/chv.cgi?CH=123692

Change 123692 by zec@zec_tca51 on 2007/07/18 15:04:14

	Change the VNET_SYMMAP() macro so that it no longer relies
	on presence of per-module vnet_foo_0 structs.
	
	Staticize per-module vnet_foo_0 structs.

Affected files ...

.. //depot/projects/vimage/src/sys/net/vnet.h#6 edit
.. //depot/projects/vimage/src/sys/netinet/ip_input.c#16 edit
.. //depot/projects/vimage/src/sys/netinet/vinet.h#17 edit
.. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#14 edit
.. //depot/projects/vimage/src/sys/netipsec/ipsec.c#9 edit
.. //depot/projects/vimage/src/sys/netipsec/vipsec.h#5 edit
.. //depot/projects/vimage/src/sys/sys/vimage.h#23 edit

Differences ...

==== //depot/projects/vimage/src/sys/net/vnet.h#6 (text+ko) ====

@@ -67,8 +67,6 @@
         int     _ether_ipfw;
 };
 
-extern struct vnet_net vnet_net_0;
-
 #endif
 
 /*

==== //depot/projects/vimage/src/sys/netinet/ip_input.c#16 (text+ko) ====

@@ -213,7 +213,7 @@
 static void	ip_freef(struct ipqhead *, struct ipq *);
 
 #ifdef VIMAGE
-struct vnet_inet vnet_inet_0;
+static struct vnet_inet vnet_inet_0;
 
 struct vnet_symmap vnet_inet_symmap[] = {
 	VNET_SYMMAP_END

==== //depot/projects/vimage/src/sys/netinet/vinet.h#17 (text+ko) ====

@@ -176,8 +176,6 @@
 	int	_ipport_tcpallocs;
 	int	_ipport_tcplastcount;
 };
-
-extern struct vnet_inet vnet_inet_0;
 #endif
 
 

==== //depot/projects/vimage/src/sys/netinet6/ip6_input.c#14 (text+ko) ====

@@ -146,7 +146,7 @@
 #endif
 
 #ifdef VIMAGE
-struct vnet_inet6 vnet_inet6_0;
+static struct vnet_inet6 vnet_inet6_0;
  
 struct vnet_symmap vnet_inet6_symmap[] = {
 	VNET_SYMMAP_END

==== //depot/projects/vimage/src/sys/netipsec/ipsec.c#9 (text+ko) ====

@@ -224,7 +224,7 @@
 #endif /* INET6 */
 
 #ifdef VIMAGE
-struct vnet_ipsec vnet_ipsec_0;
+static struct vnet_ipsec vnet_ipsec_0;
 
 struct vnet_symmap vnet_ipsec_symmap[] = {
     VNET_SYMMAP_END

==== //depot/projects/vimage/src/sys/netipsec/vipsec.h#5 (text+ko) ====

@@ -108,9 +108,6 @@
 	int			_ipcomp_enable;
 	struct ipcompstat	_ipcompstat;
 };
-
-extern struct vnet_ipsec vnet_ipsec_0;
-
 #endif
 
 /*

==== //depot/projects/vimage/src/sys/sys/vimage.h#23 (text+ko) ====

@@ -140,7 +140,7 @@
 
 #define VNET_SYMMAP(mod, name)						\
 	{ #name, offsetof(struct vnet_##mod, _##name),			\
-	sizeof((vnet_##mod##_0)._##name) }
+	sizeof(((struct vnet_##mod *) curthread)->_##name) }
 
 #define VNET_SYMMAP_END							\
 	{ NULL, 0 }