From owner-svn-src-user@FreeBSD.ORG  Fri Nov 28 16:41:00 2008
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 298E41065673;
	Fri, 28 Nov 2008 16:41:00 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1CA778FC08;
	Fri, 28 Nov 2008 16:41:00 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mASGexFJ024132;
	Fri, 28 Nov 2008 16:40:59 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mASGexIH024131;
	Fri, 28 Nov 2008 16:40:59 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200811281640.mASGexIH024131@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Fri, 28 Nov 2008 16:40:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185395 - user/dfr/xenhvm/6/sys/xen/xenbus
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 28 Nov 2008 16:41:00 -0000

Author: dfr
Date: Fri Nov 28 16:40:59 2008
New Revision: 185395
URL: http://svn.freebsd.org/changeset/base/185395

Log:
  Add Xen HVM support. Export some information to userland to help support
  the userland Xen tools.

Modified:
  user/dfr/xenhvm/6/sys/xen/xenbus/xenbus_probe.c

Modified: user/dfr/xenhvm/6/sys/xen/xenbus/xenbus_probe.c
==============================================================================
--- user/dfr/xenhvm/6/sys/xen/xenbus/xenbus_probe.c	Fri Nov 28 16:40:00 2008	(r185394)
+++ user/dfr/xenhvm/6/sys/xen/xenbus/xenbus_probe.c	Fri Nov 28 16:40:59 2008	(r185395)
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/conf.h>
+#include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/syslog.h>
 #include <sys/proc.h>
@@ -929,7 +930,10 @@ void unregister_xenstore_notifier(struct
 EXPORT_SYMBOL(unregister_xenstore_notifier);
 #endif
 
-
+SYSCTL_DECL(_dev);
+SYSCTL_NODE(_dev, OID_AUTO, xen, CTLFLAG_RD, NULL, "Xen");
+SYSCTL_INT(_dev_xen, OID_AUTO, xsd_port, CTLFLAG_RD, &xen_store_evtchn, 0, "");
+SYSCTL_ULONG(_dev_xen, OID_AUTO, xsd_kva, CTLFLAG_RD, (u_long *) &xen_store, 0, "");
 
 #ifdef DOM0
 static struct proc_dir_entry *xsd_mfn_intf;
@@ -983,13 +987,12 @@ xenbus_probe_sysinit(void *unused)
 	device_register(&xenbus_backend.dev);
 #endif
 
+#ifdef DOM0
 	/*
 	** Domain0 doesn't have a store_evtchn or store_mfn yet.
 	*/
-	dom0 = (xen_start_info->store_evtchn == 0);
+	dom0 = (xen_store_evtchn == 0);
 
-
-#ifdef DOM0
 	if (dom0) {
 
 		unsigned long page;
@@ -1025,6 +1028,8 @@ xenbus_probe_sysinit(void *unused)
 		if((xsd_port_intf = create_xen_proc_entry("xsd_port", 0400)))
 			xsd_port_intf->read_proc = xsd_port_read;
 	}
+#else
+	dom0 = FALSE;
 #endif
 	/* Initialize the interface to xenstore. */
 	err = xs_init();