From owner-p4-projects@FreeBSD.ORG Wed Jun 18 22:17:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF00D1065678; Wed, 18 Jun 2008 22:17:17 +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 B0FB21065672 for ; Wed, 18 Jun 2008 22:17:17 +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 9FADF8FC25 for ; Wed, 18 Jun 2008 22:17:17 +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 m5IMHHli040236 for ; Wed, 18 Jun 2008 22:17:17 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5IMHHTX040234 for perforce@freebsd.org; Wed, 18 Jun 2008 22:17:17 GMT (envelope-from julian@freebsd.org) Date: Wed, 18 Jun 2008 22:17:17 GMT Message-Id: <200806182217.m5IMHHTX040234@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 143728 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: Wed, 18 Jun 2008 22:17:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=143728 Change 143728 by julian@julian_trafmon1 on 2008/06/18 22:16:25 More whitespace changes Affected files ... .. //depot/projects/vimage-devel/src/sys/kern/kern_exit.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_fork.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_switch.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_timeout.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/kern_vimage.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/vimage-devel/src/sys/kern/sys_socket.c#3 integrate .. //depot/projects/vimage-devel/src/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/vimage-devel/src/sys/sys/vimage.h#5 integrate Differences ... ==== //depot/projects/vimage-devel/src/sys/kern/kern_exit.c#3 (text+ko) ==== @@ -179,7 +179,6 @@ } KASSERT(p->p_numthreads == 1, ("exit1: proc %p exiting with %d threads", p, p->p_numthreads)); - /* * Wakeup anyone in procfs' PIOCWAIT. They should have a hold * on our vmspace, so we should block below until they have @@ -699,7 +698,6 @@ AUDIT_ARG(pid, pid); q = td->td_proc; - if (pid == 0) { PROC_LOCK(q); pid = -q->p_pgid; ==== //depot/projects/vimage-devel/src/sys/kern/kern_fork.c#3 (text+ko) ==== @@ -516,8 +516,10 @@ td2->td_sigmask = td->td_sigmask; td2->td_flags = TDF_INMEM; - td2->td_vnet = NULL; /* XXX */ - td2->td_vnet_lpush = NULL; /* XXX */ +#ifdef VIMAGE + td2->td_vnet = NULL; + td2->td_vnet_lpush = NULL; +#endif /* * Duplicate sub-structures as needed. ==== //depot/projects/vimage-devel/src/sys/kern/kern_switch.c#3 (text+ko) ==== @@ -455,7 +455,6 @@ return (NULL); } - /* * Remove the thread from the queue specified by its priority, and clear the * corresponding status bit if the queue becomes empty. ==== //depot/projects/vimage-devel/src/sys/kern/kern_timeout.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/kern/kern_vimage.c#4 (text+ko) ==== @@ -132,16 +132,15 @@ static TAILQ_HEAD(vnet_modlink_head, vnet_modlink) vnet_modlink_head; static TAILQ_HEAD(vnet_modpending_head, vnet_modlink) vnet_modpending_head; -void vnet_mod_register(vmi) - const struct vnet_modinfo *vmi; +void +vnet_mod_register(const struct vnet_modinfo *vmi) { vnet_mod_register_multi(vmi, NULL, NULL); } -void vnet_mod_register_multi(vmi, iarg, iname) - const struct vnet_modinfo *vmi; - const void *iarg; - const char *iname; +void +vnet_mod_register_multi(const struct vnet_modinfo *vmi, void *iarg, + char *iname) { struct vnet_modlink *vml, *vml_iter; @@ -186,8 +185,8 @@ vnet_mod_complete_registration(vml); } -void vnet_mod_complete_registration(vml) -struct vnet_modlink *vml; +void +vnet_mod_complete_registration(struct vnet_modlink *vml) { struct vnet_modlink *vml_iter; @@ -217,16 +216,15 @@ } while (vml_iter != NULL); } -void vnet_mod_deregister(vmi) - const struct vnet_modinfo *vmi; +void +vnet_mod_deregister(const struct vnet_modinfo *vmi) { vnet_mod_deregister_multi(vmi, NULL, NULL); } -void vnet_mod_deregister_multi(vmi, iarg, iname) - const struct vnet_modinfo *vmi; - const void *iarg; - const char *iname; +void +vnet_mod_deregister_multi(const struct vnet_modinfo *vmi, void *iarg, + char *iname) { struct vnet_modlink *vml; @@ -245,8 +243,8 @@ vi_free(vml, M_VIMAGE); } -struct vimage *vnet2vimage(vnet) - struct vnet *vnet; +struct vimage * +vnet2vimage(struct vnet *vnet) { struct vimage *vip; @@ -257,16 +255,15 @@ panic("vnet2vimage"); /* must never happen */ } -char *vnet_name(vnet) - struct vnet *vnet; +char * +vnet_name(struct vnet *vnet) { return(vnet2vimage(vnet)->vi_name); } int -vi_child_of(parent, child) - struct vimage *parent, *child; +vi_child_of(struct vimage *parent, struct vimage *child) { if (child == parent) return (0); @@ -354,10 +351,7 @@ * interface is moved to the parent vnet. */ int -vi_if_move(vi_req, ifp, vip) - struct vi_req *vi_req; - struct ifnet *ifp; - struct vimage *vip; +vi_if_move(struct vi_req *vi_req, struct ifnet *ifp, struct vimage *vip) { struct vimage *new_vip; struct vnet *new_vnet = NULL; @@ -498,10 +492,7 @@ int -vi_td_ioctl(cmd, vi_req, td) - u_long cmd; - struct vi_req *vi_req; - struct thread *td; +vi_td_ioctl(u_long cmd, struct vi_req *vi_req, struct thread *td) { int error; struct vimage *vip = TD_TO_VIMAGE(td); @@ -608,9 +599,7 @@ int -vi_symlookup(lookup, symstr) - struct kld_sym_lookup *lookup; - char *symstr; +vi_symlookup(struct kld_sym_lookup *lookup, char *symstr) { struct vnet_modlink *vml; @@ -793,8 +782,7 @@ return (0); } -static int vnet_mod_constructor(vml) -struct vnet_modlink *vml; +static int vnet_mod_constructor(struct vnet_modlink *vml) { const struct vnet_modinfo *vmi = vml->vml_modinfo; @@ -824,8 +812,7 @@ return 0; } -static int vnet_mod_destructor(vml) -struct vnet_modlink *vml; +static int vnet_mod_destructor(struct vnet_modlink *vml) { const struct vnet_modinfo *vmi = vml->vml_modinfo; ==== //depot/projects/vimage-devel/src/sys/kern/sched_4bsd.c#4 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/kern/sys_socket.c#3 (text+ko) ==== @@ -287,8 +287,7 @@ fp->f_ops = &badfileops; fp->f_data = NULL; - if (so) { + if (so) error = soclose(so); - } return (error); } ==== //depot/projects/vimage-devel/src/sys/kern/uipc_domain.c#3 (text+ko) ==== ==== //depot/projects/vimage-devel/src/sys/sys/vimage.h#5 (text+ko) ==== @@ -340,10 +340,8 @@ #ifdef VIMAGE void vnet_mod_register(const struct vnet_modinfo *); void vnet_mod_deregister(const struct vnet_modinfo *); -void vnet_mod_register_multi(const struct vnet_modinfo *, const void *, - const char *); -void vnet_mod_deregister_multi(const struct vnet_modinfo *, const void *, - const char *); +void vnet_mod_register_multi(const struct vnet_modinfo *, void *, char *); +void vnet_mod_deregister_multi(const struct vnet_modinfo *, void *, char *); void printcpuinfo(struct vprocg *); void vi_cpu_acct(void *);