Commit step 1 of the vimage project, (network stack)

virtualization work done by Marko Zec (zec@).

This is the first in a series of commits over the course
of the next few weeks.

Mark all uses of global variables to be virtualized
with a V_ prefix.
Use macros to map them back to their global names for
now, so this is a NOP change only.

We hope to have caught at least 85-90% of what is needed
so we do not invalidate a lot of outstanding patches again.

Obtained from:	//depot/projects/vimage-commit2/...
Reviewed by:	brooks, des, ed, mav, julian,
		jamie, kris, rwatson, zec, ...
		(various people I forgot, different versions)
		md5 (with a bit of help)
Sponsored by:	NLnet Foundation, The FreeBSD Foundation
X-MFC after:	never
V_Commit_Message_Reviewed_By:	more people than the patch

5 files changed, 12 insertions, 7 deletions

diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c
index b9efe24..a1ba436 100644
--- a/sys/kern/kern_jail.c
+++ b/sys/kern/kern_jail.c
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/syscallsubr.h>
 #include <sys/sysctl.h>
 #include <sys/vnode.h>
+#include <sys/vimage.h>
 #include <net/if.h>
 #include <netinet/in.h>
 
@@ -481,7 +482,7 @@ getcredhostname(struct ucred *cred, char *buf, size_t size)
 		mtx_unlock(&cred->cr_prison->pr_mtx);
 	} else {
 		mtx_lock(&hostname_mtx);
-		strlcpy(buf, hostname, size);
+		strlcpy(buf, V_hostname, size);
 		mtx_unlock(&hostname_mtx);
 	}
 }
diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c
index e178ce6..e7a1333 100644
--- a/sys/kern/kern_mib.c
+++ b/sys/kern/kern_mib.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/jail.h>
 #include <sys/smp.h>
 #include <sys/unistd.h>
+#include <sys/vimage.h>
 
 SYSCTL_NODE(, 0,	  sysctl, CTLFLAG_RW, 0,
 	"Sysctl internal magic");
@@ -249,13 +250,13 @@ sysctl_hostname(SYSCTL_HANDLER_ARGS)
 		}
 	} else {
 		mtx_lock(&hostname_mtx);
-		bcopy(hostname, tmphostname, MAXHOSTNAMELEN);
+		bcopy(V_hostname, tmphostname, MAXHOSTNAMELEN);
 		mtx_unlock(&hostname_mtx);
 		error = sysctl_handle_string(oidp, tmphostname,
 		    sizeof tmphostname, req);
 		if (req->newptr != NULL && error == 0) {
 			mtx_lock(&hostname_mtx);
-			bcopy(tmphostname, hostname, MAXHOSTNAMELEN);
+			bcopy(tmphostname, V_hostname, MAXHOSTNAMELEN);
 			mtx_unlock(&hostname_mtx);
 		}
 	}
diff --git a/sys/kern/kern_poll.c b/sys/kern/kern_poll.c
index 64fa7af..2bd1550 100644
--- a/sys/kern/kern_poll.c
+++ b/sys/kern/kern_poll.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
 #include <sys/kthread.h>
+#include <sys/vimage.h>
 
 static void netisr_poll(void);		/* the two netisr handlers      */
 static void netisr_pollmore(void);
@@ -537,7 +538,7 @@ poll_switch(SYSCTL_HANDLER_ARGS)
 	polling = val;
 
 	IFNET_RLOCK();
-	TAILQ_FOREACH(ifp, &ifnet, if_link) {
+	TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
 		if (ifp->if_capabilities & IFCAP_POLLING) {
 			struct ifreq ifr;
 
diff --git a/sys/kern/kern_uuid.c b/sys/kern/kern_uuid.c
index 8613b18..61e9ce9 100644
--- a/sys/kern/kern_uuid.c
+++ b/sys/kern/kern_uuid.c
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysproto.h>
 #include <sys/systm.h>
 #include <sys/uuid.h>
+#include <sys/vimage.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
@@ -93,7 +94,7 @@ uuid_node(uint16_t *node)
 	int i;
 
 	IFNET_RLOCK();
-	TAILQ_FOREACH(ifp, &ifnet, if_link) {
+	TAILQ_FOREACH(ifp, &V_ifnet, if_link) {
 		/* Walk the address list */
 		TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
 			sdl = (struct sockaddr_dl*)ifa->ifa_addr;
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c
index 0a4f42d..9a30d17 100644
--- a/sys/kern/kern_xxx.c
+++ b/sys/kern/kern_xxx.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
 #include <sys/utsname.h>
+#include <sys/vimage.h>
 
 
 #if defined(COMPAT_43)
@@ -249,7 +250,7 @@ getdomainname(td, uap)
 	int domainnamelen;
 
 	mtx_lock(&hostname_mtx);
-	bcopy(domainname, tmpdomainname, sizeof(tmpdomainname));
+	bcopy(V_domainname, tmpdomainname, sizeof(tmpdomainname));
 	mtx_unlock(&hostname_mtx);
 
 	domainnamelen = strlen(tmpdomainname) + 1;
@@ -283,7 +284,7 @@ setdomainname(td, uap)
 	if (error == 0) {
 		tmpdomainname[domainnamelen] = 0;
 		mtx_lock(&hostname_mtx);
-		bcopy(tmpdomainname, domainname, sizeof(domainname));
+		bcopy(tmpdomainname, V_domainname, sizeof(domainname));
 		mtx_unlock(&hostname_mtx);
 	}
 	return (error);