Remove virutil.h where possible

Historically, this file was a dump for most of our helper
functions and needed almost everywhere.
With the introduction of virfile.h and virstring.h,
and more importantly, virenum.h and the introduction
of GLib, that is no longer true.

Remove its include from C files that don't even use it.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>

diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index 2439ec4f4b78067a75cd53411e8f80e1b7870b80..03d0f46b249d75a9aae1c643ef6f0a4d43501f7b 100644 (file)
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -27,7 +27,6 @@
 #include "virlog.h"
 #include "virerror.h"
 #include "virstring.h"
-#include "virutil.h"
 #include "virfile.h"
 #include "virtime.h"
 #include "virsystemd.h"

diff --git a/src/qemu/qemu_vhost_user_gpu.c b/src/qemu/qemu_vhost_user_gpu.c
index ae1f530338090893e9986b0ce0ef0f75f6d24eb5..6a37e165ba33939bb5c2cb5ea88fea204332abe0 100644 (file)
--- a/src/qemu/qemu_vhost_user_gpu.c
+++ b/src/qemu/qemu_vhost_user_gpu.c
@@ -29,7 +29,6 @@
 #include "vircommand.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "virutil.h"
 #include "virfile.h"
 #include "virstring.h"
 #include "virtime.h"

diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c
index e874929740a3792bad3d196c971e5124a3210ef1..9c20a80b889fe462ffbd2d953ce85bb6ac069bed 100644 (file)
--- a/src/rpc/virnetlibsshsession.c
+++ b/src/rpc/virnetlibsshsession.c
@@ -26,7 +26,6 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "configmake.h"
-#include "virutil.h"
 #include "virerror.h"
 #include "virobject.h"
 #include "virstring.h"

diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index c31d80d4eb0b21bda77e630ac88a81617a937161..fabdc3ef22f0e9942daca8d3168d6a3a530472b9 100644 (file)
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -29,7 +29,6 @@
 #include "virlog.h"
 #include "configmake.h"
 #include "virthread.h"
-#include "virutil.h"
 #include "virerror.h"
 #include "virfile.h"
 #include "virobject.h"

diff --git a/src/util/iohelper.c b/src/util/iohelper.c
index 618bfb1d3dbbab5013d55e4833d1fc94a0d52229..342bae229b1b7ac56e5e8bf6713cb2d590749a6e 100644 (file)
--- a/src/util/iohelper.c
+++ b/src/util/iohelper.c
@@ -28,7 +28,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "virutil.h"
 #include "virthread.h"
 #include "virfile.h"
 #include "viralloc.h"

diff --git a/src/util/virerror.c b/src/util/virerror.c
index 0f3ee1faaa44f727e3c1fa73f360ae2886c84f4a..16c384d2f9f48059bb8d34fc012631ea5a7e9f51 100644 (file)
--- a/src/util/virerror.c
+++ b/src/util/virerror.c
@@ -27,7 +27,6 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "virthread.h"
-#include "virutil.h"
 #include "virstring.h"
 
 #define LIBVIRT_VIRERRORPRIV_H_ALLOW

diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c
index ee72b579e43ab274a7e996ec902784b9fdd5b6b0..22760e6389a0b035d08da792667378d1f172ff7e 100644 (file)
--- a/src/util/virfirewall.c
+++ b/src/util/virfirewall.c
@@ -27,7 +27,6 @@
 #include "virfirewalld.h"
 #include "viralloc.h"
 #include "virerror.h"
-#include "virutil.h"
 #include "virstring.h"
 #include "vircommand.h"
 #include "virlog.h"

diff --git a/src/util/virgic.c b/src/util/virgic.c
index a3ea3ce6ff6c4864d6df9eba45d6d57479702b8f..dcae97356ddcf1ece0679e28ee1145b4ad1e714d 100644 (file)
--- a/src/util/virgic.c
+++ b/src/util/virgic.c
@@ -21,7 +21,6 @@
 #include <config.h>
 #include "internal.h"
 #include "virgic.h"
