From owner-p4-projects@FreeBSD.ORG Fri May 16 04:38:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B68B1065670; Fri, 16 May 2008 04:38:57 +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 2D267106566B for ; Fri, 16 May 2008 04:38:57 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1C6548FC1B for ; Fri, 16 May 2008 04:38:57 +0000 (UTC) (envelope-from julian@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 m4G4cuZW048486 for ; Fri, 16 May 2008 04:38:56 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4G4cuaW048484 for perforce@freebsd.org; Fri, 16 May 2008 04:38:56 GMT (envelope-from julian@freebsd.org) Date: Fri, 16 May 2008 04:38:56 GMT Message-Id: <200805160438.m4G4cuaW048484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 141692 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: Fri, 16 May 2008 04:38:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=141692 Change 141692 by julian@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 #include #include +#include #include @@ -43,6 +46,7 @@ #include #include #include +#include #include #include @@ -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 #include #include #include +#include #include #include @@ -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));