diff options
| author | Andy Fiddaman <omnios@citrus-it.co.uk> | 2020-05-27 21:23:13 +0000 |
|---|---|---|
| committer | Andy Fiddaman <omnios@citrus-it.co.uk> | 2020-05-28 20:01:17 +0000 |
| commit | 60f7064656cca223eac2c6b527d51f6afb62a4ef (patch) | |
| tree | 78a0dc8181eea31e43a00eeca607729e8402390d | |
| parent | 6c24238b6748a460b462c0b48b263cef4a6cbcdd (diff) | |
| download | illumos-joyent-60f7064656cca223eac2c6b527d51f6afb62a4ef.tar.gz | |
12795 Remove remaining bhyveconsole wait code
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: Patrick Mooney <pmooney@pfmooney.com>
Approved by: Robert Mustacchi <rm@fingolfin.org>
| -rw-r--r-- | usr/src/cmd/bhyve/bhyverun.c | 22 | ||||
| -rw-r--r-- | usr/src/cmd/bhyve/bhyverun.h | 6 |
2 files changed, 0 insertions, 28 deletions
diff --git a/usr/src/cmd/bhyve/bhyverun.c b/usr/src/cmd/bhyve/bhyverun.c index 07489ad8d5..9a7fc859e4 100644 --- a/usr/src/cmd/bhyve/bhyverun.c +++ b/usr/src/cmd/bhyve/bhyverun.c @@ -200,13 +200,6 @@ static int acpi; static char *progname; static const int BSP = 0; -#ifndef __FreeBSD__ -int bcons_wait = 0; -int bcons_connected = 0; -pthread_mutex_t bcons_wait_lock = PTHREAD_MUTEX_INITIALIZER; -pthread_cond_t bcons_wait_done = PTHREAD_COND_INITIALIZER; -#endif - static cpuset_t cpumask; static void vm_loop(struct vmctx *ctx, int vcpu, uint64_t rip); @@ -1334,21 +1327,6 @@ main(int argc, char *argv[]) errx(EX_OSERR, "cap_enter() failed"); #endif -#ifndef __FreeBSD__ - /* - * If applicable, wait for bhyveconsole - */ - if (bcons_wait) { - printf("Waiting for bhyveconsole connection...\n"); - (void) pthread_mutex_lock(&bcons_wait_lock); - while (!bcons_connected) { - (void) pthread_cond_wait(&bcons_wait_done, - &bcons_wait_lock); - } - (void) pthread_mutex_unlock(&bcons_wait_lock); - } -#endif - /* * Add CPU 0 */ diff --git a/usr/src/cmd/bhyve/bhyverun.h b/usr/src/cmd/bhyve/bhyverun.h index 8df8e01a73..99ce739f70 100644 --- a/usr/src/cmd/bhyve/bhyverun.h +++ b/usr/src/cmd/bhyve/bhyverun.h @@ -51,12 +51,6 @@ extern int guest_ncpus; extern uint16_t cores, sockets, threads; extern char *guest_uuid_str; extern char *vmname; -#ifndef __FreeBSD__ -extern int bcons_wait; -extern int bcons_connected; -extern pthread_mutex_t bcons_wait_lock; -extern pthread_cond_t bcons_wait_done; -#endif void *paddr_guest2host(struct vmctx *ctx, uintptr_t addr, size_t len); |