From eda0d7f2563ff44f103201dbb5a841351f0c024a Mon Sep 17 00:00:00 2001 From: neel Date: Sat, 5 Jan 2013 03:35:30 +0000 Subject: bhyve does not require a custom configuration file anymore so make the GENERIC identical to the one in HEAD. Obtained from: NetApp --- sys/amd64/conf/GENERIC | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 9c72500..7aff1e8 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -74,7 +74,7 @@ options INCLUDE_CONFIG_FILE # Include this file in kernel # 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 2734,3146) 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 -- cgit v1.1