diff options
| author | ngie <ngie@FreeBSD.org> | 2015-11-05 08:27:45 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-11-05 08:27:45 +0000 |
| commit | 624444350402c7ad485f195fb510d5023d85f669 (patch) | |
| tree | 6bba31d9a4d07a67b2f5a667c6b8159fa8cb78fa /usr.sbin | |
| parent | 8c5f7fac71237f23d1f940198a3a977da08b853a (diff) | |
| download | FreeBSD-src-624444350402c7ad485f195fb510d5023d85f669.zip FreeBSD-src-624444350402c7ad485f195fb510d5023d85f669.tar.gz | |
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@worrbase.com>
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/bhyve/bhyverun.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index ee0f106..5b277af 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -258,7 +258,8 @@ fbsdrun_addcpu(struct vmctx *ctx, int fromcpu, int newcpu, uint64_t rip) * 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); |
