From owner-svn-src-all@FreeBSD.ORG  Mon Dec  8 18:40:00 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 053ED1065670;
	Mon,  8 Dec 2008 18:40:00 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E7DB28FC1D;
	Mon,  8 Dec 2008 18:39:59 +0000 (UTC)
	(envelope-from jkim@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 mB8Idx0m067658;
	Mon, 8 Dec 2008 18:39:59 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mB8IdxbT067657;
	Mon, 8 Dec 2008 18:39:59 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <200812081839.mB8IdxbT067657@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 8 Dec 2008 18:39:59 +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: r185772 - 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: Mon, 08 Dec 2008 18:40:00 -0000

Author: jkim
Date: Mon Dec  8 18:39:59 2008
New Revision: 185772
URL: http://svn.freebsd.org/changeset/base/185772

Log:
  - Detect Bochs BIOS variants and use HZ_VM as well.
  - Free kernel environment variable after its use.
  - Fix style(9) nits.

Modified:
  head/sys/kern/subr_param.c

Modified: head/sys/kern/subr_param.c
==============================================================================
--- head/sys/kern/subr_param.c	Mon Dec  8 17:22:44 2008	(r185771)
+++ head/sys/kern/subr_param.c	Mon Dec  8 18:39:59 2008	(r185772)
@@ -118,6 +118,13 @@ SYSCTL_ULONG(_kern, OID_AUTO, sgrowsiz, 
  */
 struct	buf *swbuf;
 
+static const char *const vm_bnames[] = {
+	"QEMU",				/* QEMU */
+	"Plex86",			/* Plex86 */
+	"Bochs",			/* Bochs */
+	NULL
+};
+
 static const char *const vm_pnames[] = {
 	"VMware Virtual Platform",	/* VMWare VM */
 	"Virtual Machine",		/* Microsoft VirtualPC */
@@ -132,14 +139,25 @@ detect_virtual(void)
 	char *sysenv;
 	int i;
 
+	sysenv = getenv("smbios.bios.vendor");
+	if (sysenv != NULL) {
+		for (i = 0; vm_bnames[i] != NULL; i++)
+			if (strcmp(sysenv, vm_bnames[i]) == 0) {
+				freeenv(sysenv);
+				return (1);
+			}
+		freeenv(sysenv);
+	}
 	sysenv = getenv("smbios.system.product");
 	if (sysenv != NULL) {
-		for (i = 0; vm_pnames[i] != NULL; i++) {
-			if (strcmp(sysenv, vm_pnames[i]) == 0)
-				return 1;
-		}
+		for (i = 0; vm_pnames[i] != NULL; i++)
+			if (strcmp(sysenv, vm_pnames[i]) == 0) {
+				freeenv(sysenv);
+				return (1);
+			}
+		freeenv(sysenv);
 	}
-	return 0;
+	return (0);
 }
 
 /*
@@ -151,13 +169,8 @@ init_param1(void)
 
 	hz = -1;
 	TUNABLE_INT_FETCH("kern.hz", &hz);
-	if (hz == -1) {
-		if (detect_virtual()) {
-			hz = HZ_VM;
-		} else {
-			hz = HZ;
-		}
-	}
+	if (hz == -1)
+		hz = detect_virtual() ? HZ_VM : HZ;
 	tick = 1000000 / hz;
 
 #ifdef VM_SWZONE_SIZE_MAX