From: Matthias Bolte <matthias.bolte@googlemail.com>
Date: Tue, 9 Oct 2012 20:49:46 +0000 (+0200)
Subject: win32: Pretend that close-on-exec works
X-Git-Tag: v1.0.0-rc1~147
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fcfa4bfb1660cdb083aa61e366ddc8e91a53e3ed;p=thirdparty%2Flibvirt.git

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.
---

diff --git a/src/util/util.c b/src/util/util.c
index 348c3888dc..bf608375b3 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 */