From owner-p4-projects@FreeBSD.ORG  Wed May  6 21:34:46 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E9DA81065672; Wed,  6 May 2009 21:34:45 +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 AB289106564A
	for <perforce@freebsd.org>; Wed,  6 May 2009 21:34:45 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 992FA8FC1E
	for <perforce@freebsd.org>; Wed,  6 May 2009 21:34:45 +0000 (UTC)
	(envelope-from zec@fer.hr)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n46LYjBL037941
	for <perforce@freebsd.org>; Wed, 6 May 2009 21:34:45 GMT
	(envelope-from zec@fer.hr)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n46LYjRa037939
	for perforce@freebsd.org; Wed, 6 May 2009 21:34:45 GMT
	(envelope-from zec@fer.hr)
Date: Wed, 6 May 2009 21:34:45 GMT
Message-Id: <200905062134.n46LYjRa037939@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@fer.hr using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 161683 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 May 2009 21:34:47 -0000

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

Change 161683 by zec@zec_tpx32 on 2009/05/06 21:34:18

	Back out stuff related to management API merge - the
	hostname and domainname virtualization step is largely
	independent from those.

Affected files ...

.. //depot/projects/vimage-commit/src/sys/sys/vimage.h#20 edit

Differences ...

==== //depot/projects/vimage-commit/src/sys/sys/vimage.h#20 (text+ko) ====

@@ -138,15 +138,6 @@
 void	vnet_mod_deregister(const struct vnet_modinfo *);
 void	vnet_mod_deregister_multi(const struct vnet_modinfo *, void *, char *);
 
-int vi_td_ioctl(u_long, struct vi_req *, struct thread *);
-int vi_if_move(struct vi_req *, struct ifnet *, struct vimage *);
-void if_reassign_common(struct ifnet *, struct vnet *, const char *);
-
-struct vimage *vnet2vimage(struct vnet *);
-struct vimage *vimage_by_name(struct vimage *, char *);
-char *vnet_name(struct vnet *);
-int vi_child_of(struct vimage *, struct vimage *);
-
 #endif /* !VIMAGE_GLOBALS */
 
 #ifdef VIMAGE_GLOBALS
@@ -341,27 +332,6 @@
 
 #define	V_hostname		VPROCG(hostname)
 #define	V_domainname		VPROCG(domainname)
-#define	V_morphing_symlinks	VPROCG(morphing_symlinks)
-
-struct vi_req {
-	int	req_action;		/* What to do with this reqest? */
-	u_short vi_proc_count;		/* current number of processes */
-	u_short vi_child_count;		/* current number of child vnets */
-	int	vi_if_count;		/* current number network interfaces */
-	int	vi_sock_count;
-	char	vi_name[MAXPATHLEN];
-	char	vi_if_xname[MAXPATHLEN]; /* XXX should be IFNAMSIZ */
-};
-
-#define	VI_CREATE		0x00000001
-#define	VI_DESTROY		0x00000002
-#define	VI_MODIFY		0x00000004
-#define	VI_SWITCHTO		0x00000008
-#define	VI_IFACE		0x00000010
-
-#define	VI_GET			0x00000100
-#define	VI_GETNEXT		0x00000200
-#define	VI_GETNEXT_RECURSE	0x00000300
 
 /*
  * Size-guards for the vimage structures.