Date: Sat, 21 Jun 2008 01:00:20 GMT From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 143852 for review Message-ID: <200806210100.m5L10KnG032230@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=143852 Change 143852 by julian@julian_trafmon1 on 2008/06/21 01:00:06 Add more so that the remaining diff is reduced Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#5 edit .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#5 edit .. //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#5 edit .. //depot/projects/vimage-commit2/src/sys/arm/arm/genassym.c#3 edit .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#3 edit .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#3 edit .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#3 edit .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#3 edit .. //depot/projects/vimage-commit2/src/sys/conf/options#2 edit .. //depot/projects/vimage-commit2/src/sys/contrib/altq/altq/altq_subr.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/fil.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_auth.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_frag.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_log.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_nat.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_proxy.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_state.c#3 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_sync.c#3 edit .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#2 edit .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#3 edit .. //depot/projects/vimage-commit2/src/sys/i386/conf/NOTES#3 edit .. //depot/projects/vimage-commit2/src/sys/i386/i386/dump_machdep.c#5 edit .. //depot/projects/vimage-commit2/src/sys/i386/i386/minidump_machdep.c#5 edit .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/dump_machdep.c#5 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#3 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#3 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#3 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_xxx.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_faith.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_gre.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#3 edit .. //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/route.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#2 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_carp.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fastfwd.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_nat.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_pfil.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_ipsec.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_options.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timer.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/dest6.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_gif.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_forward.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_ipsec.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_output.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/route6.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/sctp6_usrreq.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#4 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_input.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_mbuf.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_output.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ah.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipcomp.c#3 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#3 edit .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#3 edit .. //depot/projects/vimage-commit2/src/sys/nlm/nlm_prot_impl.c#4 edit .. //depot/projects/vimage-commit2/src/sys/rpc/authunix_prot.c#3 edit .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/dump_machdep.c#5 edit .. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/dump_machdep.c#5 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#5 (text+ko) ==== @@ -27,6 +27,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); +#include "opt_vimage.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#5 (text) ==== @@ -27,6 +27,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.4 2008/02/15 06:26:25 scottl Exp $"); +#include "opt_vimage.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> ==== //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#5 (text+ko) ==== @@ -27,6 +27,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $"); +#include "opt_vimage.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> ==== //depot/projects/vimage-commit2/src/sys/arm/arm/genassym.c#3 (text+ko) ==== @@ -32,7 +32,6 @@ #include <sys/assym.h> #include <sys/proc.h> #include <sys/mbuf.h> -#include <sys/vimage.h> #include <sys/vmmeter.h> #include <vm/vm.h> #include <vm/pmap.h> ==== //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#3 (text+ko) ==== @@ -39,6 +39,9 @@ * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 */ +#include "opt_compat.h" +#include "opt_vimage.h" + #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.119 2008/03/31 12:01:18 kib Exp $"); @@ -89,7 +92,6 @@ #include <machine/md_var.h> #endif /* __i386__ || __amd64__ */ -#include "opt_compat.h" #ifdef COMPAT_LINUX32 /* XXX */ #include <machine/../linux32/linux.h> #else ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#3 (text+ko) ==== @@ -29,6 +29,9 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.139 2007/11/07 16:42:52 kib Exp $"); +#include "opt_vimage.h" +#include "opt_compat.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/sysproto.h> @@ -57,12 +60,11 @@ #include <sys/tty.h> #include <sys/uio.h> #include <sys/vimage.h> + #include <net/if.h> #include <net/if_dl.h> #include <net/if_types.h> -#include "opt_compat.h" - #ifdef COMPAT_LINUX32 #include <machine/../linux32/linux.h> #include <machine/../linux32/linux32_proto.h> ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#3 (text+ko) ==== @@ -32,6 +32,7 @@ #include "opt_compat.h" #include "opt_mac.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/blist.h> ==== //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#3 (text+ko) ==== @@ -29,6 +29,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $"); +#include "opt_vimage.h" + #include <sys/param.h> #include <sys/proc.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/conf/options#2 (text+ko) ==== @@ -765,3 +765,6 @@ #Disable code to dispatch tcp offloading TCP_OFFLOAD_DISABLE opt_inet.h + +# Virtualize the network stack +VIMAGE opt_vimage.h ==== //depot/projects/vimage-commit2/src/sys/contrib/altq/altq/altq_subr.c#3 (text+ko) ==== @@ -32,6 +32,7 @@ #if (__FreeBSD__ != 2) #include "opt_inet.h" #ifdef __FreeBSD__ +#include "opt_vimage.h" #include "opt_inet6.h" #endif #endif ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/fil.c#3 (text+ko) ==== @@ -15,7 +15,6 @@ #include <sys/types.h> #include <sys/param.h> #include <sys/time.h> -#include <sys/vimage.h> #if defined(__NetBSD__) # if (NetBSD >= 199905) && !defined(IPFILTER_LKM) && defined(_KERNEL) # if (__NetBSD_Version__ < 301000000) @@ -29,7 +28,9 @@ (__FreeBSD_version >= 220000) # if (__FreeBSD_version >= 400000) # if !defined(IPFILTER_LKM) +# include "opt_vimage.h" # include "opt_inet6.h" +# include <sys/vimage.h> # endif # if (__FreeBSD_version == 400019) # define CSUM_DELAY_DATA ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_auth.c#3 (text+ko) ==== @@ -16,7 +16,6 @@ #include <sys/param.h> #include <sys/time.h> #include <sys/file.h> -#include <sys/vimage.h> #if !defined(_KERNEL) # include <stdio.h> # include <stdlib.h> @@ -55,7 +54,9 @@ #endif #if (defined(_BSDI_VERSION) && _BSDI_VERSION >= 199802) || \ (defined(__FreeBSD_version) &&(__FreeBSD_version >= 400000)) +# include "opt_vimage.h" # include <sys/queue.h> +# include <sys/vimage.h> #endif #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(bsdi) # include <machine/cpu.h> ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 (text+ko) ==== @@ -19,11 +19,16 @@ #if defined(__FreeBSD_version) && (__FreeBSD_version >= 400000) && \ !defined(KLD_MODULE) && !defined(IPFILTER_LKM) # include "opt_inet6.h" +# include "opt_vimage.h" #endif #if defined(__FreeBSD_version) && (__FreeBSD_version >= 440000) && \ !defined(KLD_MODULE) && !defined(IPFILTER_LKM) # include "opt_random_ip_id.h" #endif +#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800000) && \ + !defined(KLD_MODULE) && !defined(IPFILTER_LKM) +# include "opt_vimage.h" +#endif #include <sys/param.h> #if defined(__FreeBSD__) && !defined(__FreeBSD_version) # if defined(IPFILTER_LKM) @@ -39,13 +44,6 @@ #include <sys/errno.h> #include <sys/types.h> #include <sys/file.h> -#if __FreeBSD_version > 800000 -# include <sys/vimage.h> -#else -# define V_ipforwarding ipforwarding -# define V_path_mtu_discovery path_mtu_discovery -# define V_ip_defttl ip_defttl -#endif #if __FreeBSD_version >= 220000 # include <sys/fcntl.h> # include <sys/filio.h> @@ -69,6 +67,12 @@ #else # include <sys/select.h> #endif +#if __FreeBSD_version >= 800000 +# include <sys/vimage.h> +#else +#define V_path_mtu_discovery path_mtu_discovery +#define V_ipforwarding ipforwarding +#endif #include <net/if.h> #if __FreeBSD_version >= 300000 ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_frag.c#3 (text+ko) ==== @@ -16,7 +16,6 @@ #include <sys/param.h> #include <sys/time.h> #include <sys/file.h> -#include <sys/vimage.h> #ifdef __hpux # include <sys/timeout.h> #endif @@ -87,6 +86,10 @@ # ifndef IPFILTER_LKM # include <sys/libkern.h> # include <sys/systm.h> +# if (__FreeBSD_version > 800000) +# include "opt_vimage.h" +# include <sys/vimage.h> +# endif # endif extern struct callout_handle fr_slowtimer_ch; # endif ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_log.c#3 (text+ko) ==== @@ -38,7 +38,6 @@ #include <sys/errno.h> #include <sys/types.h> #include <sys/file.h> -#include <sys/vimage.h> #ifndef _KERNEL # include <stdio.h> # include <string.h> ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_nat.c#3 (text+ko) ==== @@ -16,7 +16,6 @@ #include <sys/param.h> #include <sys/time.h> #include <sys/file.h> -#include <sys/vimage.h> #if defined(_KERNEL) && defined(__NetBSD_Version__) && \ (__NetBSD_Version__ >= 399002000) # include <sys/kauth.h> ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_proxy.c#3 (text+ko) ==== @@ -16,7 +16,6 @@ #include <sys/param.h> #include <sys/time.h> #include <sys/file.h> -#include <sys/vimage.h> #if !defined(AIX) # include <sys/fcntl.h> #endif @@ -50,6 +49,10 @@ #if defined(_KERNEL) && (__FreeBSD_version >= 220000) # include <sys/filio.h> # include <sys/fcntl.h> +# if (__FreeBSD_version > 800000) +# include "opt_vimage.h" +# include <sys/vimage.h> +# endif # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM) # include "opt_ipfilter.h" # endif ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_state.c#3 (text+ko) ==== @@ -15,7 +15,6 @@ #include <sys/types.h> #include <sys/param.h> #include <sys/file.h> -#include <sys/vimage.h> #if defined(__NetBSD__) && (NetBSD >= 199905) && !defined(IPFILTER_LKM) && \ defined(_KERNEL) # if (__NetBSD_Version__ < 399001400) @@ -45,6 +44,10 @@ # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM) # include "opt_ipfilter.h" # endif +# if (__FreeBSD_version > 800000) +# include "opt_vimage.h" +# include <sys/vimage.h> +# endif #else # include <sys/ioctl.h> #endif ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_sync.c#3 (text+ko) ==== @@ -15,7 +15,6 @@ #include <sys/types.h> #include <sys/param.h> #include <sys/file.h> -#include <sys/vimage.h> #if !defined(_KERNEL) && !defined(__KERNEL__) # include <stdio.h> # include <stdlib.h> @@ -43,6 +42,10 @@ # if (__FreeBSD_version >= 300000) && !defined(IPFILTER_LKM) # include "opt_ipfilter.h" # endif +# if (__FreeBSD_version > 800000) +# include "opt_vimage.h" +# include <sys/vimage.h> +# endif #else # include <sys/ioctl.h> #endif ==== //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#2 (text+ko) ==== @@ -35,6 +35,8 @@ * */ +#include "opt_vimage.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/types.h> @@ -45,6 +47,7 @@ #include <sys/conf.h> #include <sys/sysctl.h> #include <sys/kthread.h> +#include <sys/vimage.h> #include <sys/kdb.h> @@ -702,7 +705,7 @@ crom_add_simple_text(src, root, &buf->vendor, "FreeBSD Project"); crom_add_entry(root, CSRKEY_HW, __FreeBSD_version); #endif - crom_add_simple_text(src, root, &buf->hw, hostname); + crom_add_simple_text(src, root, &buf->hw, V_hostname); } /* ==== //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#3 (text+ko) ==== @@ -34,6 +34,8 @@ * @(#)cd9660_rrip.c 8.6 (Berkeley) 12/5/94 */ +#include "opt_vimage.h" + #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/fs/cd9660/cd9660_rrip.c,v 1.30 2007/02/11 13:54:25 rodrigc Exp $"); ==== //depot/projects/vimage-commit2/src/sys/i386/conf/NOTES#3 (text+ko) ==== @@ -248,8 +248,14 @@ # # Not all device drivers support this mode of operation at the time of # this writing. See polling(4) for more details. +# +# VIMAGE adds support for maintaining multiple independent network stack +# state instances in the kernel. This feature is still in early +# experimental phase, and needs more thought, testing, and documentation. +# options DEVICE_POLLING +options VIMAGE # BPF_JITTER adds support for BPF just-in-time compiler. ==== //depot/projects/vimage-commit2/src/sys/i386/i386/dump_machdep.c#5 (text+ko) ==== @@ -24,6 +24,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_vimage.h" + #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/i386/i386/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-commit2/src/sys/i386/i386/minidump_machdep.c#5 (text) ==== @@ -24,6 +24,8 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_vimage.h" + #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/i386/i386/minidump_machdep.c,v 1.5 2008/02/15 06:26:25 scottl Exp $"); ==== //depot/projects/vimage-commit2/src/sys/ia64/ia64/dump_machdep.c#5 (text+ko) ==== @@ -27,6 +27,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/ia64/ia64/dump_machdep.c,v 1.14 2008/01/28 19:04:07 ru Exp $"); +#include "opt_vimage.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> ==== //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#3 (text+ko) ==== @@ -11,6 +11,7 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.77 2008/04/11 21:31:14 delphij Exp $"); #include "opt_mac.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/types.h> @@ -36,6 +37,7 @@ #include <sys/sysctl.h> #include <sys/vnode.h> #include <sys/vimage.h> + #include <net/if.h> #include <netinet/in.h> ==== //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#3 (text+ko) ==== @@ -41,6 +41,7 @@ #include "opt_compat.h" #include "opt_posix.h" #include "opt_config.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/kernel.h> ==== //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#3 (text+ko) ==== @@ -27,6 +27,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/kern/kern_uuid.c,v 1.13 2007/04/23 12:53:00 pjd Exp $"); +#include "opt_vimage.h" + #include <sys/param.h> #include <sys/endian.h> #include <sys/kernel.h> ==== //depot/projects/vimage-commit2/src/sys/kern/kern_xxx.c#3 (text+ko) ==== @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD: src/sys/kern/kern_xxx.c,v 1.49 2007/03/05 13:10:57 rwatson Exp $"); #include "opt_compat.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/net/if.c#3 (text+ko) ==== @@ -35,6 +35,7 @@ #include "opt_inet.h" #include "opt_mac.h" #include "opt_carp.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/types.h> ==== //depot/projects/vimage-commit2/src/sys/net/if_faith.c#3 (text+ko) ==== @@ -41,6 +41,7 @@ */ #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/net/if_gif.c#3 (text+ko) ==== @@ -33,6 +33,7 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_mac.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/net/if_gre.c#3 (text+ko) ==== @@ -51,6 +51,7 @@ #include "opt_atalk.h" #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/kernel.h> ==== //depot/projects/vimage-commit2/src/sys/net/if_loop.c#3 (text+ko) ==== @@ -38,6 +38,7 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/net/if_mib.c#3 (text+ko) ==== @@ -29,6 +29,8 @@ * $FreeBSD: src/sys/net/if_mib.c,v 1.18 2006/01/04 12:57:09 harti Exp $ */ +#include "opt_vimage.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/vimage-commit2/src/sys/net/if_var.h#3 (text+ko) ==== @@ -644,7 +644,7 @@ struct cdev *ife_dev; }; -#define ifnet_byindex(idx) ifindex_table[(idx)].ife_ifnet +#define ifnet_byindex(idx) V_ifindex_table[(idx)].ife_ifnet /* * Given the index, ifaddr_byindex() returns the one and only * link-level ifaddr for the interface. You are not supposed to use ==== //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#3 (text+ko) ==== @@ -42,6 +42,7 @@ */ #include "opt_vlan.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/kernel.h> ==== //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#3 (text+ko) ==== @@ -30,6 +30,8 @@ * $FreeBSD: src/sys/net/raw_cb.c,v 1.35 2008/03/25 09:38:59 ru Exp $ */ +#include "opt_vimage.h" + #include <sys/param.h> #include <sys/domain.h> #include <sys/lock.h> ==== //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#3 (text+ko) ==== @@ -30,6 +30,8 @@ * $FreeBSD: src/sys/net/raw_usrreq.c,v 1.44 2006/11/06 13:42:02 rwatson Exp $ */ +#include "opt_vimage.h" + #include <sys/param.h> #include <sys/kernel.h> #include <sys/lock.h> ==== //depot/projects/vimage-commit2/src/sys/net/route.c#3 (text+ko) ==== @@ -38,6 +38,7 @@ #include "opt_route.h" #include "opt_mrouting.h" #include "opt_mpath.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/net/rtsock.c#3 (text+ko) ==== @@ -29,8 +29,10 @@ * @(#)rtsock.c 8.7 (Berkeley) 10/12/95 * $FreeBSD: src/sys/net/rtsock.c,v 1.146 2008/05/09 23:02:56 julian Exp $ */ + #include "opt_sctp.h" #include "opt_mpath.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/domain.h> ==== //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#2 (text+ko) ==== @@ -32,11 +32,14 @@ */ #include "opt_wlan.h" +#include "opt_vimage.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/socket.h> +#include <sys/vimage.h> #include <net/if.h> #include <net/if_dl.h> ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#3 (text+ko) ==== @@ -46,6 +46,8 @@ * This file implements the base netgraph code. */ +#include "opt_vimage.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/ctype.h> ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#3 (text+ko) ==== @@ -28,6 +28,8 @@ * $FreeBSD: src/sys/netgraph/ng_eiface.c,v 1.39 2007/07/26 10:54:33 glebius Exp $ */ +#include "opt_vimage.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/errno.h> ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#3 (text+ko) ==== @@ -46,6 +46,8 @@ * ng_ether(4) netgraph node type */ +#include "opt_vimage.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#3 (text+ko) ==== @@ -56,6 +56,7 @@ #include "opt_inet.h" #include "opt_inet6.h" #include "opt_ipx.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#4 (text+ko) ==== @@ -41,6 +41,7 @@ #include "opt_inet.h" #include "opt_mac.h" #include "opt_carp.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/kernel.h> ==== //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#3 (text+ko) ==== @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD: src/sys/netinet/igmp.c,v 1.56 2007/10/28 15:55:21 rwatson Exp $"); #include "opt_mac.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/netinet/in.c#3 (text+ko) ==== @@ -34,6 +34,7 @@ __FBSDID("$FreeBSD: src/sys/netinet/in.c,v 1.103 2008/01/24 08:14:38 bz Exp $"); #include "opt_carp.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#3 (text+ko) ==== @@ -35,6 +35,7 @@ #include "opt_mrouting.h" #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#3 (text+ko) ==== @@ -39,6 +39,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/netinet/in_mcast.c,v 1.5 2008/05/09 23:02:57 julian Exp $"); +#include "opt_vimage.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#3 (text+ko) ==== @@ -38,6 +38,7 @@ #include "opt_ipsec.h" #include "opt_inet6.h" #include "opt_mac.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#3 (text+ko) ==== @@ -43,6 +43,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/netinet/in_rmx.c,v 1.59 2008/05/09 23:02:57 julian Exp $"); +#include "opt_vimage.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_carp.c#3 (text+ko) ==== @@ -31,6 +31,7 @@ #include "opt_bpf.h" #include "opt_inet.h" #include "opt_inet6.h" +#include "opt_vimage.h" #include <sys/types.h> #include <sys/param.h> ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fastfwd.c#3 (text+ko) ==== @@ -78,6 +78,7 @@ #include "opt_ipfw.h" #include "opt_ipstealth.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#3 (text+ko) ==== @@ -45,6 +45,7 @@ #include "opt_inet6.h" #include "opt_ipsec.h" #include "opt_mac.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_nat.c#3 (text+ko) ==== @@ -24,6 +24,7 @@ * SUCH DAMAGE. */ +#include "opt_vimage.h" #include <sys/cdefs.h> __FBSDID("$FreeBSD: src/sys/netinet/ip_fw_nat.c,v 1.3 2008/06/01 12:29:23 mav Exp $"); ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_pfil.c#3 (text+ko) ==== @@ -36,6 +36,7 @@ #endif /* INET */ #endif /* KLD_MODULE */ #include "opt_inet6.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#3 (text+ko) ==== @@ -34,6 +34,7 @@ #include "opt_ipsec.h" #include "opt_mac.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#3 (text+ko) ==== @@ -38,6 +38,7 @@ #include "opt_ipsec.h" #include "opt_mac.h" #include "opt_carp.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_ipsec.c#3 (text+ko) ==== @@ -31,6 +31,7 @@ __FBSDID("$FreeBSD: src/sys/netinet/ip_ipsec.c,v 1.10 2008/04/09 05:17:18 bz Exp $"); #include "opt_ipsec.h" +#include "opt_vimage.h" #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#3 (text+ko) ==== @@ -60,6 +60,7 @@ #include "opt_inet6.h" #include "opt_mac.h" #include "opt_mrouting.h" +#include "opt_vimage.h" #define _PIM_VT 1 ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_options.c#3 (text+ko) ==== @@ -34,6 +34,7 @@ #include "opt_ipstealth.h" #include "opt_mac.h" +#include "opt_vimage.h" #include <sys/param.h> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200806210100.m5L10KnG032230>