From owner-svn-src-all@FreeBSD.ORG  Sat Dec 27 17:19:16 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 980EE1065678;
	Sat, 27 Dec 2008 17:19:16 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 87E3B8FC13;
	Sat, 27 Dec 2008 17:19:16 +0000 (UTC) (envelope-from bz@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 mBRHJGxA077165;
	Sat, 27 Dec 2008 17:19:16 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBRHJGkl077164;
	Sat, 27 Dec 2008 17:19:16 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200812271719.mBRHJGkl077164@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 27 Dec 2008 17:19:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186522 - head/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Dec 2008 17:19:16 -0000

Author: bz
Date: Sat Dec 27 17:19:16 2008
New Revision: 186522
URL: http://svn.freebsd.org/changeset/base/186522

Log:
  Hide detect_virtual() along with the accompanying string
  arrays under #ifndef XEN to make XEN config compile again.
  In case of Xen vm_guest is hard coded.
  
  Move the list for the vm_guest sysctl out of the restictive
  bounds as the sysctl is there in either case.

Modified:
  head/sys/kern/subr_param.c

Modified: head/sys/kern/subr_param.c
==============================================================================
--- head/sys/kern/subr_param.c	Sat Dec 27 16:03:34 2008	(r186521)
+++ head/sys/kern/subr_param.c	Sat Dec 27 17:19:16 2008	(r186522)
@@ -126,6 +126,14 @@ SYSCTL_PROC(_kern, OID_AUTO, vm_guest, C
  */
 struct	buf *swbuf;
 
+static const char *const vm_guest_sysctl_names[] = {
+	"none",
+	"generic",
+	"xen",
+	NULL
+};
+
+#ifndef XEN
 static const char *const vm_bnames[] = {
 	"QEMU",				/* QEMU */
 	"Plex86",			/* Plex86 */
@@ -141,13 +149,6 @@ static const char *const vm_pnames[] = {
 	NULL
 };
 
-static const char *const vm_guest_sysctl_names[] = {
-	"none",
-	"generic",
-	"xen",
-	NULL
-};
-
 
 /*
  * Detect known Virtual Machine hosts by inspecting the emulated BIOS.
@@ -178,6 +179,7 @@ detect_virtual(void)
 	}
 	return (VM_GUEST_NO);
 }
+#endif
 
 /*
  * Boot time overrides that are not scaled against main memory