diff options
| author | ngie <ngie@FreeBSD.org> | 2015-10-22 08:37:11 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-10-22 08:37:11 +0000 |
| commit | d6bf3fbf0a8d1c754366da7669285be065d0bd96 (patch) | |
| tree | cfcc80e4636b255c1c8e04a78fc0b3e4fc461377 /usr.sbin/bhyve | |
| parent | 685decc3b5a9f8e9126784099b9cb47a00bc6749 (diff) | |
| download | FreeBSD-src-d6bf3fbf0a8d1c754366da7669285be065d0bd96.zip FreeBSD-src-d6bf3fbf0a8d1c754366da7669285be065d0bd96.tar.gz | |
Exit with a user-friendly message instead of tripping an assert
if vm_activate_cpu(..) fails when called from fbsdrun_addcpu(..)
MFC after: 1 week
PR: 203884
Reviewed by: grehan
Submitted by: William Orr <will@worrbase.com>
Diffstat (limited to 'usr.sbin/bhyve')
| -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 bc49c57..4fd9c35 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -261,7 +261,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); |
