From owner-p4-projects@FreeBSD.ORG Mon Dec 8 11:58:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11B441065678; Mon, 8 Dec 2008 11:58:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B12EE1065672 for ; Mon, 8 Dec 2008 11:58:02 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9FBC58FC16 for ; Mon, 8 Dec 2008 11:58:02 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mB8Bw2SC032911 for ; Mon, 8 Dec 2008 11:58:02 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mB8Bw26k032909 for perforce@freebsd.org; Mon, 8 Dec 2008 11:58:02 GMT (envelope-from zec@icir.org) Date: Mon, 8 Dec 2008 11:58:02 GMT Message-Id: <200812081158.mB8Bw26k032909@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 154330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Dec 2008 11:58:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=154330 Change 154330 by zec@zec_tpx32 on 2008/12/08 11:57:17 Enclose vnet_*_0 container instantiations in #ifndef VIMAGE blocks in adition to #ifndef VIMAGE_GLOBALS. Suggested by: bz Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#15 edit .. //depot/projects/vimage-commit2/src/sys/net/if_gif.h#7 edit .. //depot/projects/vimage-commit2/src/sys/net/route.c#23 edit .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#9 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#18 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#19 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#14 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#29 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#23 edit .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#21 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#18 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#17 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#21 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#16 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if_gif.c#15 (text+ko) ==== @@ -95,9 +95,11 @@ static struct mtx gif_mtx; static MALLOC_DEFINE(M_GIF, "gif", "Generic Tunnel Interface"); +#ifndef VIMAGE #ifndef VIMAGE_GLOBALS struct vnet_gif vnet_gif_0; #endif +#endif #ifdef VIMAGE_GLOBALS static LIST_HEAD(, gif_softc) gif_softc_list; ==== //depot/projects/vimage-commit2/src/sys/net/if_gif.h#7 (text+ko) ==== @@ -122,9 +122,11 @@ int _ip6_gif_hlim; }; +#ifndef VIMAGE #ifndef VIMAGE_GLOBALS extern struct vnet_gif vnet_gif_0; #endif +#endif #define INIT_VNET_GIF(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_GIF, struct vnet_gif, vnet_gif) ==== //depot/projects/vimage-commit2/src/sys/net/route.c#23 (text+ko) ==== @@ -65,9 +65,11 @@ #include +#ifndef VIMAGE #ifndef VIMAGE_GLOBALS struct vnet_net vnet_net_0; #endif +#endif u_int rt_numfibs = RT_NUMFIBS; SYSCTL_INT(_net, OID_AUTO, fibs, CTLFLAG_RD, &rt_numfibs, 0, ""); ==== //depot/projects/vimage-commit2/src/sys/net/vnet.h#9 (text+ko) ==== @@ -67,9 +67,11 @@ int _ether_ipfw; }; +#ifndef VIMAGE #ifndef VIMAGE_GLOBALS extern struct vnet_net vnet_net_0; #endif +#endif /* * Symbol translation macros ==== //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#18 (text+ko) ==== @@ -1205,9 +1205,11 @@ struct unrhdr *_ng_wormhole_unit; }; +#ifndef VIMAGE #ifndef VIMAGE_GLOBALS extern struct vnet_netgraph vnet_netgraph_0; #endif +#endif /* Symbol translation macros */ #define V_nextID VNET_NETGRAPH(nextID) ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#19 (text+ko) ==== @@ -72,9 +72,11 @@ MODULE_VERSION(netgraph, NG_ABI_VERSION); +#ifndef VIMAGE #ifndef VIMAGE_GLOBALS struct vnet_netgraph vnet_netgraph_0; #endif +#endif /* Mutex to protect topology events. */ static struct mtx ng_topo_mtx; ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#14 (text+ko) ==== @@ -718,9 +718,11 @@ eventhandler_tag _ifaddr_event_tag; }; +#ifndef VIMAGE #ifndef VIMAGE_GLOBALS extern struct vnet_ipfw vnet_ipfw_0; #endif +#endif /* * Symbol translation macros ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#29 (text+ko) ==== @@ -110,9 +110,11 @@ #include +#ifndef VIMAGE #ifndef VIMAGE_GLOBALS struct vnet_ipfw vnet_ipfw_0; #endif +#endif /* * set_disable contains one bit per set value (0..31). ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#23 (text+ko) ==== @@ -91,9 +91,11 @@ CTASSERT(sizeof(struct ip) == 20); #endif +#ifndef VIMAGE #ifndef VIMAGE_GLOBALS struct vnet_inet vnet_inet_0; #endif +#endif #ifdef VIMAGE_GLOBALS static int ipsendredirects; ==== //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#21 (text+ko) ==== @@ -198,9 +198,11 @@ int _fw_one_pass; }; +#ifndef VIMAGE #ifndef VIMAGE_GLOBALS extern struct vnet_inet vnet_inet_0; #endif +#endif /* * Symbol translation macros ==== //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#18 (text+ko) ==== @@ -120,9 +120,11 @@ u_char ip6_protox[IPPROTO_MAX]; static struct ifqueue ip6intrq; +#ifndef VIMAGE #ifndef VIMAGE_GLOBALS struct vnet_inet6 vnet_inet6_0; #endif +#endif #ifdef VIMAGE_GLOBALS static int ip6qmaxlen; ==== //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#17 (text+ko) ==== @@ -156,9 +156,11 @@ struct ip6_pktopts _ip6_opts; }; +#ifndef VIMAGE #ifndef VIMAGE_GLOBALS extern struct vnet_inet6 vnet_inet6_0; #endif +#endif #define INIT_VNET_INET6(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_INET6, struct vnet_inet6, vnet_inet6) ==== //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#21 (text+ko) ==== @@ -97,9 +97,11 @@ #include +#ifndef VIMAGE #ifndef VIMAGE_GLOBALS struct vnet_ipsec vnet_ipsec_0; #endif +#endif #ifdef VIMAGE_GLOBALS /* NB: name changed so netstat doesn't use it */ ==== //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#16 (text+ko) ==== @@ -109,9 +109,11 @@ LIST_HEAD(, secspacq) _spacqtree; }; +#ifndef VIMAGE #ifndef VIMAGE_GLOBALS extern struct vnet_ipsec vnet_ipsec_0; #endif +#endif /* * Symbol translation macros