From owner-p4-projects@FreeBSD.ORG  Fri May  4 07:42:41 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EF5CB16A408; Fri,  4 May 2007 07:42:40 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C12D716A401
	for <perforce@FreeBSD.org>; Fri,  4 May 2007 07:42:40 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id B1C5313C459
	for <perforce@FreeBSD.org>; Fri,  4 May 2007 07:42:40 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l447gepX093551
	for <perforce@FreeBSD.org>; Fri, 4 May 2007 07:42:40 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l447geIj093548
	for perforce@freebsd.org; Fri, 4 May 2007 07:42:40 GMT
	(envelope-from zec@FreeBSD.org)
Date: Fri, 4 May 2007 07:42:40 GMT
Message-Id: <200705040742.l447geIj093548@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 119220 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: Fri, 04 May 2007 07:42:41 -0000

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

Change 119220 by zec@zec_tpx32 on 2007/05/04 07:42:26

	Fix a few missing references to virtualized "hostname"
	symbol.

Affected files ...

.. //depot/projects/vimage/src/sys/dev/firewire/firewire.c#3 edit
.. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#4 edit

Differences ...

==== //depot/projects/vimage/src/sys/dev/firewire/firewire.c#3 (text+ko) ====

@@ -35,6 +35,8 @@
  *
  */
 
+#include "opt_vimage.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/types.h>
@@ -44,6 +46,7 @@
 #include <sys/malloc.h>
 #include <sys/conf.h>
 #include <sys/sysctl.h>
+#include <sys/vimage.h>
 
 #if defined(__DragonFly__) || __FreeBSD_version < 500000
 #include <machine/clock.h>	/* for DELAY() */
@@ -612,6 +615,7 @@
 static void
 fw_reset_crom(struct firewire_comm *fc)
 {
+	INIT_VPROCG(&vprocg_0);
 	struct crom_src_buf *buf;
 	struct crom_src *src;
 	struct crom_chunk *root;
@@ -637,7 +641,7 @@
 	crom_add_simple_text(src, root, &buf->vendor, "FreeBSD Project");
 	crom_add_entry(root, CSRKEY_HW, __FreeBSD_version);
 #endif
-	crom_add_simple_text(src, root, &buf->hw, hostname);
+	crom_add_simple_text(src, root, &buf->hw, V_hostname);
 }
 
 /*

==== //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#4 (text+ko) ====

@@ -38,6 +38,7 @@
 
 #include "opt_bootp.h"
 #include "opt_nfsroot.h"
+#include "opt_vimage.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -57,6 +58,7 @@
 #include <sys/sysctl.h>
 #include <sys/vnode.h>
 #include <sys/signalvar.h>
+#include <sys/vimage.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
@@ -399,6 +401,7 @@
 int
 nfs_mountroot(struct mount *mp, struct thread *td)
 {
+	INIT_VPROCG(&vprocg_0);
 	struct nfsv3_diskless *nd = &nfsv3_diskless;
 	struct socket *so;
 	struct vnode *vp;
@@ -507,10 +510,10 @@
 	 * set hostname here and then let the "/etc/rc.xxx" files
 	 * mount the right /var based upon its preset value.
 	 */
-	bcopy(nd->my_hostnam, hostname, MAXHOSTNAMELEN);
-	hostname[MAXHOSTNAMELEN - 1] = '\0';
+	bcopy(nd->my_hostnam, V_hostname, MAXHOSTNAMELEN);
+	V_hostname[MAXHOSTNAMELEN - 1] = '\0';
 	for (i = 0; i < MAXHOSTNAMELEN; i++)
-		if (hostname[i] == '\0')
+		if (V_hostname[i] == '\0')
 			break;
 	inittodr(ntohl(nd->root_time));
 	return (0);