diff options
author | Mike Gerdts <mike.gerdts@joyent.com> | 2018-03-23 19:23:28 +0000 |
---|---|---|
committer | Mike Gerdts <mike.gerdts@joyent.com> | 2018-03-23 19:30:17 +0000 |
commit | d5eb108ff4a94b03a014e90e6213bf7bf4faa374 (patch) | |
tree | 9db0ca6a6025ef47b151a9bf5fb98430694aee8d | |
parent | 7892cb3dceef9f2cbcd853e66fb05601a94bbba2 (diff) | |
download | illumos-joyent-d5eb108ff4a94b03a014e90e6213bf7bf4faa374.tar.gz |
OS-6820 bhyve provisioning times out after OS-6720
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
-rw-r--r-- | usr/src/cmd/bhyve/bhyverun.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/usr/src/cmd/bhyve/bhyverun.c b/usr/src/cmd/bhyve/bhyverun.c index 56240356ae..ca7983edd2 100644 --- a/usr/src/cmd/bhyve/bhyverun.c +++ b/usr/src/cmd/bhyve/bhyverun.c @@ -1119,17 +1119,16 @@ main(int argc, char *argv[]) */ fbsdrun_addcpu(ctx, BSP, BSP, rip); - /* - * Head off to the main event dispatch loop - */ - mevent_dispatch(); -#ifndef __FreeBSD +#ifndef __FreeBSD__ if (vm_started_cb != NULL) { vm_started_cb(); } #endif - pthread_exit(NULL); + /* + * Head off to the main event dispatch loop + */ + mevent_dispatch(); exit(1); } |