aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/bhyve
diff options
context:
space:
mode:
authorPeter Grehan <grehan@FreeBSD.org>2014-03-07 06:23:37 +0000
committerPeter Grehan <grehan@FreeBSD.org>2014-03-07 06:23:37 +0000
commitf4959d35375bf4d6123f1cb7d1135ca2561df1ce (patch)
tree4af52d7d4bcf7f3bb6de2b212c48cb049f2b1694 /usr.sbin/bhyve
parentfb7aab993286404d7c923b98caa89878ad42c740 (diff)
downloadsrc-f4959d35375bf4d6123f1cb7d1135ca2561df1ce.tar.gz
src-f4959d35375bf4d6123f1cb7d1135ca2561df1ce.zip
Open the uart emulation's backing tty in non-blocking mode.
This fixes the issue of bhyve appearing to halt when using nmdm ports for the console, until a connection is made to the other end. bhyveload already does this. Reported by: Many. MFC after: 3 weeks.
Notes
Notes: svn path=/head/; revision=262884
Diffstat (limited to 'usr.sbin/bhyve')
-rw-r--r--usr.sbin/bhyve/uart_emul.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/bhyve/uart_emul.c b/usr.sbin/bhyve/uart_emul.c
index 2fbbd15ea87f..dd1c22039dd4 100644
--- a/usr.sbin/bhyve/uart_emul.c
+++ b/usr.sbin/bhyve/uart_emul.c
@@ -585,7 +585,7 @@ uart_tty_backend(struct uart_softc *sc, const char *opts)
retval = -1;
- fd = open(opts, O_RDWR);
+ fd = open(opts, O_RDWR | O_NONBLOCK);
if (fd > 0 && isatty(fd)) {
sc->tty.fd = fd;
sc->tty.opened = true;