src: remove sys/wait.h from many files

Most code now uses the virProcess / virCommand APIs, so
the need for sys/wait.h is quite limited. Removing this
include removes the dependency on GNULIB providing a
dummy sys/wait.h for Windows.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/libvirt.c b/src/libvirt.c
index 2d02808a899a112f023186c542b1187852353e03..a30eaa7590427b38f3886680b00448322361d75a 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -24,7 +24,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <sys/wait.h>
 #include <time.h>
 #include <gio/gnetworking.h>
 

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index fcd964cd1eb064229d7e7bbf5a082e707e595a26..41efe43a14e3495d9a30152ce5908149069a51fb 100644 (file)
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -25,7 +25,6 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/mount.h>
-#include <sys/wait.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <mntent.h>

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 8a6de9d382cea384519fd1d5a0321c397df3155d..94212eec77a52d1d36be6a6df31efce337b62ea1 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -30,7 +30,6 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <pwd.h>
-#include <sys/wait.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
 #ifdef HAVE_SYSCTLBYNAME

diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 1e62d2b2de29e5f1f1594f63d7d79af90bd8398f..0a69216315c5ab98106611deae80a643a527c28f 100644 (file)
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -29,7 +29,6 @@
 #include <dirent.h>
 #include <time.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
 
 #include "virerror.h"
 #include "openvz_conf.h"

diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index e3245aec4d52910604dd33be99eb3617d75781ee..23811d3d08a8feb221b65223977728034ebb3544 100644 (file)
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -30,7 +30,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <pwd.h>
-#include <sys/wait.h>
 
 #include "virerror.h"
 #include "datatypes.h"

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 8b7fde2bcc1710c475316d10fdd28587c1ee409f..8f180afa380a8264ad146a307c8d3e28cccbfa3c 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -51,7 +51,6 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <sys/wait.h>
 #include <stdarg.h>
 #include <sys/utsname.h>
 

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 024f3c16342a5291d55db9994315d9a09b11fb33..0357501dc62addc40ab6a7161cbabf55130b3202 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -25,7 +25,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <sys/wait.h>
 
 #include "virerror.h"
 #include "qemu_conf.h"

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7df3f53183d12ab2f31fe65ec85d75faa87eed62..502f4ce342124d0bc7cc415f16c9ee1ac9ec8a74 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -30,7 +30,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <sys/wait.h>
 #include <sys/ioctl.h>
 
 #include "qemu_driver.h"

diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
index c427864ce1147e1c292be384ec05f12fdf968662..e0cd303582c08fa0be05790d4c550f04f8895bd8 100644 (file)
--- a/src/remote/remote_daemon.c
+++ b/src/remote/remote_daemon.c
@@ -23,7 +23,6 @@
 
 #include <unistd.h>
 #include <fcntl.h>
-#include <sys/wait.h>
 #include <sys/stat.h>
 #include <getopt.h>
 #include <grp.h>

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index e1af68450f54993d1c269f3e4d5f1411bd7bff27..07733cee4879e329ecd64dde0076c8ad29ac41ef 100644 (file)
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -23,7 +23,6 @@
 
 #include <sys/stat.h>
 #include <unistd.h>
-#include <sys/wait.h>
 #include <signal.h>
 #include <fcntl.h>
 #ifdef HAVE_IFADDRS_H

diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c
index c02fbb5eaa118bacafdfe6759dadc6931c4fd4af..45a80b5f2a257a24b18ff4f01fd934ebb938bed2 100644 (file)
--- a/src/storage/storage_backend_iscsi.c
+++ b/src/storage/storage_backend_iscsi.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include <dirent.h>
-#include <sys/wait.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>

diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c
index 42dec05ba0b3035f963d7124f161a44bbb9c496f..d26ca9c58ec892c1671079cded9f9ff937d7f720 100644 (file)
--- a/src/storage/storage_backend_logical.c
+++ b/src/storage/storage_backend_logical.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 
-#include <sys/wait.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>

diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index 7688ea9fd9679ba76292e03449c0e6dece18f122..c2754dbb93513f3fe033225e25fd70b7f72b08de 100644 (file)
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -19,7 +19,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/wait.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>

diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c
index 05ac63c281a00aff44c5a3f8f9b0362954a66172..1354d2ee52147255907e59f9157d7a886fa16a75 100644 (file)
--- a/src/util/virfdstream.c
+++ b/src/util/virfdstream.c
@@ -26,7 +26,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #ifndef WIN32
-# include <sys/wait.h>
 # include <termios.h>
 #endif
 

diff --git a/src/util/virfile.c b/src/util/virfile.c
index 54079f6ade85f603d5552c164affea1a5eb61f94..a757dfcbdd7ac2ee91303793b0c097beabb484a4 100644 (file)
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -42,7 +42,6 @@
 # include <libutil.h>
 #endif /* !HAVE_LIBUTIL_H */
 #include <sys/stat.h>
-#include <sys/wait.h>
 #if defined(HAVE_SYS_MOUNT_H)
 # include <sys/mount.h>
 #endif

diff --git a/src/util/virhook.c b/src/util/virhook.c
index a687629fc2f58c791e65681cb41654190f26390d..5bdacdd79f2405be53196f696cd00afb39f5d0db 100644 (file)
--- a/src/util/virhook.c
+++ b/src/util/virhook.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/wait.h>
 #include <sys/stat.h>
 #include <unistd.h>
 

diff --git a/src/util/viriptables.c b/src/util/viriptables.c
index 6b3a0258801cbbe9b0edc79050cc1876ee623d55..e6a1ded8d5d554850617610de03619122571014b 100644 (file)
--- a/src/util/viriptables.c
+++ b/src/util/viriptables.c
@@ -25,7 +25,6 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
 
 #include "internal.h"
 #include "viriptables.h"

diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c
index 387017f2a8c691bef9cefd1a6f8758b02f00372c..b9a27951fb7d5d4a746bd9ada7981380d94e41f8 100644 (file)
--- a/src/util/virnetdevveth.c
+++ b/src/util/virnetdevveth.c
@@ -19,8 +19,6 @@
 
 #include <config.h>
 
-#include <sys/wait.h>
-
 #include "virnetdevveth.h"
 #include "viralloc.h"
 #include "virlog.h"

diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
index 4cc4523be04b9d8a6b62a891b27f1cac04afe87d..41f4d1cff931015b50f25efa2267df283adb80c2 100644 (file)
--- a/src/util/virsysinfo.c
+++ b/src/util/virsysinfo.c
@@ -22,7 +22,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/wait.h>
 #include <sys/stat.h>
 #include <unistd.h>
 

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 1443fdcc8ab7feec1f0afa40299d685c877d62e7..2c71f618cdde78279883bd7947fe1d75a9780699 100644 (file)
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -30,7 +30,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <pwd.h>
-#include <sys/wait.h>
 #include <sys/time.h>
 #include <sys/statvfs.h>
 

diff --git a/tests/commandtest.c b/tests/commandtest.c
index e19ce6220738ca3d566292d6389f5f682330c6ed..7df3ae0171a6b20e2a7675d37a3eec99150cdc6c 100644 (file)
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -23,7 +23,9 @@
 #include <unistd.h>
 #include <signal.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
+#ifndef WIN32
+# include <sys/wait.h>
+#endif
 #include <fcntl.h>
 
 #include "testutils.h"

diff --git a/tests/testutils.c b/tests/testutils.c
index 248f9ee8be19843b74f2fcd92a57cc79e9948994..579b6fce1ab9b14254ca6e5d7b614921384c4375 100644 (file)
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -24,7 +24,6 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/wait.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include "testutils.h"