svn commit: r290386 - stable/10/usr.sbin/bhyve

[Garrett Cooper]

Author: ngie
Date: Thu Nov  5 08:27:45 2015
New Revision: 290386
URL: https://svnweb.freebsd.org/changeset/base/290386

Log:
  MFC r289746:
  
  Exit with a user-friendly message instead of tripping an assert
  if vm_activate_cpu(..) fails when called from fbsdrun_addcpu(..)
  
  PR: 203884
  Reviewed by: grehan
  Submitted by: William Orr <will at worrbase.com>

Modified:
  stable/10/usr.sbin/bhyve/bhyverun.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/bhyve/bhyverun.c
==============================================================================
--- stable/10/usr.sbin/bhyve/bhyverun.c	Thu Nov  5 07:48:48 2015	(r290385)
+++ stable/10/usr.sbin/bhyve/bhyverun.c	Thu Nov  5 08:27:45 2015	(r290386)
@@ -258,7 +258,8 @@ fbsdrun_addcpu(struct vmctx *ctx, int fr
 	 * with vm_suspend().
 	 */
 	error = vm_activate_cpu(ctx, newcpu);
-	assert(error == 0);
+	if (error != 0)
+		err(EX_OSERR, "could not activate CPU %d", newcpu);
 
 	CPU_SET_ATOMIC(newcpu, &cpumask);