PERFORCE change 160433 for review

Marko Zec zec at FreeBSD.org
Fri Apr 10 02:34:25 PDT 2009


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

Change 160433 by zec at zec_tpx32 on 2009/04/10 09:33:48

	WS trim.

Affected files ...

.. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#11 edit
.. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#33 edit

Differences ...

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

@@ -184,7 +184,7 @@
 		if (vml->vml_modinfo->vmi_symmap == NULL)
 			continue;
 		for (mapentry = vml->vml_modinfo->vmi_symmap;
-		     mapentry->name != NULL; mapentry++) {
+		    mapentry->name != NULL; mapentry++) {
 			if (strcmp(symstr, mapentry->name) == 0) {
 				lookup->symvalue = (u_long) mapentry->base;
 				lookup->symsize = mapentry->size;

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

@@ -71,52 +71,52 @@
 	const char			*vml_iname;
 };
 
-#define VNET_SYMMAP(mod, name)						\
+#define	VNET_SYMMAP(mod, name)						\
 	{ #name, &(vnet_ ## mod ## _0._ ## name),			\
 	sizeof(vnet_ ## mod ## _0._ ## name) }
 
-#define VNET_SYMMAP_END		{ NULL, 0 }
+#define	VNET_SYMMAP_END		{ NULL, 0 }
 
 /* statefull modules */
-#define VNET_MOD_NET		 0
-#define VNET_MOD_NETGRAPH	 1
-#define VNET_MOD_INET		 2
-#define VNET_MOD_INET6		 3
-#define VNET_MOD_IPSEC		 4
-#define VNET_MOD_IPFW		 5
-#define VNET_MOD_DUMMYNET	 6
-#define VNET_MOD_PF		 7
-#define VNET_MOD_ALTQ		 8
-#define VNET_MOD_IPX		 9
-#define VNET_MOD_ATALK		10
-#define VNET_MOD_ACCF_HTTP	11
-#define VNET_MOD_IGMP		12
+#define	VNET_MOD_NET		 0
+#define	VNET_MOD_NETGRAPH	 1
+#define	VNET_MOD_INET		 2
+#define	VNET_MOD_INET6		 3
+#define	VNET_MOD_IPSEC		 4
+#define	VNET_MOD_IPFW		 5
+#define	VNET_MOD_DUMMYNET	 6
+#define	VNET_MOD_PF		 7
+#define	VNET_MOD_ALTQ		 8
+#define	VNET_MOD_IPX		 9
+#define	VNET_MOD_ATALK		10
+#define	VNET_MOD_ACCF_HTTP	11
+#define	VNET_MOD_IGMP		12
 
 /* stateless modules */
-#define VNET_MOD_NG_ETHER	20
-#define VNET_MOD_NG_IFACE	21
-#define VNET_MOD_NG_EIFACE	22
-#define VNET_MOD_ESP		23
-#define VNET_MOD_IPIP		24
-#define VNET_MOD_AH		25
-#define VNET_MOD_IPCOMP	 	26	
-#define VNET_MOD_GIF		27
-#define VNET_MOD_ARP		28
-#define VNET_MOD_RTABLE		29
-#define VNET_MOD_LOIF		30
-#define VNET_MOD_DOMAIN		31
-#define VNET_MOD_DYNAMIC_START	32
-#define VNET_MOD_MAX		64
+#define	VNET_MOD_NG_ETHER	20
+#define	VNET_MOD_NG_IFACE	21
+#define	VNET_MOD_NG_EIFACE	22
+#define	VNET_MOD_ESP		23
+#define	VNET_MOD_IPIP		24
+#define	VNET_MOD_AH		25
+#define	VNET_MOD_IPCOMP	 	26	
+#define	VNET_MOD_GIF		27
+#define	VNET_MOD_ARP		28
+#define	VNET_MOD_RTABLE		29
+#define	VNET_MOD_LOIF		30
+#define	VNET_MOD_DOMAIN		31
+#define	VNET_MOD_DYNAMIC_START	32
+#define	VNET_MOD_MAX		64
 
 /* Sysctl virtualization macros need these name mappings bellow */
-#define V_MOD_vnet_net		VNET_MOD_NET
-#define V_MOD_vnet_netgraph	VNET_MOD_NETGRAPH
-#define V_MOD_vnet_inet		VNET_MOD_INET
-#define V_MOD_vnet_inet6	VNET_MOD_INET6
-#define V_MOD_vnet_ipfw		VNET_MOD_IPFW
-#define V_MOD_vnet_pf		VNET_MOD_PF
-#define V_MOD_vnet_gif		VNET_MOD_GIF
-#define V_MOD_vnet_ipsec	VNET_MOD_IPSEC
+#define	V_MOD_vnet_net		VNET_MOD_NET
+#define	V_MOD_vnet_netgraph	VNET_MOD_NETGRAPH
+#define	V_MOD_vnet_inet		VNET_MOD_INET
+#define	V_MOD_vnet_inet6	VNET_MOD_INET6
+#define	V_MOD_vnet_ipfw		VNET_MOD_IPFW
+#define	V_MOD_vnet_pf		VNET_MOD_PF
+#define	V_MOD_vnet_gif		VNET_MOD_GIF
+#define	V_MOD_vnet_ipsec	VNET_MOD_IPSEC
 
 int	vi_symlookup(struct kld_sym_lookup *, char *);
 void	vnet_mod_register(const struct vnet_modinfo *);


More information about the p4-projects mailing list