External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

virsh: fix mingw startup

Browse Source 
* .gnulib: Update to latest, for pipe2.
* bootstrap.conf (gnulib_modules): Add pipe2.
* src/util/event_poll.c (virEventPollInit): Use it, to avoid
problematic virSetCloseExec on mingw.
This commit is contained in:
Eric Blake 2011-04-06 08:10:28 -06:00
parent 02c39a2f6d
commit 8ae5df5d93
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gnulib

@ -1 +1 @@
Subproject commit f79652003534e496bca1e49922ca521f12ca8051 Subproject commit bd5d1e621103ea3f7fbae09010348ce2df563808

1
bootstrap.conf
View File

@ -54,6 +54,7 @@ nonblocking
perror perror
physmem physmem
pipe-posix pipe-posix
pipe2
poll poll
posix-shell posix-shell
pthread pthread

7
src/util/event_poll.c
View File

@ -29,6 +29,7 @@
#include <sys/time.h> #include <sys/time.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h>
#include "threads.h" #include "threads.h"
#include "logging.h" #include "logging.h"
@ -657,11 +658,7 @@ int virEventPollInit(void)
return -1; return -1;
} }
if (pipe(eventLoop.wakeupfd) < 0 || if (pipe2(eventLoop.wakeupfd, O_CLOEXEC | O_NONBLOCK) < 0) {
virSetNonBlock(eventLoop.wakeupfd[0]) < 0 ||
virSetNonBlock(eventLoop.wakeupfd[1]) < 0 ||
virSetCloseExec(eventLoop.wakeupfd[0]) < 0 ||
virSetCloseExec(eventLoop.wakeupfd[1]) < 0) {
virReportSystemError(errno, "%s", virReportSystemError(errno, "%s",
_("Unable to setup wakeup pipe")); _("Unable to setup wakeup pipe"));
return -1; return -1;