From b5a210dce707cb3596c303ef64e59b911ff784d7 Mon Sep 17 00:00:00 2001 From: Roman Bogorodskiy Date: Tue, 21 Apr 2015 20:11:32 +0300 Subject: [PATCH] vircommand: fix polling in virCommandProcessIO When running on FreeBSD, there's a bug in virCommandProcessIO polling that is triggered by the commandtest. A test that triggers EPIPE in commandtest (named "test20") hungs forever on FreeBSD. Apparently, this happens because FreeBSD sets POLLHUP flag on revents when stdin in closed. And as the current implementation only checks for POLLOUT and POLLERR, it ends up looping forever inside virCommandProcessIO and not trying to do one more write() that would trigger EPIPE. To fix that check for the POLLHUP flag along with POLLOUT and POLLERR. (cherry picked from commit e34cccf783983e1b19f139bde873e950424a8778) --- src/util/vircommand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 6527d85e58..c1b2e225ba 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -2073,7 +2073,7 @@ virCommandProcessIO(virCommandPtr cmd) } } - if (fds[i].revents & (POLLOUT | POLLERR) && + if (fds[i].revents & (POLLOUT | POLLHUP | POLLERR) && fds[i].fd == cmd->inpipe) { int done;