PERFORCE change 148293 for review

Julian Elischer julian at FreeBSD.org
Sun Aug 24 21:31:14 UTC 2008


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

Change 148293 by julian at julian_trafmon1 on 2008/08/24 21:31:11

	VIMAGE kernel now compiles

Affected files ...

.. //depot/projects/vimage/src/sys/conf/options#30 edit
.. //depot/projects/vimage/src/sys/ddb/db_textdump.c#5 edit
.. //depot/projects/vimage/src/sys/net/if.c#35 edit
.. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#18 edit

Differences ...

==== //depot/projects/vimage/src/sys/conf/options#30 (text+ko) ====

@@ -770,4 +770,4 @@
 TCP_OFFLOAD_DISABLE	opt_inet.h
 
 # Virtualize the network stack
-VIMAGE
+VIMAGE			opt_global.h

==== //depot/projects/vimage/src/sys/ddb/db_textdump.c#5 (text+ko) ====

@@ -184,7 +184,6 @@
 mkdumpheader(struct kerneldumpheader *kdh, uint32_t archver,
     uint64_t dumplen, uint32_t blksz)
 {
-	INIT_VPROCG(TD_TO_VPROCG(&thread0));
 
 	bzero(kdh, sizeof(*kdh));
 	strncpy(kdh->magic, TEXTDUMPMAGIC, sizeof(kdh->magic));

==== //depot/projects/vimage/src/sys/net/if.c#35 (text+ko) ====

@@ -198,7 +198,7 @@
 	return (ifp);
 }
 
-static void
+void
 ifnet_setbyindex(u_short idx, struct ifnet *ifp)
 {
 
@@ -374,6 +374,7 @@
 static void
 if_init(void *dummy __unused)
 {
+	INIT_VNET_NET(curvnet);
 
 #ifdef VIMAGE
 	vnet_mod_register(&vnet_net_modinfo);

==== //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#18 (text+ko) ====

@@ -248,6 +248,7 @@
 static void
 in6_clsroute(struct radix_node *rn, struct radix_node_head *head)
 {
+	INIT_VNET_INET6(curvnet);
 	struct rtentry *rt = (struct rtentry *)rn;
 
 	RT_LOCK_ASSERT(rt);
@@ -292,6 +293,7 @@
 static int
 in6_rtqkill(struct radix_node *rn, void *rock)
 {
+	INIT_VNET_INET6(curvnet);
 	struct rtqk_arg *ap = rock;
 	struct rtentry *rt = (struct rtentry *)rn;
 	int err;


More information about the p4-projects mailing list