From d0b0b052d3f263c8c9738577ac454023a139ffe8 Mon Sep 17 00:00:00 2001 From: Matthias Bolte Date: Tue, 9 Oct 2012 22:49:46 +0200 Subject: [PATCH] win32: Pretend that close-on-exec works Currently virNetSocketNew fails because virSetCloseExec fails as there is no proper implementation for it on Windows at the moment. Workaround this by pretending that setting close-on-exec on the fd works. This can be done because libvirt currently lacks the ability to create child processes on Windows anyway. So there is no point in failing to set a flag that isn't useful at the moment anyway. (cherry picked from commit fcfa4bfb1660cdb083aa61e366ddc8e91a53e3ed) --- src/util/util.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/util/util.c b/src/util/util.c index f0ccaf4dcf..ddc0d45aad 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -275,7 +275,11 @@ int virSetInherit(int fd, bool inherit) { int virSetInherit(int fd ATTRIBUTE_UNUSED, bool inherit ATTRIBUTE_UNUSED) { - return -1; + /* FIXME: Currently creating child processes is not supported on + * Win32, so there is no point in failing calls that are only relevant + * when creating child processes. So just pretend that we changed the + * inheritance property of the given fd as requested. */ + return 0; } #endif /* WIN32 */