From owner-svn-src-projects@FreeBSD.ORG  Sat Jan  5 03:35:30 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 E17B1F49;
 Sat,  5 Jan 2013 03:35:30 +0000 (UTC)
 (envelope-from neel@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 CAFDA7DD;
 Sat,  5 Jan 2013 03:35:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r053ZUa0050290;
 Sat, 5 Jan 2013 03:35:30 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r053ZUiB050289;
 Sat, 5 Jan 2013 03:35:30 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201301050335.r053ZUiB050289@svn.freebsd.org>
From: Neel Natu <neel@FreeBSD.org>
Date: Sat, 5 Jan 2013 03:35:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245054 - projects/bhyve/sys/amd64/conf
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: Sat, 05 Jan 2013 03:35:30 -0000

Author: neel
Date: Sat Jan  5 03:35:30 2013
New Revision: 245054
URL: http://svnweb.freebsd.org/changeset/base/245054

Log:
  bhyve does not require a custom configuration file anymore so make the GENERIC
  identical to the one in HEAD.
  
  Obtained from:	NetApp

Modified:
  projects/bhyve/sys/amd64/conf/GENERIC

Modified: projects/bhyve/sys/amd64/conf/GENERIC
==============================================================================
--- projects/bhyve/sys/amd64/conf/GENERIC	Sat Jan  5 02:10:27 2013	(r245053)
+++ projects/bhyve/sys/amd64/conf/GENERIC	Sat Jan  5 03:35:30 2013	(r245054)
@@ -74,7 +74,7 @@ options 	INCLUDE_CONFIG_FILE     # Inclu
 # Debugging support.  Always need this:
 options 	KDB			# Enable kernel debugger support.
 # For minimum debugger support (stable branch) use:
-options 	KDB_TRACE		# Print a stack trace for a panic.
+#options 	KDB_TRACE		# Print a stack trace for a panic.
 # For full debugger support use this instead:
 options 	DDB			# Support DDB.
 options 	GDB			# Support remote GDB.
@@ -326,11 +326,6 @@ device		fwip		# IP over FireWire (RFC 27
 device		dcons		# Dumb console driver
 device		dcons_crom	# Configuration ROM for dcons
 
-# bhyve options
-device		bvmconsole	# brain dead simple bvm console
-device		bvmdebug	# brain dead simple bvm gdb pipe
-device		mptable
-
 # Sound support
 device		sound		# Generic sound driver (required)
 device		snd_cmi		# CMedia CMI8338/CMI8738