PERFORCE change 147696 for review
Ed Schouten
ed at FreeBSD.org
Mon Aug 18 06:45:31 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=147696
Change 147696 by ed at ed_dull on 2008/08/18 06:45:21
IFC. (the vimage stuff)
Affected files ...
.. //depot/projects/mpsafetty/sys/amd64/amd64/dump_machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/amd64/amd64/minidump_machdep.c#3 integrate
.. //depot/projects/mpsafetty/sys/arm/arm/dump_machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/compat/linprocfs/linprocfs.c#2 integrate
.. //depot/projects/mpsafetty/sys/compat/linux/linux_ioctl.c#5 integrate
.. //depot/projects/mpsafetty/sys/compat/linux/linux_misc.c#3 integrate
.. //depot/projects/mpsafetty/sys/compat/linux/linux_socket.c#2 integrate
.. //depot/projects/mpsafetty/sys/compat/svr4/svr4_sockio.c#2 integrate
.. //depot/projects/mpsafetty/sys/compat/svr4/svr4_stat.c#2 integrate
.. //depot/projects/mpsafetty/sys/conf/files.i386#5 integrate
.. //depot/projects/mpsafetty/sys/conf/options#4 integrate
.. //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_subr.c#2 integrate
.. //depot/projects/mpsafetty/sys/contrib/ipfilter/netinet/fil.c#2 integrate
.. //depot/projects/mpsafetty/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate
.. //depot/projects/mpsafetty/sys/contrib/pf/net/pf.c#3 integrate
.. //depot/projects/mpsafetty/sys/contrib/pf/net/pf_if.c#2 integrate
.. //depot/projects/mpsafetty/sys/contrib/pf/net/pf_ioctl.c#3 integrate
.. //depot/projects/mpsafetty/sys/contrib/pf/net/pf_subr.c#2 integrate
.. //depot/projects/mpsafetty/sys/contrib/rdma/rdma_cma.c#2 integrate
.. //depot/projects/mpsafetty/sys/ddb/db_textdump.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 integrate
.. //depot/projects/mpsafetty/sys/dev/firewire/firewire.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/pci/pci_pci.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/syscons/daemon/daemon_saver.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/ehci.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/ehcireg.h#3 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/ehcivar.h#2 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/usb.h#2 integrate
.. //depot/projects/mpsafetty/sys/dev/xen/blkfront/blkfront.c#2 integrate
.. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_rrip.c#2 integrate
.. //depot/projects/mpsafetty/sys/geom/vinum/geom_vinum_drive.c#2 integrate
.. //depot/projects/mpsafetty/sys/i386/i386/dump_machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/i386/i386/machdep.c#3 integrate
.. //depot/projects/mpsafetty/sys/i386/i386/minidump_machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate
.. //depot/projects/mpsafetty/sys/i386/include/xen/xenfunc.h#2 integrate
.. //depot/projects/mpsafetty/sys/i386/include/xen/xenvar.h#2 integrate
.. //depot/projects/mpsafetty/sys/i386/xen/exception.s#2 integrate
.. //depot/projects/mpsafetty/sys/i386/xen/pmap.c#3 integrate
.. //depot/projects/mpsafetty/sys/i386/xen/xen_machdep.c#3 integrate
.. //depot/projects/mpsafetty/sys/ia64/ia64/dump_machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_jail.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_mib.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_poll.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_uuid.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_xxx.c#2 integrate
.. //depot/projects/mpsafetty/sys/net/bridgestp.c#2 integrate
.. //depot/projects/mpsafetty/sys/net/if.c#2 integrate
.. //depot/projects/mpsafetty/sys/net/if_bridge.c#3 integrate
.. //depot/projects/mpsafetty/sys/net/if_ef.c#2 integrate
.. //depot/projects/mpsafetty/sys/net/if_ethersubr.c#2 integrate
.. //depot/projects/mpsafetty/sys/net/if_faith.c#2 integrate
.. //depot/projects/mpsafetty/sys/net/if_gif.c#2 integrate
.. //depot/projects/mpsafetty/sys/net/if_loop.c#3 integrate
.. //depot/projects/mpsafetty/sys/net/if_mib.c#2 integrate
.. //depot/projects/mpsafetty/sys/net/if_spppsubr.c#2 integrate
.. //depot/projects/mpsafetty/sys/net/if_stf.c#2 integrate
.. //depot/projects/mpsafetty/sys/net/if_vlan.c#3 integrate
.. //depot/projects/mpsafetty/sys/net/raw_cb.c#3 integrate
.. //depot/projects/mpsafetty/sys/net/raw_usrreq.c#3 integrate
.. //depot/projects/mpsafetty/sys/net/route.c#3 integrate
.. //depot/projects/mpsafetty/sys/net/rtsock.c#3 integrate
.. //depot/projects/mpsafetty/sys/netgraph/atm/ng_atm.c#2 integrate
.. //depot/projects/mpsafetty/sys/netgraph/ng_base.c#2 integrate
.. //depot/projects/mpsafetty/sys/netgraph/ng_bridge.c#2 integrate
.. //depot/projects/mpsafetty/sys/netgraph/ng_eiface.c#2 integrate
.. //depot/projects/mpsafetty/sys/netgraph/ng_ether.c#2 integrate
.. //depot/projects/mpsafetty/sys/netgraph/ng_gif.c#2 integrate
.. //depot/projects/mpsafetty/sys/netgraph/ng_iface.c#4 integrate
.. //depot/projects/mpsafetty/sys/netgraph/ng_source.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/if_ether.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/igmp.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/in.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/in_gif.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/in_mcast.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/in_pcb.c#6 integrate
.. //depot/projects/mpsafetty/sys/netinet/in_rmx.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/in_var.h#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip6.h#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip_carp.c#3 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip_divert.c#3 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip_fastfwd.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip_fw2.c#3 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip_fw_nat.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip_fw_pfil.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip_icmp.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip_input.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip_ipsec.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip_mroute.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip_options.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip_output.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/ip_var.h#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/raw_ip.c#5 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_os_bsd.h#3 integrate
.. //depot/projects/mpsafetty/sys/netinet/sctp_pcb.c#4 integrate
.. //depot/projects/mpsafetty/sys/netinet/tcp_hostcache.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/tcp_input.c#3 integrate
.. //depot/projects/mpsafetty/sys/netinet/tcp_offload.c#3 integrate
.. //depot/projects/mpsafetty/sys/netinet/tcp_output.c#4 integrate
.. //depot/projects/mpsafetty/sys/netinet/tcp_reass.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/tcp_sack.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/tcp_subr.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/tcp_syncache.c#5 integrate
.. //depot/projects/mpsafetty/sys/netinet/tcp_timer.c#3 integrate
.. //depot/projects/mpsafetty/sys/netinet/tcp_timewait.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet/tcp_usrreq.c#3 integrate
.. //depot/projects/mpsafetty/sys/netinet/udp_usrreq.c#9 integrate
.. //depot/projects/mpsafetty/sys/netinet6/dest6.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet6/frag6.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet6/icmp6.c#4 integrate
.. //depot/projects/mpsafetty/sys/netinet6/in6.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet6/in6_gif.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet6/in6_ifattach.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet6/in6_pcb.c#4 integrate
.. //depot/projects/mpsafetty/sys/netinet6/in6_proto.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet6/in6_rmx.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet6/in6_src.c#5 integrate
.. //depot/projects/mpsafetty/sys/netinet6/ip6_forward.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet6/ip6_input.c#3 integrate
.. //depot/projects/mpsafetty/sys/netinet6/ip6_ipsec.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet6/ip6_mroute.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet6/ip6_output.c#3 integrate
.. //depot/projects/mpsafetty/sys/netinet6/mld6.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet6/nd6.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet6/nd6.h#2 integrate
.. //depot/projects/mpsafetty/sys/netinet6/nd6_nbr.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet6/nd6_rtr.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet6/raw_ip6.c#6 integrate
.. //depot/projects/mpsafetty/sys/netinet6/route6.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet6/scope6.c#2 integrate
.. //depot/projects/mpsafetty/sys/netinet6/udp6_usrreq.c#3 integrate
.. //depot/projects/mpsafetty/sys/netipsec/ipsec.c#4 integrate
.. //depot/projects/mpsafetty/sys/netipsec/ipsec.h#2 integrate
.. //depot/projects/mpsafetty/sys/netipsec/ipsec_input.c#3 integrate
.. //depot/projects/mpsafetty/sys/netipsec/ipsec_mbuf.c#2 integrate
.. //depot/projects/mpsafetty/sys/netipsec/ipsec_output.c#3 integrate
.. //depot/projects/mpsafetty/sys/netipsec/key.c#3 integrate
.. //depot/projects/mpsafetty/sys/netipsec/key_debug.h#2 integrate
.. //depot/projects/mpsafetty/sys/netipsec/keysock.c#3 integrate
.. //depot/projects/mpsafetty/sys/netipsec/xform_ah.c#2 integrate
.. //depot/projects/mpsafetty/sys/netipsec/xform_esp.c#2 integrate
.. //depot/projects/mpsafetty/sys/netipsec/xform_ipcomp.c#2 integrate
.. //depot/projects/mpsafetty/sys/netipsec/xform_ipip.c#2 integrate
.. //depot/projects/mpsafetty/sys/nfsclient/bootp_subr.c#2 integrate
.. //depot/projects/mpsafetty/sys/nfsclient/nfs_diskless.c#2 integrate
.. //depot/projects/mpsafetty/sys/nfsclient/nfs_vfsops.c#4 integrate
.. //depot/projects/mpsafetty/sys/nfsclient/nfs_vnops.c#2 integrate
.. //depot/projects/mpsafetty/sys/rpc/authunix_prot.c#2 integrate
.. //depot/projects/mpsafetty/sys/sparc64/sparc64/dump_machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/sun4v/sun4v/dump_machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/sys/param.h#5 integrate
.. //depot/projects/mpsafetty/sys/sys/vimage.h#1 branch
.. //depot/projects/mpsafetty/sys/vm/vm_page.c#2 integrate
.. //depot/projects/mpsafetty/sys/xen/gnttab.c#2 integrate
.. //depot/projects/mpsafetty/usr.bin/tar/matching.c#2 integrate
Differences ...
==== //depot/projects/mpsafetty/sys/amd64/amd64/dump_machdep.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.14 2008/02/15 06:26:25 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.15 2008/08/17 23:27:27 bz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -34,6 +34,7 @@
#include <sys/sysctl.h>
#include <sys/kernel.h>
#include <sys/kerneldump.h>
+#include <sys/vimage.h>
#include <vm/vm.h>
#include <vm/pmap.h>
#include <machine/elf.h>
@@ -118,7 +119,7 @@
kdh->dumplength = htod64(dumplen);
kdh->dumptime = htod64(time_second);
kdh->blocksize = htod32(blksz);
- strncpy(kdh->hostname, hostname, sizeof(kdh->hostname));
+ strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname));
strncpy(kdh->versionstring, version, sizeof(kdh->versionstring));
if (panicstr != NULL)
strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring));
==== //depot/projects/mpsafetty/sys/amd64/amd64/minidump_machdep.c#3 (text) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.6 2008/07/08 04:00:22 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.7 2008/08/17 23:27:27 bz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -34,6 +34,7 @@
#include <sys/kernel.h>
#include <sys/kerneldump.h>
#include <sys/msgbuf.h>
+#include <sys/vimage.h>
#include <vm/vm.h>
#include <vm/pmap.h>
#include <machine/atomic.h>
@@ -94,7 +95,7 @@
kdh->dumplength = htod64(dumplen);
kdh->dumptime = htod64(time_second);
kdh->blocksize = htod32(blksz);
- strncpy(kdh->hostname, hostname, sizeof(kdh->hostname));
+ strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname));
strncpy(kdh->versionstring, version, sizeof(kdh->versionstring));
if (panicstr != NULL)
strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring));
==== //depot/projects/mpsafetty/sys/arm/arm/dump_machdep.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.3 2008/01/28 19:04:06 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.4 2008/08/17 23:27:27 bz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -34,6 +34,7 @@
#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/kerneldump.h>
+#include <sys/vimage.h>
#include <vm/vm.h>
#include <vm/pmap.h>
#include <machine/elf.h>
@@ -116,7 +117,7 @@
kdh->dumplength = htod64(dumplen);
kdh->dumptime = htod64(time_second);
kdh->blocksize = htod32(blksz);
- strncpy(kdh->hostname, hostname, sizeof(kdh->hostname));
+ strncpy(kdh->hostname, G_hostname, sizeof(kdh->hostname));
strncpy(kdh->versionstring, version, sizeof(kdh->versionstring));
if (panicstr != NULL)
strncpy(kdh->panicstring, panicstr, sizeof(kdh->panicstring));
==== //depot/projects/mpsafetty/sys/compat/linprocfs/linprocfs.c#2 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.119 2008/03/31 12:01:18 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.120 2008/08/17 23:27:27 bz Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -71,6 +71,7 @@
#include <sys/user.h>
#include <sys/vmmeter.h>
#include <sys/vnode.h>
+#include <sys/vimage.h>
#include <net/if.h>
@@ -1008,7 +1009,7 @@
"bytes packets errs drop fifo frame compressed");
IFNET_RLOCK();
- TAILQ_FOREACH(ifp, &ifnet, if_link) {
+ TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
linux_ifname(ifp, ifname, sizeof ifname);
sbuf_printf(sb, "%6.6s:", ifname);
sbuf_printf(sb, "%8lu %7lu %4lu %4lu %4lu %5lu %10lu %9lu ",
==== //depot/projects/mpsafetty/sys/compat/linux/linux_ioctl.c#5 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.140 2008/07/23 17:47:44 ed Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.141 2008/08/17 23:27:27 bz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -56,6 +56,8 @@
#include <sys/sx.h>
#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>
@@ -2059,7 +2061,7 @@
/* Determine the (relative) unit number for ethernet interfaces */
ethno = 0;
IFNET_RLOCK();
- TAILQ_FOREACH(ifscan, &ifnet, if_link) {
+ TAILQ_FOREACH(ifscan, &V_ifnet, if_link) {
if (ifscan == ifp) {
IFNET_RUNLOCK();
return (snprintf(buffer, buflen, "eth%d", ethno));
@@ -2098,7 +2100,7 @@
index = 0;
is_eth = (len == 3 && !strncmp(lxname, "eth", len)) ? 1 : 0;
IFNET_RLOCK();
- TAILQ_FOREACH(ifp, &ifnet, if_link) {
+ TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
/*
* Allow Linux programs to use FreeBSD names. Don't presume
* we never have an interface named "eth", so don't make
@@ -2142,7 +2144,7 @@
/* handle the 'request buffer size' case */
if (ifc.ifc_buf == PTROUT(NULL)) {
ifc.ifc_len = 0;
- TAILQ_FOREACH(ifp, &ifnet, if_link) {
+ TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
struct sockaddr *sa = ifa->ifa_addr;
if (sa->sa_family == AF_INET)
@@ -2169,7 +2171,7 @@
/* Return all AF_INET addresses of all interfaces */
IFNET_RLOCK(); /* could sleep XXX */
- TAILQ_FOREACH(ifp, &ifnet, if_link) {
+ TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
int addrs = 0;
bzero(&ifr, sizeof(ifr));
==== //depot/projects/mpsafetty/sys/compat/linux/linux_misc.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.223 2008/07/23 17:19:02 rdivacky Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.224 2008/08/17 23:27:27 bz Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
@@ -64,6 +64,7 @@
#include <sys/vnode.h>
#include <sys/wait.h>
#include <sys/cpuset.h>
+#include <sys/vimage.h>
#include <security/mac/mac_framework.h>
@@ -765,7 +766,7 @@
strlcpy(utsname.machine, machine, LINUX_MAX_UTSNAME);
#endif /* __i386__ */
mtx_lock(&hostname_mtx);
- strlcpy(utsname.domainname, domainname, LINUX_MAX_UTSNAME);
+ strlcpy(utsname.domainname, V_domainname, LINUX_MAX_UTSNAME);
mtx_unlock(&hostname_mtx);
return (copyout(&utsname, args->buf, sizeof(utsname)));
==== //depot/projects/mpsafetty/sys/compat/linux/linux_socket.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.74 2007/08/06 14:25:59 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.75 2008/08/17 23:27:27 bz Exp $");
/* XXX we use functions that might not exist. */
#include "opt_compat.h"
@@ -50,6 +50,7 @@
#include <sys/uio.h>
#include <sys/syslog.h>
#include <sys/un.h>
+#include <sys/vimage.h>
#include <netinet/in.h>
#include <netinet/in_systm.h>
@@ -588,7 +589,7 @@
* XXX: Avoid undefined symbol error with an IPv4 only
* kernel.
*/
- && ip6_v6only
+ && V_ip6_v6only
#endif
) {
int v6only;
==== //depot/projects/mpsafetty/sys/compat/svr4/svr4_sockio.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.18 2006/08/04 21:15:09 brooks Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.19 2008/08/17 23:27:27 bz Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -36,6 +36,7 @@
#include <sys/filedesc.h>
#include <sys/sockio.h>
#include <sys/socket.h>
+#include <sys/vimage.h>
#include <net/if.h>
@@ -103,7 +104,7 @@
* entry per physical interface?
*/
IFNET_RLOCK();
- TAILQ_FOREACH(ifp, &ifnet, if_link)
+ TAILQ_FOREACH(ifp, &V_ifnet, if_link)
if (TAILQ_EMPTY(&ifp->if_addrhead))
ifnum++;
else
==== //depot/projects/mpsafetty/sys/compat/svr4/svr4_stat.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.24 2008/07/05 13:10:10 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.25 2008/08/17 23:27:27 bz Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,6 +43,7 @@
#include <sys/sysctl.h>
#include <sys/sysproto.h>
#include <sys/un.h>
+#include <sys/vimage.h>
#include <vm/vm.h>
@@ -426,7 +427,7 @@
break;
case SVR4_SI_HOSTNAME:
- str = hostname;
+ str = V_hostname;
break;
case SVR4_SI_RELEASE:
@@ -455,7 +456,7 @@
case SVR4_SI_SRPC_DOMAIN:
/* XXXRW: locking? */
- str = domainname;
+ str = V_domainname;
break;
case SVR4_SI_PLATFORM:
==== //depot/projects/mpsafetty/sys/conf/files.i386#5 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.i386,v 1.603 2008/08/15 20:58:57 kmacy Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.604 2008/08/17 23:44:09 kmacy Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -276,7 +276,7 @@
i386/i386/io.c optional io
i386/i386/io_apic.c optional apic
i386/i386/k6_mem.c optional mem
-i386/i386/legacy.c standard
+i386/i386/legacy.c optional native
i386/i386/local_apic.c optional apic
i386/i386/locore.s optional native no-obj
i386/xen/locore.s optional xen no-obj
==== //depot/projects/mpsafetty/sys/conf/options#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.633 2008/07/18 14:44:51 dwmalone Exp $
+# $FreeBSD: src/sys/conf/options,v 1.634 2008/08/17 23:27:27 bz Exp $
#
# On the handling of kernel options
#
@@ -765,3 +765,6 @@
#Disable code to dispatch tcp offloading
TCP_OFFLOAD_DISABLE opt_inet.h
+
+# Virtualize the network stack
+VIMAGE
==== //depot/projects/mpsafetty/sys/contrib/altq/altq/altq_subr.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/contrib/altq/altq/altq_subr.c,v 1.10 2007/07/12 17:00:51 njl Exp $ */
+/* $FreeBSD: src/sys/contrib/altq/altq/altq_subr.c,v 1.11 2008/08/17 23:27:27 bz Exp $ */
/* $KAME: altq_subr.c,v 1.21 2003/11/06 06:32:53 kjc Exp $ */
/*
@@ -77,6 +77,7 @@
#include <sys/bus.h>
#include <sys/cpu.h>
#include <sys/eventhandler.h>
+#include <sys/vimage.h>
#include <machine/clock.h>
#endif
#if defined(__i386__)
@@ -460,7 +461,7 @@
#if defined(__FreeBSD__) && (__FreeBSD_version >= 500000)
IFNET_RLOCK();
#endif
- for (ifp = TAILQ_FIRST(&ifnet); ifp; ifp = TAILQ_NEXT(ifp, if_list)) {
+ for (ifp = TAILQ_FIRST(&V_ifnet); ifp; ifp = TAILQ_NEXT(ifp, if_list)) {
/* read from if_snd unlocked */
if (!TBR_IS_ENABLED(&ifp->if_snd))
continue;
==== //depot/projects/mpsafetty/sys/contrib/ipfilter/netinet/fil.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.55 2007/11/26 08:18:19 darrenr Exp $ */
+/* $FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.56 2008/08/17 23:27:27 bz Exp $ */
/*
* Copyright (C) 1993-2003 by Darren Reed.
@@ -33,6 +33,9 @@
# if (__FreeBSD_version == 400019)
# define CSUM_DELAY_DATA
# endif
+# if (__FreeBSD_version >= 800044)
+# include <sys/vimage.h>
+# endif
# endif
# include <sys/filio.h>
#else
@@ -155,7 +158,7 @@
#if !defined(lint)
static const char sccsid[] = "@(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed";
-static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.55 2007/11/26 08:18:19 darrenr Exp $";
+static const char rcsid[] = "@(#)$FreeBSD: src/sys/contrib/ipfilter/netinet/fil.c,v 1.56 2008/08/17 23:27:27 bz Exp $";
/* static const char rcsid[] = "@(#)$Id: fil.c,v 2.243.2.125 2007/10/10 09:27:20 darrenr Exp $"; */
#endif
==== //depot/projects/mpsafetty/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.10 2008/05/09 23:02:55 julian Exp $ */
+/* $FreeBSD: src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c,v 1.11 2008/08/17 23:27:27 bz Exp $ */
/*
* Copyright (C) 1993-2003 by Darren Reed.
@@ -62,6 +62,12 @@
#else
# include <sys/select.h>
#endif
+#if __FreeBSD_version >= 800044
+# 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
@@ -234,7 +240,7 @@
fr_running = 1;
if (fr_control_forwarding & 1)
- ipforwarding = 1;
+ V_ipforwarding = 1;
SPL_X(s);
#if (__FreeBSD_version >= 300000)
@@ -257,7 +263,7 @@
int s;
#endif
if (fr_control_forwarding & 2)
- ipforwarding = 0;
+ V_ipforwarding = 0;
SPL_NET(s);
@@ -652,11 +658,11 @@
ip->ip_tos = oip->ip_tos;
ip->ip_id = fin->fin_ip->ip_id;
#if (__FreeBSD_version > 460000)
- ip->ip_off = path_mtu_discovery ? IP_DF : 0;
+ ip->ip_off = V_path_mtu_discovery ? IP_DF : 0;
#else
ip->ip_off = 0;
#endif
- ip->ip_ttl = ip_defttl;
+ ip->ip_ttl = V_ip_defttl;
ip->ip_sum = 0;
hlen = sizeof(*oip);
break;
==== //depot/projects/mpsafetty/sys/contrib/pf/net/pf.c#3 (text+ko) ====
@@ -41,7 +41,7 @@
#include "opt_inet6.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.55 2008/08/04 14:42:09 mlaier Exp $");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.56 2008/08/17 23:27:27 bz Exp $");
#endif
#ifdef __FreeBSD__
@@ -92,6 +92,7 @@
#include <sys/kthread.h>
#include <sys/lock.h>
#include <sys/sx.h>
+#include <sys/vimage.h>
#else
#include <sys/rwlock.h>
#endif
@@ -1917,13 +1918,13 @@
h->ip_hl = sizeof(*h) >> 2;
h->ip_tos = IPTOS_LOWDELAY;
#ifdef __FreeBSD__
- h->ip_off = path_mtu_discovery ? IP_DF : 0;
+ h->ip_off = V_path_mtu_discovery ? IP_DF : 0;
h->ip_len = len;
#else
h->ip_off = htons(ip_mtudisc ? IP_DF : 0);
h->ip_len = htons(len);
#endif
- h->ip_ttl = ttl ? ttl : ip_defttl;
+ h->ip_ttl = ttl ? ttl : V_ip_defttl;
h->ip_sum = 0;
if (eh == NULL) {
#ifdef __FreeBSD__
@@ -2954,7 +2955,7 @@
sport = pd->hdr.tcp->th_sport;
dport = pd->hdr.tcp->th_dport;
#ifdef __FreeBSD__
- pi = &tcbinfo;
+ pi = &V_tcbinfo;
#else
tb = &tcbtable;
#endif
@@ -2965,7 +2966,7 @@
sport = pd->hdr.udp->uh_sport;
dport = pd->hdr.udp->uh_dport;
#ifdef __FreeBSD__
- pi = &udbinfo;
+ pi = &V_udbinfo;
#else
tb = &udbtable;
#endif
@@ -3103,7 +3104,7 @@
int hlen;
u_int8_t hdr[60];
u_int8_t *opt, optlen;
- u_int16_t mss = tcp_mssdflt;
+ u_int16_t mss = V_tcp_mssdflt;
hlen = th_off << 2; /* hlen <= sizeof(hdr) */
if (hlen <= sizeof(struct tcphdr))
@@ -3148,7 +3149,7 @@
#endif /* INET6 */
struct rtentry *rt = NULL;
int hlen = 0; /* make the compiler happy */
- u_int16_t mss = tcp_mssdflt;
+ u_int16_t mss = V_tcp_mssdflt;
switch (af) {
#ifdef INET
@@ -3196,7 +3197,7 @@
if (rt && rt->rt_ifp) {
mss = rt->rt_ifp->if_mtu - hlen - sizeof(struct tcphdr);
- mss = max(tcp_mssdflt, mss);
+ mss = max(V_tcp_mssdflt, mss);
RTFREE(rt);
}
mss = min(mss, offer);
@@ -3252,7 +3253,7 @@
u_short reason;
int rewrite = 0;
int tag = -1, rtableid = -1;
- u_int16_t mss = tcp_mssdflt;
+ u_int16_t mss = V_tcp_mssdflt;
int asd = 0;
int match = 0;
@@ -6152,7 +6153,7 @@
if (r->rt == PF_FASTROUTE) {
in_rtalloc(ro, 0);
if (ro->ro_rt == 0) {
- ipstat.ips_noroute++;
+ V_ipstat.ips_noroute++;
goto bad;
}
@@ -6283,16 +6284,16 @@
if ((ifp->if_capabilities & IFCAP_CSUM_IPv4) &&
ifp->if_bridge == NULL) {
m0->m_pkthdr.csum_flags |= M_IPV4_CSUM_OUT;
- ipstat.ips_outhwcsum++;
+ V_ipstat.ips_outhwcsum++;
} else {
ip->ip_sum = 0;
ip->ip_sum = in_cksum(m0, ip->ip_hl << 2);
}
/* Update relevant hardware checksum stats for TCP/UDP */
if (m0->m_pkthdr.csum_flags & M_TCPV4_CSUM_OUT)
- tcpstat.tcps_outhwcsum++;
+ V_tcpstat.tcps_outhwcsum++;
else if (m0->m_pkthdr.csum_flags & M_UDPV4_CSUM_OUT)
- udpstat.udps_outhwcsum++;
+ V_udpstat.udps_outhwcsum++;
error = (*ifp->if_output)(ifp, m0, sintosa(dst), NULL);
goto done;
}
@@ -6302,7 +6303,7 @@
* Must be able to put at least 8 bytes per fragment.
*/
if (ip->ip_off & htons(IP_DF)) {
- ipstat.ips_cantfrag++;
+ V_ipstat.ips_cantfrag++;
if (r->rt != PF_DUPTO) {
#ifdef __FreeBSD__
/* icmp_error() expects host byte ordering */
@@ -6359,7 +6360,7 @@
}
if (error == 0)
- ipstat.ips_fragmented++;
+ V_ipstat.ips_fragmented++;
done:
if (r->rt != PF_DUPTO)
@@ -6632,17 +6633,17 @@
if (sum) {
switch (p) {
case IPPROTO_TCP:
- tcpstat.tcps_rcvbadsum++;
+ V_tcpstat.tcps_rcvbadsum++;
break;
case IPPROTO_UDP:
- udpstat.udps_badsum++;
+ V_udpstat.udps_badsum++;
break;
case IPPROTO_ICMP:
- icmpstat.icps_checksum++;
+ V_icmpstat.icps_checksum++;
break;
#ifdef INET6
case IPPROTO_ICMPV6:
- icmp6stat.icp6s_checksum++;
+ V_icmp6stat.icp6s_checksum++;
break;
#endif /* INET6 */
}
@@ -6728,17 +6729,17 @@
m->m_pkthdr.csum_flags |= flag_bad;
switch (p) {
case IPPROTO_TCP:
- tcpstat.tcps_rcvbadsum++;
+ V_tcpstat.tcps_rcvbadsum++;
break;
case IPPROTO_UDP:
- udpstat.udps_badsum++;
+ V_udpstat.udps_badsum++;
break;
case IPPROTO_ICMP:
- icmpstat.icps_checksum++;
+ V_icmpstat.icps_checksum++;
break;
#ifdef INET6
case IPPROTO_ICMPV6:
- icmp6stat.icp6s_checksum++;
+ V_icmp6stat.icp6s_checksum++;
break;
#endif /* INET6 */
}
==== //depot/projects/mpsafetty/sys/contrib/pf/net/pf_if.c#2 (text+ko) ====
@@ -37,7 +37,7 @@
#include "opt_inet6.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.15 2008/03/29 00:24:36 mlaier Exp $");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_if.c,v 1.16 2008/08/17 23:27:27 bz Exp $");
#endif
#include <sys/param.h>
@@ -54,6 +54,7 @@
#include <sys/device.h>
#endif
#include <sys/time.h>
+#include <sys/vimage.h>
#include <net/if.h>
#include <net/if_types.h>
@@ -141,9 +142,9 @@
struct ifnet *ifp;
IFNET_RLOCK();
- TAILQ_FOREACH(ifg, &ifg_head, ifg_next)
+ TAILQ_FOREACH(ifg, &V_ifg_head, ifg_next)
pfi_attach_ifgroup(ifg);
- TAILQ_FOREACH(ifp, &ifnet, if_link)
+ TAILQ_FOREACH(ifp, &V_ifnet, if_link)
pfi_attach_ifnet(ifp);
IFNET_RUNLOCK();
==== //depot/projects/mpsafetty/sys/contrib/pf/net/pf_ioctl.c#3 (text+ko) ====
@@ -40,7 +40,7 @@
#include "opt_inet6.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.34 2008/07/24 19:05:58 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_ioctl.c,v 1.35 2008/08/17 23:27:27 bz Exp $");
#endif
#ifdef __FreeBSD__
@@ -86,6 +86,7 @@
#include <sys/conf.h>
#include <sys/proc.h>
#include <sys/sysctl.h>
+#include <sys/vimage.h>
#else
#include <sys/timeout.h>
#include <sys/pool.h>
@@ -3713,7 +3714,7 @@
* order to support scoped addresses. In order to support stateful
* filtering we have change this to lo0 as it is the case in IPv4.
*/
- chk = pf_test6(PF_IN, (*m)->m_flags & M_LOOP ? &loif[0] : ifp, m,
+ chk = pf_test6(PF_IN, (*m)->m_flags & M_LOOP ? &V_loif[0] : ifp, m,
NULL, inp);
if (chk && *m) {
m_freem(*m);
==== //depot/projects/mpsafetty/sys/contrib/pf/net/pf_subr.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
#include "opt_inet6.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.4 2007/07/05 15:28:59 mlaier Exp $");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf_subr.c,v 1.5 2008/08/17 23:27:27 bz Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -45,6 +45,7 @@
#include <sys/socketvar.h>
#include <sys/systm.h>
#include <sys/time.h>
+#include <sys/vimage.h>
#include <net/if.h>
#include <net/if_types.h>
@@ -127,9 +128,9 @@
struct pf_state_host *src, *dst;
/* Seed if this is the first use, reseed if requested. */
- if (isn_last_reseed == 0) {
- read_random(&isn_secret, sizeof(isn_secret));
- isn_last_reseed = ticks;
+ if (V_isn_last_reseed == 0) {
+ read_random(&V_isn_secret, sizeof(V_isn_secret));
+ V_isn_last_reseed = ticks;
}
if (s->direction == PF_IN) {
@@ -141,28 +142,28 @@
}
/* Compute the md5 hash and return the ISN. */
- MD5Init(&isn_ctx);
- MD5Update(&isn_ctx, (u_char *) &dst->port, sizeof(u_short));
- MD5Update(&isn_ctx, (u_char *) &src->port, sizeof(u_short));
+ MD5Init(&V_isn_ctx);
+ MD5Update(&V_isn_ctx, (u_char *) &dst->port, sizeof(u_short));
+ MD5Update(&V_isn_ctx, (u_char *) &src->port, sizeof(u_short));
#ifdef INET6
if (s->af == AF_INET6) {
- MD5Update(&isn_ctx, (u_char *) &dst->addr,
+ MD5Update(&V_isn_ctx, (u_char *) &dst->addr,
sizeof(struct in6_addr));
- MD5Update(&isn_ctx, (u_char *) &src->addr,
+ MD5Update(&V_isn_ctx, (u_char *) &src->addr,
sizeof(struct in6_addr));
} else
#endif
{
- MD5Update(&isn_ctx, (u_char *) &dst->addr,
+ MD5Update(&V_isn_ctx, (u_char *) &dst->addr,
sizeof(struct in_addr));
- MD5Update(&isn_ctx, (u_char *) &src->addr,
+ MD5Update(&V_isn_ctx, (u_char *) &src->addr,
sizeof(struct in_addr));
}
- MD5Update(&isn_ctx, (u_char *) &isn_secret, sizeof(isn_secret));
- MD5Final((u_char *) &md5_buffer, &isn_ctx);
+ MD5Update(&V_isn_ctx, (u_char *) &V_isn_secret, sizeof(V_isn_secret));
+ MD5Final((u_char *) &md5_buffer, &V_isn_ctx);
new_isn = (tcp_seq) md5_buffer[0];
- isn_offset += ISN_STATIC_INCREMENT +
+ V_isn_offset += ISN_STATIC_INCREMENT +
(arc4random() & ISN_RANDOM_INCREMENT);
- new_isn += isn_offset;
+ new_isn += V_isn_offset;
return (new_isn);
}
==== //depot/projects/mpsafetty/sys/contrib/rdma/rdma_cma.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.1 2008/05/05 18:35:54 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/contrib/rdma/rdma_cma.c,v 1.2 2008/08/17 23:27:27 bz Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
@@ -46,6 +46,7 @@
#include <sys/taskqueue.h>
#include <sys/priv.h>
#include <sys/syslog.h>
+#include <sys/vimage.h>
#include <netinet/in.h>
#include <netinet/in_pcb.h>
@@ -1962,18 +1963,18 @@
if (ret)
goto err1;
- if (port > ipport_lastauto) {
- if (next_port != ipport_firstauto) {
+ if (port > V_ipport_lastauto) {
+ if (next_port != V_ipport_firstauto) {
kvl_delete(ps, port);
- next_port = ipport_firstauto;
+ next_port = V_ipport_firstauto;
goto retry;
}
ret = EADDRNOTAVAIL;
goto err2;
}
- if (port == ipport_lastauto)
- next_port = ipport_firstauto;
+ if (port == V_ipport_lastauto)
+ next_port = V_ipport_firstauto;
else
next_port = port + 1;
@@ -1997,7 +1998,7 @@
sin = (struct sockaddr_in *) &id_priv->id.route.addr.src_addr;
snum = ntohs(sin->sin_port);
- if (snum <= ipport_reservedhigh && snum >= ipport_reservedlow &&
+ if (snum <= V_ipport_reservedhigh && snum >= V_ipport_reservedlow &&
priv_check(curthread, PRIV_NETINET_RESERVEDPORT))
return (EACCES);
@@ -2917,8 +2918,8 @@
arc4rand(&next_port, sizeof next_port, 0);
next_port = ((unsigned int) next_port %
- (ipport_lastauto - ipport_firstauto)) +
- ipport_firstauto;
+ (V_ipport_lastauto - V_ipport_firstauto)) +
+ V_ipport_firstauto;
cma_wq = taskqueue_create("rdma_cm", M_NOWAIT, taskqueue_thread_enqueue,
&cma_wq);
==== //depot/projects/mpsafetty/sys/ddb/db_textdump.c#2 (text+ko) ====
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.3 2008/01/31 16:22:14 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_textdump.c,v 1.4 2008/08/17 23:27:27 bz Exp $");
#include "opt_config.h"
@@ -68,6 +68,7 @@
#include <sys/msgbuf.h>
#include <sys/sysctl.h>
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list