From 1887942f2b5442d1fbe870f07b0d89239a3d2607 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Sun, 4 Dec 2016 16:09:23 -0800 Subject: [PATCH] kernel - Skip vmm_shutdown() when in a panic * vmm_shutdown() calls cpusync and assumes that the system is basically in working order. This is definitely not the case from a panic. Conditionalize the code to be skipped if shutting-down due to a panic. * Fixes a number of situations where the panic code locks up and refuses to dump when called with debug.debugger_on_panic=0. --- sys/platform/pc64/vmm/vmm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/platform/pc64/vmm/vmm.c b/sys/platform/pc64/vmm/vmm.c index 1ff7c410d4..a247208522 100644 --- a/sys/platform/pc64/vmm/vmm.c +++ b/sys/platform/pc64/vmm/vmm.c @@ -90,7 +90,7 @@ sysctl_vmm_enable(SYSCTL_HANDLER_ARGS) static void vmm_shutdown(void) { - if(vmm_enabled) + if (vmm_enabled && panicstr == NULL) ctl->disable(); } -- 2.11.4.GIT