From owner-svn-src-projects@FreeBSD.ORG  Mon Apr 22 19:38:57 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 054796E;
 Mon, 22 Apr 2013 19:38:57 +0000 (UTC)
 (envelope-from cherry@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EBAF1108A;
 Mon, 22 Apr 2013 19:38:56 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3MJcuj2075509;
 Mon, 22 Apr 2013 19:38:56 GMT (envelope-from cherry@svn.freebsd.org)
Received: (from cherry@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3MJcuru075508;
 Mon, 22 Apr 2013 19:38:56 GMT (envelope-from cherry@svn.freebsd.org)
Message-Id: <201304221938.r3MJcuru075508@svn.freebsd.org>
From: "Cherry G. Mathew" <cherry@FreeBSD.org>
Date: Mon, 22 Apr 2013 19:38:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r249777 - projects/amd64_xen_pv/sys/amd64/xen
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Apr 2013 19:38:57 -0000

Author: cherry
Date: Mon Apr 22 19:38:56 2013
New Revision: 249777
URL: http://svnweb.freebsd.org/changeset/base/249777

Log:
  Set the root device from the domU "root=/dev/xxx" string.
  Setting "vfs.root.mountfrom=/dev/xxx" would work so far,  but
  "root=dev/xxx" is the "standard" mechanism in the xen ecosystem.
  
  Approved by: gibbs(implicit)

Modified:
  projects/amd64_xen_pv/sys/amd64/xen/machdep.c

Modified: projects/amd64_xen_pv/sys/amd64/xen/machdep.c
==============================================================================
--- projects/amd64_xen_pv/sys/amd64/xen/machdep.c	Mon Apr 22 19:02:37 2013	(r249776)
+++ projects/amd64_xen_pv/sys/amd64/xen/machdep.c	Mon Apr 22 19:38:56 2013	(r249777)
@@ -366,6 +366,26 @@ xen_boothowto(char *envp)
 	return howto;
 }
 
+static void
+xen_rootconf(void)
+{
+	
+	char *rdevpath;
+
+	rdevpath = getenv("root");
+
+	if (rdevpath == NULL) {
+		return;
+	}
+
+	/* Do not overwrite existing variable */
+	if (getenv("vfs.root.mountfrom") == NULL) {
+		setenv("vfs.root.mountfrom", rdevpath);
+	}
+}
+
+SYSINIT(xen_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_ANY, xen_rootconf, NULL);
+
 /* 
  * Setup early kernel environment, based on start_info passed to us by
  * xen