From c6a4908ebc31bf1b5a65dc7d2065d2d019d882b7 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@apollo.backplane.com>
Date: Sun, 5 Feb 2017 16:46:59 -0800
Subject: [PATCH] kernel - Disable vmm by default

* Leave hw.vmm.enabled at 0 even if VMM is detected for now.  The vkernel
  is not stable with it enabled.
---
 sys/platform/pc64/vmm/vmm.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/sys/platform/pc64/vmm/vmm.c b/sys/platform/pc64/vmm/vmm.c
index fa9d09b80f..5c1d161d9d 100644
--- a/sys/platform/pc64/vmm/vmm.c
+++ b/sys/platform/pc64/vmm/vmm.c
@@ -132,7 +132,14 @@ vmm_init(void)
 		    &vmm_debug, 0,
 		    "vmm debugging");
 
-		if (ctl->enable()) {
+		/*
+		 * Normally enable VMM if it is supported.  But for now
+		 * lets not, because the vkernel is not stable with it
+		 * enabled.
+		 */
+		if (1) {
+			kprintf("VMM: available, disabled by default\n");
+		} else if (ctl->enable()) {
 			kprintf("VMM: vmm enable() failed\n");
 		} else {
 			vmm_enabled = 1;
-- 
2.11.4.GIT