PERFORCE change 161683 for review

[Marko Zec]

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

Change 161683 by zec at 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.