-#include "virutil.h"
 
 VIR_ENUM_IMPL(virGICVersion,
               VIR_GIC_VERSION_LAST,

diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c
index 5fd7186760492be2f5387de522ede7e89497843f..d00ef576062320b6cd7bdc77e6008f6e0d991fef 100644 (file)
--- a/src/util/virnetdevbandwidth.c
+++ b/src/util/virnetdevbandwidth.c
@@ -24,7 +24,6 @@
 #include "viralloc.h"
 #include "virerror.h"
 #include "virstring.h"
-#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
index 1119846e61e031ed0af563e95decc5d8506210bd..e1ba119b8b2a76dc9ca7bed16b3061fcf4209d04 100644 (file)
--- a/src/util/virnetdevbridge.c
+++ b/src/util/virnetdevbridge.c
@@ -21,7 +21,6 @@
 #include "virnetdevbridge.h"
 #include "virnetdev.h"
 #include "virerror.h"
-#include "virutil.h"
 #include "virfile.h"
 #include "viralloc.h"
 #include "virlog.h"

diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c
index bfb93cf25889baa04cef0a8297b94be38907978c..cb624c7eec6ad70cdf7a81d453f58162866c0a9b 100644 (file)
--- a/src/util/virnetdevip.c
+++ b/src/util/virnetdevip.c
@@ -25,7 +25,6 @@
 #include "virerror.h"
 #include "virlog.h"
 #include "virstring.h"
-#include "virutil.h"
 #include "vircommand.h"
 #include "viralloc.h"
 

diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c
index b9a27951fb7d5d4a746bd9ada7981380d94e41f8..b3eee1afcebc68972307abad5f3e753ec6fbccf7 100644 (file)
--- a/src/util/virnetdevveth.c
+++ b/src/util/virnetdevveth.c
@@ -26,7 +26,6 @@
 #include "virerror.h"
 #include "virfile.h"
 #include "virstring.h"
-#include "virutil.h"
 #include "virnetdev.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/src/util/virpci.c b/src/util/virpci.c
index 0b1222373e55c603ba6e2fa94eeda2da39e41103..db9528478df2e5973da61100b9e0656a1588473d 100644 (file)
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -36,7 +36,6 @@
 #include "virfile.h"
 #include "virkmod.h"
 #include "virstring.h"
-#include "virutil.h"
 #include "viralloc.h"
 
 VIR_LOG_INIT("util.pci");

diff --git a/src/util/virrandom.c b/src/util/virrandom.c
index 227480352d6fc03bfe4a1b3adc691fb6285bf2ef..0487b4e70b242ddc525fc5921dc976ab0f99a73f 100644 (file)
--- a/src/util/virrandom.c
+++ b/src/util/virrandom.c
@@ -29,7 +29,6 @@
 
 #include "virrandom.h"
 #include "virthread.h"
-#include "virutil.h"
 #include "virerror.h"
 #include "virfile.h"
 #include "virlog.h"

diff --git a/src/util/virscsi.c b/src/util/virscsi.c
index 06659c45c7d57e8cbefceed2dc1908fc63837a5d..e3bd81b5691b60f061d84cb7f06690057846b6b2 100644 (file)
--- a/src/util/virscsi.c
+++ b/src/util/virscsi.c
@@ -31,7 +31,6 @@
 #include "virlog.h"
 #include "virscsi.h"
 #include "virfile.h"
-#include "virutil.h"
 #include "virstring.h"
 #include "virerror.h"
 #include "viralloc.h"

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index d5ac5970f158dd86df8e5d98c2cbc26de1bb63db..831ce30d4d43a46ce4267edbd24d6ed57d64ebdc 100644 (file)
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -34,7 +34,6 @@
 #include "virhash.h"
 #include "virendian.h"
 #include "virstring.h"
-#include "virutil.h"
 #include "viruri.h"
 #include "virbuffer.h"
 #include "virjson.h"

diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c
index d6103bdcb673306d8d7afa991022d4fdbbd87a19..e4e50d837a2d21d7da627720ad80b14bcbf592ac 100644 (file)
--- a/src/util/virtypedparam.c
+++ b/src/util/virtypedparam.c
@@ -25,7 +25,6 @@
 #include <stdarg.h>
 
 #include "viralloc.h"
-#include "virutil.h"
 #include "virerror.h"
 #include "virstring.h"
 

diff --git a/src/util/viruri.c b/src/util/viruri.c
index f16ea16ac1495d32870f23959e706aca8088053c..58d9016a61123473ed43ef4cd196ff09e9deb24d 100644 (file)
--- a/src/util/viruri.c
+++ b/src/util/viruri.c
@@ -27,7 +27,6 @@
 #include "virbuffer.h"
 #include "virlog.h"
 #include "virstring.h"
-#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_URI
 

diff --git a/src/util/virusb.c b/src/util/virusb.c
index a2562b7ea8ab74fc729774e11c43e8df02539dbe..a28604c3f48d8d85fb55c9eb78773ff1690f5f11 100644 (file)
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -29,7 +29,6 @@
 
 #include "virusb.h"
 #include "virlog.h"
-#include "virutil.h"
 #include "virerror.h"
 #include "virfile.h"
 #include "virstring.h"

diff --git a/src/util/virxml.c b/src/util/virxml.c
index 0e66d1623b1e200f7c4b644829727a40f788f72f..9ea7b99dbad44881f5f69afc51431caea25c669b 100644 (file)
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -29,7 +29,6 @@
 #include "virerror.h"
 #include "virxml.h"
 #include "virbuffer.h"
-#include "virutil.h"
 #include "viralloc.h"
 #include "virfile.h"
 #include "virstring.h"

diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c
index 5bc9ae61028916c1db083d3429e39f4c9ae33bd9..ed427622bdf1629dd19760762b9d44c9c276357d 100644 (file)
--- a/src/vbox/vbox_driver.c
+++ b/src/vbox/vbox_driver.c
@@ -38,7 +38,6 @@
 #include "vbox_driver.h"
 #include "vbox_glue.h"
 #include "virerror.h"
-#include "virutil.h"
 #include "domain_event.h"
 #include "domain_conf.h"
 

diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c
index 7c784a49f181ac1b2fbdcb30063555345a8b1b81..83973137e7fc3c1b9b1d4c96bec0046d0dd9daa6 100644 (file)
--- a/tests/fdstreamtest.c
+++ b/tests/fdstreamtest.c
@@ -29,7 +29,6 @@
 #include "virlog.h"
 #include "virstring.h"
 #include "virfile.h"
-#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/tests/testutils.c b/tests/testutils.c
index 8326602c9c0f14307bc424f316d36dd5c3cf07e7..2f6d65364e69da362772f9c5b2c821f36ed32635 100644 (file)
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -29,7 +29,6 @@
 #include "testutils.h"
 #include "internal.h"
 #include "viralloc.h"
-#include "virutil.h"
 #include "virthread.h"
 #include "virerror.h"
 #include "virbuffer.h"

diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c
index 298409e91991b41144cee2b98698dc604cec7c57..0f0c7b17da113b1c096ef1835586a32ba48fa98d 100644 (file)
--- a/tests/virkeycodetest.c
+++ b/tests/virkeycodetest.c
@@ -22,7 +22,6 @@
 #include "testutils.h"
 
 #include "virkeycode.h"
-#include "virutil.h"
 #include "virerror.h"
 #include "viralloc.h"
 #include "virlog.h"

diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c
index 7690377ad310d554f35f70ba7e378bd143dfd15b..0a938f6410f71f96bb32c872d73fab707842b514 100644 (file)
--- a/tests/virportallocatortest.c
+++ b/tests/virportallocatortest.c
@@ -26,7 +26,6 @@
 
 #if defined(__linux__) && defined(RTLD_NEXT)
 
-# include "virutil.h"
 # include "virerror.h"
 # include "viralloc.h"
 # include "virlog.h"

diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c
index 8aa2fcf71d87fe5b8e80d7099e45712ba086501e..a3cdf8630f088c6abc60bca3155977ce40bbbc86 100644 (file)
--- a/tools/virsh-interface.c
+++ b/tools/virsh-interface.c
@@ -40,7 +40,6 @@
 #include "viralloc.h"
 #include "virfile.h"
 #include "virmacaddr.h"
-#include "virutil.h"
 #include "virxml.h"
 #include "virstring.h"
 #include "vsh-table.h"

diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c
index b87040ee6ed718abb9284cb325a7e73dfb3cd782..6e5213dea3ae5c829f2486a7a47dc0501d1a1594 100644 (file)
--- a/tools/virsh-nwfilter.c
+++ b/tools/virsh-nwfilter.c
@@ -25,7 +25,6 @@
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virfile.h"
-#include "virutil.h"
 #include "vsh-table.h"
 
 virNWFilterPtr