PERFORCE change 141692 for review

[Julian Elischer]

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

Change 141692 by julian at julian_trafmon1 on 2008/05/16 04:38:26

	 links too!

Affected files ...

.. //depot/projects/vimage/src/sys/kern/kern_vimage.c#59 edit
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#2 edit
.. //depot/projects/vimage/src/sys/netinet/in_rmx.c#13 edit
.. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#12 edit
.. //depot/projects/vimage/src/sys/rpc/auth_unix.c#2 edit
.. //depot/projects/vimage/src/sys/rpc/authunix_prot.c#2 edit

Differences ...

==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#59 (text+ko) ====

@@ -574,8 +574,10 @@
 			oldcred->cr_vimage->v_procg->nprocs--;
 			refcount_release(&oldcred->cr_vimage->vi_ucredrefc);
 			P_TO_VPROCG(p)->nprocs++;
+#if 0
 			sched_load_reassign(oldcred->cr_vimage->v_procg,
 			    newcred->cr_vimage->v_procg);
+#endif
 			sx_xunlock(&allproc_lock);
 			crfree(oldcred);
 			break;

==== //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#2 (text+ko) ====

@@ -28,14 +28,17 @@
 
 #include "opt_ddb.h"
 #include "opt_wlan.h"
+#include "opt_vimage.h"
 
 #ifdef DDB
+
 /*
  * IEEE 802.11 DDB support
  */
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/kernel.h>
+#include <sys/vimage.h>
  
 #include <sys/socket.h>
 
@@ -43,6 +46,7 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
+#include <net/vnet.h>
 #include <net/ethernet.h>
 
 #include <net80211/ieee80211_var.h>
@@ -193,7 +197,9 @@
 			break;
 		}
 
-	TAILQ_FOREACH(ifp, &ifnet, if_list)
+	VNET_ITERLOOP_BEGIN();
+	INIT_VNET_NET(vnet_iter);
+	TAILQ_FOREACH(ifp, &V_ifnet, if_list)
 		if (ifp->if_type == IFT_IEEE80211) {
 			const struct ieee80211com *ic = ifp->if_l2com;
 
@@ -208,6 +214,7 @@
 			} else
 				_db_show_com(ic, 1, 1, 1);
 		}
+	VNET_ITERLOOP_END();
 }
 
 static void

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

@@ -325,7 +325,7 @@
 	INIT_VNET_INET((struct vnet *) rock);
 	struct timeval atv;
 
-	KASSERT((rock == (void *)rt_tables[0][AF_INET]),
+	KASSERT((rock == (void *)V_rt_tables[0][AF_INET]),
 			("in_rtqtimo: unexpected arg"));
 	for (fibnum = 0; fibnum < rt_numfibs; fibnum++) {
 		if ((newrock = V_rt_tables[fibnum][AF_INET]) != NULL)

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

@@ -341,7 +341,7 @@
 	CURVNET_SET_QUIET((struct vnet *) rock);
 	INIT_VNET_NET((struct vnet *) rock);
 	INIT_VNET_INET6((struct vnet *) rock);
-	struct radix_node_head *rnh = V_rt_tables[AF_INET6];
+	struct radix_node_head *rnh = V_rt_tables[0][AF_INET6];
 	struct rtqk_arg arg;
 	struct timeval atv;
 	static time_t last_adjusted_timeout = 0;
@@ -429,7 +429,7 @@
 	CURVNET_SET_QUIET((struct vnet *) rock);
 	INIT_VNET_NET((struct vnet *) rock);
 	INIT_VNET_INET6((struct vnet *) rock);
-	struct radix_node_head *rnh = V_rt_tables[AF_INET6];
+	struct radix_node_head *rnh = V_rt_tables[0][AF_INET6];
 	struct mtuex_arg arg;
 	struct timeval atv;
 
@@ -479,7 +479,6 @@
 int
 in6_inithead(void **head, int off)
 {
-	INIT_VNET_NET(curvnet);
 	INIT_VNET_INET6(curvnet);
 	struct radix_node_head *rnh;
 

==== //depot/projects/vimage/src/sys/rpc/auth_unix.c#2 (text+ko) ====


==== //depot/projects/vimage/src/sys/rpc/authunix_prot.c#2 (text+ko) ====

@@ -43,10 +43,14 @@
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
 
+
+#include "opt_vimage.h"
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/ucred.h>
+#include <sys/vimage.h>
 
 #include <rpc/types.h>
 #include <rpc/xdr.h>
@@ -66,9 +70,11 @@
 	uint32_t namelen;
 	uint32_t ngroups, i;
 	uint32_t junk;
+/* XXX VIMAGE */
+	INIT_VPROCG(TD_TO_VPROCG(&thread0));
 
 	if (xdrs->x_op == XDR_ENCODE) {
-		namelen = strlen(hostname);
+		namelen = strlen(V_hostname);
 	} else {
 		namelen = 0;
 	}
@@ -82,7 +88,7 @@
 	 * Ignore the hostname on decode.
 	 */
 	if (xdrs->x_op == XDR_ENCODE) {
-		if (!xdr_opaque(xdrs, hostname, namelen))
+		if (!xdr_opaque(xdrs, V_hostname, namelen))
 			return (FALSE);
 	} else {
 		xdr_setpos(xdrs, xdr_getpos(xdrs) + RNDUP(namelen));