Rename util.{c,h} to virutil.{c,h}

diff --git a/cfg.mk b/cfg.mk
index d1b46b95a90ce4c2d1c54856c9d98b4cf50a7bf0..289567f77b3c621522604d6007edcba471b7ebed 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -745,7 +745,7 @@ $(srcdir)/src/remote/remote_client_bodies.h: $(srcdir)/src/remote/remote_protoco
 # List all syntax-check exemptions:
 exclude_file_name_regexp--sc_avoid_strcase = ^tools/virsh\.h$$
 
-_src1=libvirt|fdstream|qemu/qemu_monitor|util/(vircommand|util)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller|locking/lock_daemon
+_src1=libvirt|fdstream|qemu/qemu_monitor|util/(vircommand|virutil)|xen/xend_internal|rpc/virnetsocket|lxc/lxc_controller|locking/lock_daemon
 exclude_file_name_regexp--sc_avoid_write = \
   ^(src/($(_src1))|daemon/libvirtd|tools/console|tests/(shunload|virnettlscontext)test)\.c$$
 
@@ -764,13 +764,13 @@ exclude_file_name_regexp--sc_po_check = ^(docs/|src/rpc/gendispatch\.pl$$)
 exclude_file_name_regexp--sc_prohibit_VIR_ERR_NO_MEMORY = \
   ^(include/libvirt/virterror\.h|daemon/dispatch\.c|src/util/virterror\.c)$$
 
-exclude_file_name_regexp--sc_prohibit_access_xok = ^src/util/util\.c$$
+exclude_file_name_regexp--sc_prohibit_access_xok = ^src/util/virutil\.c$$
 
 exclude_file_name_regexp--sc_prohibit_always_true_header_tests = \
   ^python/(libvirt-(qemu-)?override|typewrappers)\.c$$
 
 exclude_file_name_regexp--sc_prohibit_asprintf = \
-  ^(bootstrap.conf$$|src/util/util\.c$$|examples/domain-events/events-c/event-test\.c$$)
+  ^(bootstrap.conf$$|src/util/virutil\.c$$|examples/domain-events/events-c/event-test\.c$$)
 
 exclude_file_name_regexp--sc_prohibit_close = \
   (\.p[yl]$$|^docs/|^(src/util/virfile\.c|src/libvirt\.c)$$)
@@ -782,10 +782,10 @@ _src2=src/(util/vircommand|libvirt|lxc/lxc_controller|locking/lock_daemon)
 exclude_file_name_regexp--sc_prohibit_fork_wrappers = \
   (^($(_src2)|tests/testutils|daemon/libvirtd)\.c$$)
 
-exclude_file_name_regexp--sc_prohibit_gethostname = ^src/util/util\.c$$
+exclude_file_name_regexp--sc_prohibit_gethostname = ^src/util/virutil\.c$$
 
 exclude_file_name_regexp--sc_prohibit_internal_functions = \
-  ^src/(util/(viralloc|util|virfile)\.[hc]|esx/esx_vi\.c)$$
+  ^src/(util/(viralloc|virutil|virfile)\.[hc]|esx/esx_vi\.c)$$
 
 exclude_file_name_regexp--sc_prohibit_newline_at_end_of_diagnostic = \
   ^src/rpc/gendispatch\.pl$$
@@ -797,14 +797,14 @@ exclude_file_name_regexp--sc_prohibit_raw_allocation = \
   ^(src/util/viralloc\.[ch]|examples/.*)$$
 
 exclude_file_name_regexp--sc_prohibit_readlink = \
-  ^src/(util/util|lxc/lxc_container)\.c$$
+  ^src/(util/virutil|lxc/lxc_container)\.c$$
 
-exclude_file_name_regexp--sc_prohibit_setuid = ^src/util/util\.c$$
+exclude_file_name_regexp--sc_prohibit_setuid = ^src/util/virutil\.c$$
 
 exclude_file_name_regexp--sc_prohibit_sprintf = \
   ^(docs/hacking\.html\.in)|(examples/systemtap/.*stp)|(src/dtrace2systemtap\.pl)|(src/rpc/gensystemtap\.pl)$$
 
-exclude_file_name_regexp--sc_prohibit_strncpy = ^src/util/util\.c$$
+exclude_file_name_regexp--sc_prohibit_strncpy = ^src/util/virutil\.c$$
 
 exclude_file_name_regexp--sc_prohibit_strtol = \
   ^src/(util/virsexpr|(vbox|xen|xenxs)/.*)\.c$$

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 7b76c74622623cd0c16e5cf24b7ff426ee9d153b..6c8bb9498ca7817d5ac51c271fc51ab8b2a65e1a 100644 (file)
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -43,7 +43,7 @@
 #include "libvirtd.h"
 #include "libvirtd-config.h"
 
-#include "util.h"
+#include "virutil.h"
 #include "uuid.h"
 #include "remote_driver.h"
 #include "viralloc.h"

diff --git a/daemon/remote.c b/daemon/remote.c
index 7c7f80622b27c8fb8481db681e8c13bf7ebc08b0..eec43d3433c01641e69e1cdabc29d3eb491ef8dd 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -35,7 +35,7 @@
 #include "datatypes.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "util.h"
+#include "virutil.h"
 #include "stream.h"
 #include "uuid.h"
 #include "libvirt/libvirt-qemu.h"

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1420774df42f1ede1519807af9251b5a7d2e28f2..2cda7a9c22cf54dad5a268af1b7dbf3a9508c6b0 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -139,7 +139,6 @@ src/test/test_driver.c
 src/uml/uml_conf.c
 src/uml/uml_driver.c
 src/util/iohelper.c
-src/util/util.c
 src/util/viraudit.c
 src/util/virauth.c
 src/util/virauthconfig.c
@@ -181,6 +180,7 @@ src/util/virtime.c
 src/util/virtypedparam.c
 src/util/viruri.c
 src/util/virusb.c
+src/util/virutil.c
 src/util/xml.c
 src/vbox/vbox_MSCOMGlue.c
 src/vbox/vbox_XPCOMCGlue.c

diff --git a/python/libvirt-override.c b/python/libvirt-override.c
index 644f34ddfcbfb2a2065f576b8d1fb4462215b49a..91e82c6edf925ef4bfd711ef6beace5aed556799 100644 (file)
--- a/python/libvirt-override.c
+++ b/python/libvirt-override.c
@@ -27,7 +27,7 @@
 #include "viralloc.h"
 #include "virtypedparam.h"
 #include "ignore-value.h"
-#include "util.h"
+#include "virutil.h"
 
 #ifndef __CYGWIN__
 extern void initlibvirtmod(void);

diff --git a/src/Makefile.am b/src/Makefile.am
index 8afcb3186a2eb3a99ff386a93fba90e29cf3ae62..e77d48127e72c84b681aa6af8ed188e4ef50ba3a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,7 +54,6 @@ augeastest_DATA =
 # helper APIs for various purposes
 UTIL_SOURCES =                                                 \
                util/uuid.c util/uuid.h                         \
-               util/util.c util/util.h                         \
                util/viralloc.c util/viralloc.h                 \
                util/virarch.h util/virarch.c                   \
                util/viratomic.h util/viratomic.c               \
@@ -115,7 +114,9 @@ UTIL_SOURCES =                                                      \
                util/virstring.h util/virstring.c \
                util/virtime.h util/virtime.c \
                util/virusb.c util/virusb.h                     \
-               util/viruri.h util/viruri.c
+               util/viruri.h util/viruri.c                     \
+               util/virutil.c util/virutil.h                   \
+               $(NULL)
 
 EXTRA_DIST += $(srcdir)/util/virkeymaps.h $(srcdir)/util/keymaps.csv \
                $(srcdir)/util/virkeycode-mapgen.py

diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 694e9b93dc5e9a21cf4f9999c8c116ef1c6c610d..e786e69e8109ea03aebbe8f728fef7d62f881fd2 100644 (file)
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -28,7 +28,7 @@
 #include "capabilities.h"
 #include "virbuffer.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "uuid.h"
 #include "cpu_conf.h"
 #include "virterror_internal.h"

diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 601136149669ff98dd9f3e68ba9029f1abd81d05..491a8c795d7e36bdb88a0650bdce5e30af127f66 100644 (file)
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -25,7 +25,7 @@
 
 #include "virterror_internal.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virbuffer.h"
 #include "cpu_conf.h"
 #include "domain_conf.h"

diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index 368c26ba7dfd8e88f60c8579a057cc340f926bb1..12865b434dcd378e21aeeb4d21a8413eb1b55214 100644 (file)
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -24,7 +24,7 @@
 #ifndef __VIR_CPU_CONF_H__
 # define __VIR_CPU_CONF_H__
 
-# include "util.h"
+# include "virutil.h"
 # include "virbuffer.h"
 # include "xml.h"
 # include "virbitmap.h"

diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c
index c3ca2d6d7b75e332099b41b5eb6c36302c8326f7..4efafc4d861f0a1341247c92d78599b4a149f999 100644 (file)
--- a/src/conf/device_conf.c
+++ b/src/conf/device_conf.c
@@ -26,7 +26,7 @@
 #include "viralloc.h"
 #include "xml.h"
 #include "uuid.h"
-#include "util.h"
+#include "virutil.h"
 #include "virbuffer.h"
 #include "device_conf.h"
 

diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h
index c1bf096b6867c0704d03817413d66b7b696ce571..52e4ac5157d3a59b7fd09aa518ac88dae0f6f470 100644 (file)
--- a/src/conf/device_conf.h
+++ b/src/conf/device_conf.h
@@ -28,7 +28,7 @@
 # include <libxml/xpath.h>
 
 # include "internal.h"
-# include "util.h"
+# include "virutil.h"
 # include "virthread.h"
 # include "virbuffer.h"
 

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b42024ab1d6bc25874ab4477444a6bb7462a2146..4fb63e6cb07695f002ac47c25f0c104f8d4345a4 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -38,7 +38,7 @@
 #include "verify.h"
 #include "xml.h"
 #include "uuid.h"
-#include "util.h"
+#include "virutil.h"
 #include "virbuffer.h"
 #include "virlog.h"
 #include "nwfilter_conf.h"

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index c7a19ae25136b47b570e14735a6dd268edfd65f5..a975a6337fec1063bba7c4625b9620786e5d5db6 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -32,7 +32,7 @@
 # include "capabilities.h"
 # include "storage_encryption_conf.h"
 # include "cpu_conf.h"
-# include "util.h"
+# include "virutil.h"
 # include "virthread.h"
 # include "virhash.h"
 # include "virsocketaddr.h"

diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
index 046a8a1780c81d63af6934a692f13ff1c2ae98d0..e4b088a6746ca58bd53c6f03c16564f192ef9ba9 100644 (file)
--- a/src/conf/interface_conf.c
+++ b/src/conf/interface_conf.c
@@ -30,7 +30,7 @@
 #include "viralloc.h"
 #include "xml.h"
 #include "uuid.h"
-#include "util.h"
+#include "virutil.h"
 #include "virbuffer.h"
 
 #define VIR_FROM_THIS VIR_FROM_INTERFACE

diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h
index d6f98f1b96255eef724bb5ecd1fd29e29c060423..e636c35cc58996b489c7b21fa1ff2dc812569a87 100644 (file)
--- a/src/conf/interface_conf.h
+++ b/src/conf/interface_conf.h
@@ -29,7 +29,7 @@
 # include <libxml/xpath.h>
 
 # include "internal.h"
-# include "util.h"
+# include "virutil.h"
 # include "virthread.h"
 
 /* There is currently 3 types of interfaces */

diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c
index 35f067c81ed2158a3aa3e91d1e3e4f7cd8657f21..e64aeff4c2e601285dedec6b9b22c1203bcacd6f 100644 (file)
--- a/src/conf/netdev_bandwidth_conf.c
+++ b/src/conf/netdev_bandwidth_conf.c
@@ -24,7 +24,7 @@
 
 #include "netdev_bandwidth_conf.h"
 #include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "domain_conf.h"
 

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 1932851807c9b43bbec46579b7b07ef2b373c75a..42f3593e71d579612f0ea4c1f9c619d547d7289c 100644 (file)
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -40,7 +40,7 @@
 #include "viralloc.h"
 #include "xml.h"
 #include "uuid.h"
-#include "util.h"
+#include "virutil.h"
 #include "virbuffer.h"
 #include "c-ctype.h"
 #include "virfile.h"

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 045f05d25f3af97c260299d18903c2c804d1a047..12819c868630bfb7c199698ba03a86c5029f15db 100644 (file)
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -33,7 +33,7 @@
 #include "node_device_conf.h"
 #include "viralloc.h"
 #include "xml.h"
-#include "util.h"
+#include "virutil.h"
 #include "virbuffer.h"
 #include "uuid.h"
 #include "virpci.h"

diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index 9860f674913a0ea6c7f91fd5f310862319c2f35a..12c36d815f2f487bab138641269185de8323e560 100644 (file)
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -26,7 +26,7 @@
 # define __VIR_NODE_DEVICE_CONF_H__
 
 # include "internal.h"
-# include "util.h"
+# include "virutil.h"
 # include "virthread.h"
 
 # include <libxml/tree.h>

diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h
index d5970644149aa8eba178a5a6da445711f3026926..2ca44b34d8ece2b340e4b3ade37bc45fd9a35eed 100644 (file)
--- a/src/conf/nwfilter_conf.h
+++ b/src/conf/nwfilter_conf.h
@@ -28,7 +28,7 @@
 
 # include "internal.h"
 
-# include "util.h"
+# include "virutil.h"
 # include "virhash.h"
 # include "xml.h"
 # include "virbuffer.h"

diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c
index 5188c7a653f2a6f5300423bede8b5c2b75be87e3..a65cf92d678c0774f9c86368e15ee29b3cc1e33d 100644 (file)
--- a/src/conf/secret_conf.c
+++ b/src/conf/secret_conf.c
@@ -29,7 +29,7 @@
 #include "viralloc.h"
 #include "secret_conf.h"
 #include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "xml.h"
 #include "uuid.h"
 

diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h
index 2064286bfacf8ed54e045816264f5b8a7310ca1c..6079d5b6ab784340b0bb12fa611fab926c478ade 100644 (file)
--- a/src/conf/secret_conf.h
+++ b/src/conf/secret_conf.h
@@ -24,7 +24,7 @@
 # define __VIR_SECRET_CONF_H__
 
 # include "internal.h"
-# include "util.h"
+# include "virutil.h"
 
 VIR_ENUM_DECL(virSecretUsageType)
 

diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 5c40e97fd584a2158445f83de309aaba23e60e3d..810d2bf32a7d68009fdd6c3200842511bcd7c376 100644 (file)
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -42,7 +42,7 @@
 #include "secret_conf.h"
 #include "snapshot_conf.h"
 #include "virstoragefile.h"
-#include "util.h"
+#include "virutil.h"
 #include "uuid.h"
 #include "virfile.h"
 #include "virterror_internal.h"

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 5cd239394c0cc7fcc50378815b5b35267799c3f9..38bb47146fe958cccfb2fa7f52bb1164045eb4be 100644 (file)
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -41,7 +41,7 @@
 #include "xml.h"
 #include "uuid.h"
 #include "virbuffer.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virfile.h"
 

diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index 573c3db7cfab17da79aa553b9e72aad9cf617c9d..ad16ecabb81b2dea9586f09d9970697c810c198b 100644 (file)
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -25,7 +25,7 @@
 # define __VIR_STORAGE_CONF_H__
 
 # include "internal.h"
-# include "util.h"
+# include "virutil.h"
 # include "storage_encryption_conf.h"
 # include "virthread.h"
 

diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c
index 8d3ceac196918db86614d25832bff4dc16792c1e..139c37c91abae6321aa3065af782c16be420c67e 100644 (file)
--- a/src/conf/storage_encryption_conf.c
+++ b/src/conf/storage_encryption_conf.c
@@ -31,7 +31,7 @@
 #include "viralloc.h"
 #include "storage_conf.h"
 #include "storage_encryption_conf.h"
-#include "util.h"
+#include "virutil.h"
 #include "xml.h"
 #include "virterror_internal.h"
 #include "uuid.h"

diff --git a/src/conf/storage_encryption_conf.h b/src/conf/storage_encryption_conf.h
index 40a84973c4274ded5c43402ad36fdcf6e766ec84..57ab1a01355da50b3de5c1d66a2d33150e4d6e54 100644 (file)
--- a/src/conf/storage_encryption_conf.h
+++ b/src/conf/storage_encryption_conf.h
@@ -25,7 +25,7 @@
 
 # include "internal.h"
 # include "virbuffer.h"
-# include "util.h"
+# include "virutil.h"
 
 # include <libxml/tree.h>
 

diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c
index cbc813b489b542734d0366f6a30c20083d0e89bc..8bef6271fef40f6fa7b1ae270c841589169fd7e3 100644 (file)
--- a/src/cpu/cpu_powerpc.c
+++ b/src/cpu/cpu_powerpc.c
@@ -28,7 +28,7 @@
 
 #include "virlog.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "cpu.h"
 
 #include "cpu_map.h"

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 55e20c9a4624ffc7c3e508809e44be7ba1e19471..c9a833a4662a2ed6a4edc3e37e964c209e155fa2 100644 (file)
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -27,7 +27,7 @@
 
 #include "virlog.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "cpu.h"
 #include "cpu_map.h"
 #include "cpu_x86.h"

diff --git a/src/datatypes.c b/src/datatypes.c
index 0907c7daba5fd386fc12e636daddf4a7f54eadc6..07aefcc057cc5365f0344460777ddb906c12e6b7 100644 (file)
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -27,7 +27,7 @@
 #include "virlog.h"
 #include "viralloc.h"
 #include "uuid.h"
-#include "util.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/src/driver.c b/src/driver.c
index 23dc329cddc97efbe015b4c30607665353e665d9..0a5fe0547b1953b936fe6460c05096c2d5c0a253 100644 (file)
--- a/src/driver.c
+++ b/src/driver.c
@@ -27,7 +27,7 @@
 #include "driver.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "util.h"
+#include "virutil.h"
 #include "configmake.h"
 
 #define DEFAULT_DRIVER_DIR LIBDIR "/libvirt/connection-driver"

diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c
index 854fc385950ab7d6325911399f5014f229ad49f9..7cc6ac0d895678b886816b98404f3b047053188f 100644 (file)
--- a/src/esx/esx_device_monitor.c
+++ b/src/esx/esx_device_monitor.c
@@ -25,7 +25,7 @@
 #include <config.h>
 
 #include "internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index 346b9bc2210b2801a2ace6981dca75b387b0881a..8e24e80a567440abb2a27a6ef93163aeb1693687 100644 (file)
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -28,7 +28,7 @@
 #include "domain_conf.h"
 #include "snapshot_conf.h"
 #include "virauth.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"

diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c
index fea67ab3caeb3d97ba204b19a3b49d787214468d..524886fc4e08874a1b8bb0b3d4436ea505b1035f 100644 (file)
--- a/src/esx/esx_interface_driver.c
+++ b/src/esx/esx_interface_driver.c
@@ -25,7 +25,7 @@
 #include <config.h>
 
 #include "internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"

diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c
index fec7e72af535c96f923b193b03cebd46d14646de..0fc2603d07da171a26e7de54ef550ac5390f4338 100644 (file)
--- a/src/esx/esx_network_driver.c
+++ b/src/esx/esx_network_driver.c
@@ -26,7 +26,7 @@
 
 #include "md5.h"
 #include "internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"

diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c
index 7a05a5a2542094da55d0af02dcf6e1d8a4c55004..ecee0fb56097d49d9942682cb308a6280cedbcbc 100644 (file)
--- a/src/esx/esx_nwfilter_driver.c
+++ b/src/esx/esx_nwfilter_driver.c
@@ -25,7 +25,7 @@
 #include <config.h>
 
 #include "internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"

diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c
index 2969b1967d9b4f69d44d7e6c75fa15422e940928..722d3f750738153c0eb3614c4ddbe734a02506bd 100644 (file)
--- a/src/esx/esx_secret_driver.c
+++ b/src/esx/esx_secret_driver.c
@@ -24,7 +24,7 @@
 #include <config.h>
 
 #include "internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"

diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c
index 5ad885a9f7ff63f01b3450522c1c0342c1ec3c16..3c3ab7d93d7155acfa482ea28ed3f34286a6a992 100644 (file)
--- a/src/esx/esx_storage_backend_iscsi.c
+++ b/src/esx/esx_storage_backend_iscsi.c
@@ -28,7 +28,7 @@
 
 #include "internal.h"
 #include "md5.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"

diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c
index 4886fc3bb81eea7bba7bd04c870adf63e9beda12..c57e070f04f94ca8820bf2491aea421f4df36e6d 100644 (file)
--- a/src/esx/esx_storage_backend_vmfs.c
+++ b/src/esx/esx_storage_backend_vmfs.c
@@ -31,7 +31,7 @@
 
 #include "internal.h"
 #include "md5.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"

diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c
index bcda9df66c760d9e8a4b45da8e6d4c09a61524c4..9b2e576057a2bdd6db342399c2d149b1d683c0ce 100644 (file)
--- a/src/esx/esx_util.c
+++ b/src/esx/esx_util.c
@@ -28,7 +28,7 @@
 
 #include "internal.h"
 #include "datatypes.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"

diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c
index 37b6e0f627c5edb94f6d6bbbf612382a33fd1216..2cc80022b759f7c3192c2d3b58fad06c454e5182 100644 (file)
--- a/src/esx/esx_vi.c
+++ b/src/esx/esx_vi.c
@@ -29,7 +29,7 @@
 #include "virbuffer.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "util.h"
+#include "virutil.h"
 #include "uuid.h"
 #include "vmx.h"
 #include "xml.h"

diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c
index b93223d634b2f2c21e912e460e8508191c1751a4..d1f91ffa2f809bcea7e56bd2e89eb4da1d75dada 100644 (file)
--- a/src/esx/esx_vi_types.c
+++ b/src/esx/esx_vi_types.c
@@ -31,7 +31,7 @@
 #include "datatypes.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "util.h"
+#include "virutil.h"
 #include "esx_vi.h"
 #include "esx_vi_types.h"
 

diff --git a/src/fdstream.c b/src/fdstream.c
index 39e92b829cfaf8f2faa4f55cbb8fc098635508d6..f7f101ecfdc5c1c959f0285d05542ced9d155003 100644 (file)
--- a/src/fdstream.c
+++ b/src/fdstream.c
@@ -37,7 +37,7 @@
 #include "datatypes.h"
 #include "virlog.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virfile.h"
 #include "configmake.h"
 

diff --git a/src/hyperv/hyperv_device_monitor.c b/src/hyperv/hyperv_device_monitor.c
index d6edb76c71c694ade62a205b30df6ba7ddfec72c..10d559f7ce2802b8aac07e333a30072cae6444a4 100644 (file)
--- a/src/hyperv/hyperv_device_monitor.c
+++ b/src/hyperv/hyperv_device_monitor.c
@@ -26,7 +26,7 @@
 #include "internal.h"
 #include "virterror_internal.h"
 #include "datatypes.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"

diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index 749c7f01f48bbbc0b59edf4d55c7c3be76f55af4..d777bd808aa53e88cb09250422d5546d255770a1 100644 (file)
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -27,7 +27,7 @@
 #include "datatypes.h"
 #include "domain_conf.h"
 #include "virauth.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"

diff --git a/src/hyperv/hyperv_interface_driver.c b/src/hyperv/hyperv_interface_driver.c
index 43c7dd7698224b223da4e2452680218829258b3d..af37de3eea126f3bac37a5e30e551b96a443a9ae 100644 (file)
--- a/src/hyperv/hyperv_interface_driver.c
+++ b/src/hyperv/hyperv_interface_driver.c
@@ -26,7 +26,7 @@
 #include "internal.h"
 #include "virterror_internal.h"
 #include "datatypes.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"

diff --git a/src/hyperv/hyperv_network_driver.c b/src/hyperv/hyperv_network_driver.c
index 06b051bc336d04bbc19bee32bb3a8788c788117a..cafc95628845180964e1a98051f67deecb05c13c 100644 (file)
--- a/src/hyperv/hyperv_network_driver.c
+++ b/src/hyperv/hyperv_network_driver.c
@@ -26,7 +26,7 @@
 #include "internal.h"
 #include "virterror_internal.h"
 #include "datatypes.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"

diff --git a/src/hyperv/hyperv_nwfilter_driver.c b/src/hyperv/hyperv_nwfilter_driver.c
index 7452b7abed08938bc73ef996e35b3a17ab6cc968..46c57b7c1ba79b021cd56caaa6e52dc1a8b7453e 100644 (file)
--- a/src/hyperv/hyperv_nwfilter_driver.c
+++ b/src/hyperv/hyperv_nwfilter_driver.c
@@ -26,7 +26,7 @@
 #include "internal.h"
 #include "virterror_internal.h"
 #include "datatypes.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"

diff --git a/src/hyperv/hyperv_secret_driver.c b/src/hyperv/hyperv_secret_driver.c
index 04a6adaf052f1352aa0d3a4d00af0a35f9901b0f..ea8fa7e936bec0986e56c7ba47f04cc7da5dbd20 100644 (file)
--- a/src/hyperv/hyperv_secret_driver.c
+++ b/src/hyperv/hyperv_secret_driver.c
@@ -26,7 +26,7 @@
 #include "internal.h"
 #include "virterror_internal.h"
 #include "datatypes.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"

diff --git a/src/hyperv/hyperv_storage_driver.c b/src/hyperv/hyperv_storage_driver.c
index b2817a2dd96efa39e04d67921f8df1ab1ce28260..75498018fe77bab4d4aae6b86a0c1dc2e39753b4 100644 (file)
--- a/src/hyperv/hyperv_storage_driver.c
+++ b/src/hyperv/hyperv_storage_driver.c
@@ -26,7 +26,7 @@
 #include "internal.h"
 #include "virterror_internal.h"
 #include "datatypes.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"

diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c
index 016d415ae961518e5dd34a68019ab55f361f98cd..69a57c664ab2bf300fd41d19c8c9a1c2e965f18b 100644 (file)
--- a/src/hyperv/hyperv_util.c
+++ b/src/hyperv/hyperv_util.c
@@ -24,7 +24,7 @@
 
 #include "internal.h"
 #include "datatypes.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"

diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c
index 69e7283e9cbac99bbad499abcf024ea3fbd08530..f4afdce49631a1656c6c79476bdacf0f7ad3650e 100644 (file)
--- a/src/hyperv/hyperv_wmi.c
+++ b/src/hyperv/hyperv_wmi.c
@@ -29,7 +29,7 @@
 #include "datatypes.h"
 #include "virlog.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "uuid.h"
 #include "virbuffer.h"
 #include "hyperv_private.h"

diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
index 3d90c57a3c887f8ec1423507e28581c599bd29a0..df9923ef134aa395f87c1001fa4c711269d1c2ea 100644 (file)
--- a/src/locking/lock_daemon.c
+++ b/src/locking/lock_daemon.c
@@ -33,7 +33,7 @@
 
 #include "lock_daemon.h"
 #include "lock_daemon_config.h"
-#include "util.h"
+#include "virutil.h"
 #include "virfile.h"
 #include "virpidfile.h"
 #include "virprocess.h"

diff --git a/src/locking/lock_daemon_dispatch.c b/src/locking/lock_daemon_dispatch.c
index 78c97266b50a56dbb69c78051fd2015ca5d36ac8..def7c2f16313b08096abc768ea651a51fa972500 100644 (file)
--- a/src/locking/lock_daemon_dispatch.c
+++ b/src/locking/lock_daemon_dispatch.c
@@ -24,7 +24,7 @@
 
 #include "rpc/virnetserver.h"
 #include "rpc/virnetserverclient.h"
-#include "util.h"
+#include "virutil.h"
 #include "virlog.h"
 
 #include "lock_daemon.h"

diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c
index cee530d80d8bd82ddbf8ccc1906e46ce292ede3a..547db8502ec0e3aaf543a28a8e7fe5ee8f21be95 100644 (file)
--- a/src/locking/lock_driver_lockd.c
+++ b/src/locking/lock_driver_lockd.c
@@ -26,7 +26,7 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "uuid.h"
-#include "util.h"
+#include "virutil.h"
 #include "virfile.h"
 #include "virterror_internal.h"
 #include "rpc/virnetclient.h"

diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c
index e5204440d5aadf092800bb43e75977f05ec89c85..511543aaedfcb6b83469c86356be0a8d0e973143 100644 (file)
--- a/src/locking/lock_driver_sanlock.c
+++ b/src/locking/lock_driver_sanlock.c
@@ -40,7 +40,7 @@
 #include "virlog.h"
 #include "virterror_internal.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virfile.h"
 #include "md5.h"
 #include "virconf.h"

diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c
index f938b04a58dc8744bac883d97c27bb4aeb686ace..d73e184902a9f20e6b145245fbfeb3e40f37c50a 100644 (file)
--- a/src/locking/lock_manager.c
+++ b/src/locking/lock_manager.c
@@ -25,7 +25,7 @@
 #include "lock_driver_nop.h"
 #include "virterror_internal.h"
 #include "virlog.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "uuid.h"
 

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 6b66fdebabdcd1436c9e98d5b300ec48a5ac2847..ca741f9c5ab874a9b997ed9615b41b9dff812b4b 100644 (file)
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -56,7 +56,7 @@
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "lxc_container.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virnetdevveth.h"
 #include "uuid.h"

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 8283c8ff72c5ab1dd1875c54c261236f7807021b..123db3c33d86180e87ec4039f8faf492c719c35b 100644 (file)
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -53,7 +53,7 @@
 
 #include "virterror_internal.h"
 #include "virlog.h"
-#include "util.h"
+#include "virutil.h"
 
 #include "lxc_conf.h"
 #include "lxc_container.h"
@@ -63,7 +63,6 @@
 #include "virnetdev.h"
 #include "virnetdevveth.h"
 #include "viralloc.h"
-#include "util.h"
 #include "virfile.h"
 #include "virpidfile.h"
 #include "vircommand.h"

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 936d21e0e7b9e0542f306ada81d02d526ade73a6..2f89452f29b93528184d25894bca44af9f8f9fd5 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -46,7 +46,7 @@
 #include "lxc_driver.h"
 #include "lxc_process.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virnetdevbridge.h"
 #include "virnetdevveth.h"
 #include "nodeinfo.h"

diff --git a/src/lxc/lxc_fuse.h b/src/lxc/lxc_fuse.h
index 987801710648ccae916936a0224d4c5213a068b2..93964a45c60f2e8c566c1ce1617ecffb8f7f2217 100644 (file)
--- a/src/lxc/lxc_fuse.h
+++ b/src/lxc/lxc_fuse.h
@@ -32,7 +32,7 @@
 # endif
 
 # include "lxc_conf.h"
-# include "util.h"
+# include "virutil.h"
 # include "viralloc.h"
 
 struct virLXCMeminfo {

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 90beb7eeb3325204718cf9ae393ece2b796d8f6c..da72562a30c98ea0c823c7206e44655e843253be 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -52,7 +52,7 @@
 #include "driver.h"
 #include "virbuffer.h"
 #include "virpidfile.h"
-#include "util.h"
+#include "virutil.h"
 #include "vircommand.h"
 #include "viralloc.h"
 #include "uuid.h"

diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index d91481652213a3ea306584991be8e1cef2f501ae..6cc18373a678582c83a6ec8db684494614d0d125 100644 (file)
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -37,7 +37,7 @@
 #include "node_device_conf.h"
 #include "node_device_hal.h"
 #include "node_device_driver.h"
-#include "util.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NODEDEV
 

diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 7289a720e3f7eeedfb216f734eb1fbe7f7adad33..d350955b40f35d49acfbf6aaf52676cdf2573591 100644 (file)
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -35,7 +35,7 @@
 #include "virlog.h"
 #include "viralloc.h"
 #include "uuid.h"
-#include "util.h"
+#include "virutil.h"
 #include "virbuffer.h"
 #include "virpci.h"
 

diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index 71a52afcc6809ce7ec3dd7d4bbde2e62e2d69524..337e6849f3c55b4b32fc6395f43b9e29db11d143 100644 (file)
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -47,7 +47,7 @@
 #include "viralloc.h"
 #include "nodeinfo.h"
 #include "physmem.h"
-#include "util.h"
+#include "virutil.h"
 #include "virlog.h"
 #include "virterror_internal.h"
 #include "count-one-bits.h"

diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 7e42b51f5ea209a4323c234623edd6e22648b62b..4b1e25835aac25eaac80bd172b650eedcb7000c4 100644 (file)
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -48,7 +48,7 @@
 #include "uuid.h"
 #include "virbuffer.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "nodeinfo.h"
 #include "virfile.h"
 #include "vircommand.h"

diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index f83a78f96d64ad618825c132c09417be2d91d419..ca0e927868c071f8898e1a36667362968e124536 100644 (file)
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -49,7 +49,7 @@
 #include "openvz_driver.h"
 #include "openvz_util.h"
 #include "virbuffer.h"
-#include "util.h"
+#include "virutil.h"
 #include "openvz_conf.h"
 #include "nodeinfo.h"
 #include "viralloc.h"

diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
index 2ac01c4c3964a698f686c8005bb157db66d4b7b8..75cce6806354eafef2ed15ae430c9b92ce566830 100644 (file)
--- a/src/parallels/parallels_driver.c
+++ b/src/parallels/parallels_driver.c
@@ -43,7 +43,7 @@
 #include "datatypes.h"
 #include "virterror_internal.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virlog.h"
 #include "vircommand.h"
 #include "configmake.h"

diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index b09156ff3f6a55f4df0700c289b36e1f890d1123..bfb6ed1a3480c8ebdd4d94cdac7e67f167e31e3b 100644 (file)
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -44,7 +44,7 @@
 
 #include "internal.h"
 #include "virauth.h"
-#include "util.h"
+#include "virutil.h"
 #include "datatypes.h"
 #include "virbuffer.h"
 #include "viralloc.h"

diff --git a/src/qemu/qemu_bridge_filter.c b/src/qemu/qemu_bridge_filter.c
index 08a9f1a67c2611b78d3950e1fb3ed0c0b891b8fd..6d84f4711080773f84c0fa133f3c7f3011225ebd 100644 (file)
--- a/src/qemu/qemu_bridge_filter.c
+++ b/src/qemu/qemu_bridge_filter.c
@@ -25,7 +25,7 @@
 #include "virebtables.h"
 #include "qemu_conf.h"
 #include "qemu_driver.h"
-#include "util.h"
+#include "virutil.h"
 #include "virterror_internal.h"
 #include "virlog.h"
 

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index ba2e30f0a0c8032f942cf9e30d3b5592e4408ca5..8f1678b49768d3de080914955984cf707d6cfb26 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -27,7 +27,7 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "virfile.h"
 #include "virpidfile.h"
 #include "virprocess.h"

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index de4a5be9617c62ed6b417974c808c96783c42d6e..a2ea5c6438335227bb4834a54be92c5e36166b5c 100644 (file)
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -30,7 +30,7 @@
 #include "virlog.h"
 #include "viralloc.h"
 #include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "domain_audit.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 1926cfb9fba725506d75e0f6c87b8427abd3db9f..37ca58d426d1408a01a72b4ae1f94c0f53ae8d2e 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -31,8 +31,8 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "virterror_internal.h"
-#include "util.h"
 #include "virarch.h"
+#include "virutil.h"
 #include "virfile.h"
 #include "uuid.h"
 #include "c-ctype.h"

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 9e0789f835b96c841443a757cbe00db27b75a45e..c8e5d53aa23cdd34caab8462cd540c76fd3e8ca0 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -42,7 +42,7 @@
 #include "uuid.h"
 #include "virbuffer.h"
 #include "virconf.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "datatypes.h"
 #include "xml.h"

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index a14cdb394bdf9d55027004efc8fe98475781829e..2d8f3f421ea57dceafa5763c154ee042caf51635 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -62,7 +62,7 @@
 #include "virlog.h"
 #include "datatypes.h"
 #include "virbuffer.h"
-#include "util.h"
+#include "virutil.h"
 #include "nodeinfo.h"
 #include "virstatslinux.h"
 #include "capabilities.h"

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 5494e20125f0ef002d749db4ee01687dfd667128..d1cba02d7cd99c7a36c29c24eda0a3982fb4d1f3 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -39,7 +39,7 @@
 #include "virlog.h"
 #include "virterror_internal.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virfile.h"
 #include "datatypes.h"
 #include "fdstream.h"

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 0e823bddfb96d0c7f14d086b7428465570a6efc4..ad144d01af9ea4b9c8fb1bba35c62990dfc53405 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -57,7 +57,7 @@
 #include "virhook.h"
 #include "virfile.h"
 #include "virpidfile.h"
-#include "util.h"
+#include "virutil.h"
 #include "c-ctype.h"
 #include "nodeinfo.h"
 #include "domain_audit.h"

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 2edf6e64633a2634c8f8e8c8c7e172c6736d0386..ac7dc872358e9ecfbafdf7330003aef2119de34d 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -39,7 +39,7 @@
 #include "remote_protocol.h"
 #include "qemu_protocol.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virfile.h"
 #include "vircommand.h"
 #include "intprops.h"

diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c
index 5c14e1411583dfc29f97f10cd5c82edb061e6612..18be350a992bb6577ae6e802d6f73e9b34b6c695 100644 (file)
--- a/src/rpc/virkeepalive.c
+++ b/src/rpc/virkeepalive.c
@@ -26,7 +26,7 @@
 #include "virthread.h"
 #include "virfile.h"
 #include "virlog.h"
-#include "util.h"
+#include "virutil.h"
 #include "virterror_internal.h"
 #include "virnetsocket.h"
 #include "virkeepaliveprotocol.h"

diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index 85787f028fe141928e2dc04fe53e30abdd1e8f40..9347f0b45c45688e87b0ed417b69bbbd94e942a4 100644 (file)
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -34,7 +34,7 @@
 #include "virthread.h"
 #include "virfile.h"
 #include "virlog.h"
-#include "util.h"
+#include "virutil.h"
 #include "virterror_internal.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC

diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c
index 00948e09fa962e89b4aca6d151108d645f81e2b5..eff4a4c09d624bce9d67196fb6f86c171ea4eefe 100644 (file)
--- a/src/rpc/virnetclientprogram.c
+++ b/src/rpc/virnetclientprogram.c
@@ -31,7 +31,7 @@
 #include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
-#include "util.h"
+#include "virutil.h"
 #include "virfile.h"
 #include "virthread.h"
 

diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c
index f273811aba69e74c5464962b9bb3d0c07baba508..b2da65bbee47d28834a1d1d41c9cf7adff2cc724 100644 (file)
--- a/src/rpc/virnetmessage.c
+++ b/src/rpc/virnetmessage.c
@@ -28,7 +28,7 @@
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "virfile.h"
-#include "util.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_RPC
 

diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
index b48af5e90fb722897f8c61ab0c66df11f0766b7d..47a629302b2ae5c1877514424e41b15a064f2b72 100644 (file)
--- a/src/rpc/virnetserver.c
+++ b/src/rpc/virnetserver.c
@@ -33,7 +33,7 @@
 #include "virterror_internal.h"
 #include "virthread.h"
 #include "virthreadpool.h"
-#include "util.h"
+#include "virutil.h"
 #include "virfile.h"
 #include "virnetservermdns.h"
 #include "virdbus.h"

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 442850ad7f3f04ac099ce01ae1ec26aa2c8df9a4..a959c30c02f24cc16042b4b4073b54fb1ac4a2b0 100644 (file)
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -41,7 +41,7 @@
 
 #include "c-ctype.h"
 #include "virnetsocket.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"

diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index 663b7cd1215d73b9cee11dfe2a5fca60d0120d44..ad8bd48db9718b327da6f2dc6332054f9f9e1f61 100644 (file)
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -31,7 +31,7 @@
 #include "virlog.h"
 #include "configmake.h"
 #include "virthread.h"
-#include "util.h"
+#include "virutil.h"
 #include "virterror_internal.h"
 #include "virobject.h"
 

diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
index 1ff40cf47b2cd1e29886ef0e035f7a890451ed6d..b01de8c3fed96ee442de834547b10fc1af6fc085 100644 (file)
--- a/src/rpc/virnettlscontext.c
+++ b/src/rpc/virnettlscontext.c
@@ -32,7 +32,7 @@
 
 #include "viralloc.h"
 #include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "virlog.h"
 #include "virthread.h"
 #include "configmake.h"

diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index 672ff54997d93c4d66e902736f9eae0cb178b970..8dfd921da743b397731af8074ed8b625c1c9cea8 100644 (file)
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -37,7 +37,7 @@
 #include "secret_conf.h"
 #include "secret_driver.h"
 #include "virthread.h"
-#include "util.h"
+#include "virutil.h"
 #include "uuid.h"
 #include "virterror_internal.h"
 #include "virfile.h"

diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index d9699e2684ecb3fe611258e51f153ad92afb4b28..275430114090843d47d364dde0321e6fc0ef4aea 100644 (file)
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -38,7 +38,7 @@
 #include "internal.h"
 
 #include "security_apparmor.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virterror_internal.h"
 #include "datatypes.h"

diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 6a4e1b74326f429ba965ff5c66cc8728befb010d..5da4e73223389d96f0debbecba765005cfbe30a9 100644 (file)
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -25,7 +25,7 @@
 
 #include "security_dac.h"
 #include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "virpci.h"

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 3ed7ee5187826297ed60e4c5bb70e2861e5bc171..947fb34513315b187c51237030f072e72b4a1423 100644 (file)
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -34,7 +34,7 @@
 #include "security_driver.h"
 #include "security_selinux.h"
 #include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "virpci.h"
@@ -43,7 +43,7 @@
 #include "virfile.h"
 #include "virhash.h"
 #include "virrandom.h"
-#include "util.h"
+#include "virutil.h"
 #include "virconf.h"
 
 #define VIR_FROM_THIS VIR_FROM_SECURITY

diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index c46603699889471dfd63993bd61695fa4778152f..e21e98cd5eac538cf41946bf58a37243add3c46e 100644 (file)
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -41,7 +41,7 @@
 
 #include "internal.h"
 #include "virbuffer.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "vircommand.h"
 

diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c
index 5417ced8a59cc610ed16bc5b1421782b980fb388..83f827985610826aaf32af8edd126b389c970d18 100644 (file)
--- a/src/storage/parthelper.c
+++ b/src/storage/parthelper.c
@@ -41,7 +41,7 @@
 #include <unistd.h>
 #include <locale.h>
 
-#include "util.h"
+#include "virutil.h"
 #include "c-ctype.h"
 #include "configmake.h"
 

diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c
index 9b98dbb9000125f7e461a549b9a3f68894f8d7b0..29272f145f34df5924a56a681110359b57629093 100644 (file)
--- a/src/storage/storage_backend.c
+++ b/src/storage/storage_backend.c
@@ -47,7 +47,7 @@
 
 #include "datatypes.h"
 #include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "internal.h"
 #include "secret_conf.h"

diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c
index 8759b3a8cd68875d5f2efdd2afe1210b50b30cab..aceb82bd31ce1e6bec778d7519ce3e63c630cf83 100644 (file)
--- a/src/storage/storage_backend_disk.c
+++ b/src/storage/storage_backend_disk.c
@@ -29,7 +29,7 @@
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "storage_backend_disk.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "vircommand.h"
 #include "configmake.h"

diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c
index ecb8f8e42d95e5497c8b11e970c7162f276bf16e..e91c4b15518027bd535a2407d5b79b815dd7c3b6 100644 (file)
--- a/src/storage/storage_backend_iscsi.c
+++ b/src/storage/storage_backend_iscsi.c
@@ -37,7 +37,7 @@
 #include "virterror_internal.h"
 #include "storage_backend_scsi.h"
 #include "storage_backend_iscsi.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "virfile.h"

diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index e1f07abb4bc0cac4496243c7944fdaef3c2d336d..ffa3234571e1ab4913afee20dd939b1541be7d63 100644 (file)
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -25,7 +25,7 @@
 #include "virterror_internal.h"
 #include "storage_backend_rbd.h"
 #include "storage_conf.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "base64.h"

diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c
index d3b9d87afa56b9020df77c6460646771bfdbd1ad..1046ac9710444b948e7fec345c80224cf293df41 100644 (file)
--- a/src/storage/storage_backend_sheepdog.c
+++ b/src/storage/storage_backend_sheepdog.c
@@ -30,7 +30,7 @@
 #include "storage_backend_sheepdog.h"
 #include "storage_conf.h"
 #include "vircommand.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index aebf8bb546a29c86d3b84354dbe15f947d4a77bd..d93617c489f04e8f934aa12dfd630ba23d1f00d7 100644 (file)
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -39,7 +39,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "driver.h"
-#include "util.h"
+#include "virutil.h"
 #include "storage_driver.h"
 #include "storage_conf.h"
 #include "viralloc.h"

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index c91e3cd49d1aa5a26bf66186f9d9cca4602794c9..4c0b1ab5002ca7e127a7c3e210975c7464406115 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -36,7 +36,7 @@
 #include "datatypes.h"
 #include "test_driver.h"
 #include "virbuffer.h"
-#include "util.h"
+#include "virutil.h"
 #include "uuid.h"
 #include "capabilities.h"
 #include "viralloc.h"

diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index 496f2795368d5d84577646208ea7ed37b7a2a76e..38afbb9bb8a9f9f4556bca61a0943669739dcebf 100644 (file)
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -38,7 +38,7 @@
 #include "uuid.h"
 #include "virbuffer.h"
 #include "virconf.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "nodeinfo.h"
 #include "virlog.h"

diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index b20998fdaba87fd236a2185d27e7861011f8a54e..05fb7f26623a4a9197292aeed3993e6fbd83864c 100644 (file)
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -47,7 +47,7 @@
 #include "uml_driver.h"
 #include "uml_conf.h"
 #include "virbuffer.h"
-#include "util.h"
+#include "virutil.h"
 #include "nodeinfo.h"
 #include "virstatslinux.h"
 #include "capabilities.h"

diff --git a/src/util/iohelper.c b/src/util/iohelper.c
index dcb5c141aecc482535e7ad3708e429ff22c73be9..40b04f9000a87b0a4ef7cd9499f7ad31a3e01f4f 100644 (file)
--- a/src/util/iohelper.c
+++ b/src/util/iohelper.c
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "util.h"
+#include "virutil.h"
 #include "virthread.h"
 #include "virfile.h"
 #include "viralloc.h"

diff --git a/src/util/uuid.c b/src/util/uuid.c
index 5232ba93ddb9898821a09cf15568dc4967ba32f8..57cfaa6c437890bed657a321e871b26f7e7032af 100644 (file)
--- a/src/util/uuid.c
+++ b/src/util/uuid.c
@@ -35,7 +35,7 @@
 
 #include "c-ctype.h"
 #include "internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "viralloc.h"

diff --git a/src/util/viraudit.c b/src/util/viraudit.c
index a807b7604120f23922c03e0ededf71adfc37c8ab..05189d5ff758e6fea85053a6f8feba9d4a29f46a 100644 (file)
--- a/src/util/viraudit.c
+++ b/src/util/viraudit.c
@@ -30,7 +30,7 @@
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "viraudit.h"
-#include "util.h"
+#include "virutil.h"
 #include "virfile.h"
 #include "viralloc.h"
 

diff --git a/src/util/virauth.c b/src/util/virauth.c
index c4c5676f43fb572e77b89bc1911df10c2319c4be..cbb16ec26322bc78d034ee8e86790fa24d735236 100644 (file)
--- a/src/util/virauth.c
+++ b/src/util/virauth.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 
 #include "virauth.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "datatypes.h"

diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c
index a0f0be56d093c38962ff0e45350046236fe2c342..d60f7bff9e5b38678100a1f218c5c2307b755dde 100644 (file)
--- a/src/util/virauthconfig.c
+++ b/src/util/virauthconfig.c
@@ -26,7 +26,7 @@
 
 #include "virkeyfile.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virlog.h"
 #include "virterror_internal.h"
 

diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c
index a7ba60e1acc0b3f707b05eed64e31531845e8688..e0323742ed9b3b498fae0646bb76e262fb706545 100644 (file)
--- a/src/util/virbitmap.c
+++ b/src/util/virbitmap.c
@@ -33,7 +33,7 @@
 #include "virbitmap.h"
 #include "viralloc.h"
 #include "virbuffer.h"
-#include "util.h"
+#include "virutil.h"
 #include "c-ctype.h"
 #include "count-one-bits.h"
 

diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
index 5c628cc8907c6a712034d3e5d129f945ba2108cc..48cba93a19e9a36e6dc936ae826e3ba74056962a 100644 (file)
--- a/src/util/vircgroup.c
+++ b/src/util/vircgroup.c
@@ -38,7 +38,7 @@
 #include <dirent.h>
 
 #include "internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "vircgroup.h"
 #include "virlog.h"

diff --git a/src/util/vircommand.c b/src/util/vircommand.c
index 6e17a8d9aa58ea411487273ef7d4b9fa44aba186..d059586380c8989602dc711a184c68e7f8da707c 100644 (file)
--- a/src/util/vircommand.c
+++ b/src/util/vircommand.c
@@ -36,7 +36,7 @@
 #include "vircommand.h"
 #include "viralloc.h"
 #include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "virlog.h"
 #include "virfile.h"
 #include "virpidfile.h"

diff --git a/src/util/vircommand.h b/src/util/vircommand.h
index 4c8816509df412872ddd5ee4e7a8286952462ece..9b7117d9984314224038967d8792fbb339e37480 100644 (file)
--- a/src/util/vircommand.h
+++ b/src/util/vircommand.h
@@ -23,7 +23,7 @@
 # define __VIR_COMMAND_H__
 
 # include "internal.h"
-# include "util.h"
+# include "virutil.h"
 # include "virbuffer.h"
 
 typedef struct _virCommand virCommand;

diff --git a/src/util/virconf.c b/src/util/virconf.c
index 2cd92b5c855e56bacb11e873049eb9d17228896b..aaeb32e24b53fb0188a73f1f06a4e8e772ff31ea 100644 (file)
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
@@ -33,7 +33,7 @@
 #include "virterror_internal.h"
 #include "virbuffer.h"
 #include "virconf.h"
-#include "util.h"
+#include "virutil.h"
 #include "c-ctype.h"
 #include "virlog.h"
 #include "viralloc.h"

diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
index e71a0728068eb9417b0578a71a55c2625b58797c..404e3b9212cadf20c27e0a9355b858bebed0cc03 100644 (file)
--- a/src/util/virdnsmasq.c
+++ b/src/util/virdnsmasq.c
@@ -43,7 +43,7 @@
 #include "datatypes.h"
 #include "virbitmap.h"
 #include "virdnsmasq.h"
-#include "util.h"
+#include "virutil.h"
 #include "vircommand.h"
 #include "viralloc.h"
 #include "virterror_internal.h"

diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c
index b039751956fa5580674162bd05de970b9a90235a..a0b32ad85c35c9e8813aab0e98b1d43d17fedc4d 100644 (file)
--- a/src/util/vireventpoll.c
+++ b/src/util/vireventpoll.c
@@ -35,7 +35,7 @@
 #include "virlog.h"
 #include "vireventpoll.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virfile.h"
 #include "virterror_internal.h"
 #include "virtime.h"

diff --git a/src/util/virhook.c b/src/util/virhook.c
index 140a78d19ef6aff699159c4a45aa8e62869ff47e..c3109b0786a2f5afc434a839f3c3ca26db24dd81 100644 (file)
--- a/src/util/virhook.c
+++ b/src/util/virhook.c
@@ -32,7 +32,7 @@
 
 #include "virterror_internal.h"
 #include "virhook.h"
-#include "util.h"
+#include "virutil.h"
 #include "virlog.h"
 #include "viralloc.h"
 #include "virfile.h"

diff --git a/src/util/virhook.h b/src/util/virhook.h
index 2aad054d41fb72878167d6ae97b6f2f742967085..a63a12536ae421635aef4e92c2936d4257ebd5fb 100644 (file)
--- a/src/util/virhook.h
+++ b/src/util/virhook.h
@@ -25,7 +25,7 @@
 # define __VIR_HOOKS_H__
 
 # include "internal.h"
-# include "util.h"
+# include "virutil.h"
 
 enum virHookDriverType {
     VIR_HOOK_DRIVER_DAEMON = 0,        /* Daemon related events */

diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c
index 91a948f3f8ff1c92694447bf9595e36b2397a229..f8ac673a8eabfa19fd223646628804ae98e32d2b 100644 (file)
--- a/src/util/virinitctl.c
+++ b/src/util/virinitctl.c
@@ -29,7 +29,7 @@
 #include "internal.h"
 #include "virinitctl.h"
 #include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virfile.h"
 

diff --git a/src/util/virjson.c b/src/util/virjson.c
index 652e38dc60ce28c93c6d8c3f897b35880d5f7fe1..e92e3d4224068faaf73ad073aa3f453e8f0c1734 100644 (file)
--- a/src/util/virjson.c
+++ b/src/util/virjson.c
@@ -27,7 +27,7 @@
 #include "viralloc.h"
 #include "virterror_internal.h"
 #include "virlog.h"
-#include "util.h"
+#include "virutil.h"
 
 #if HAVE_YAJL
 # include <yajl/yajl_gen.h>

diff --git a/src/util/virkeycode.h b/src/util/virkeycode.h
index 1522f77d5243c52a7d6452799d6ba2b23bcd1983..a2e139147a21dcd9ad22b560533c61452901ab52 100644 (file)
--- a/src/util/virkeycode.h
+++ b/src/util/virkeycode.h
@@ -22,7 +22,7 @@
 #ifndef __VIR_UTIL_VIRTKEYCODE_H__
 # define __VIR_UTIL_VIRTKEYCODE_H__
 
-# include "util.h"
+# include "virutil.h"
 # include "libvirt/libvirt.h"
 
 VIR_ENUM_DECL(virKeycodeSet);

diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c
index fc61cf50e28d96435610dcd28cd919d7c9055dd5..99e5cd7bab33f14cef9cc701051784871f0bd006 100644 (file)
--- a/src/util/virkeyfile.c
+++ b/src/util/virkeyfile.c
@@ -28,7 +28,7 @@
 #include "c-ctype.h"
 #include "virlog.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virhash.h"
 #include "virkeyfile.h"
 #include "virterror_internal.h"

diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c
index 961e1717dac03ad5fcd95a4e56dfdb2216f70510..81a1d81688d05bc282db08ca2a1b1d5d04f73443 100644 (file)
--- a/src/util/virlockspace.c
+++ b/src/util/virlockspace.c
@@ -25,7 +25,7 @@
 #include "virlog.h"
 #include "viralloc.h"
 #include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "virfile.h"
 #include "virhash.h"
 #include "virthread.h"

diff --git a/src/util/virlog.c b/src/util/virlog.c
index fd010f477b78cbabc213207e4de5d129109d86ad..c29d4ef9c5db1c6518f5a54a87633af3637f0865 100644 (file)
--- a/src/util/virlog.c
+++ b/src/util/virlog.c
@@ -43,7 +43,7 @@
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virbuffer.h"
 #include "virthread.h"
 #include "virfile.h"

diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
index eb341a278c9b14456ab7bdd009307ba751d8b88b..4de88e3566227263c0a260fde5ae5f760eb5a293 100644 (file)
--- a/src/util/virnetdevbridge.c
+++ b/src/util/virnetdevbridge.c
@@ -24,7 +24,7 @@
 
 #include "virnetdevbridge.h"
 #include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "virfile.h"
 #include "viralloc.h"
 #include "intprops.h"

diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c
index 0f7107b5a152e53e86590fd9a9575739aed0acdf..953d76b818b9d28a1b6b0e878ceea93b8424d7cc 100644 (file)
--- a/src/util/virnetdevmacvlan.c
+++ b/src/util/virnetdevmacvlan.c
@@ -29,7 +29,7 @@
 
 #include "virnetdevmacvlan.h"
 #include "virmacaddr.h"
-#include "util.h"
+#include "virutil.h"
 #include "virterror_internal.h"
 
 #define VIR_FROM_THIS VIR_FROM_NET

diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h
index 147cd6f7c7f99090b8388eb1ede5a3f4a03614a1..3216ea01e3ba7a093cd48bd1a8e75a95eb57b949 100644 (file)
--- a/src/util/virnetdevopenvswitch.h
+++ b/src/util/virnetdevopenvswitch.h
@@ -25,7 +25,7 @@
 # define __VIR_NETDEV_OPENVSWITCH_H__
 
 # include "internal.h"
-# include "util.h"
+# include "virutil.h"
 # include "virnetdevvportprofile.h"
 # include "virnetdevvlan.h"
 

diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c
index 339d636e7085d77010f29fc6f18be7f2838425ec..3565bbde64d9e1c7eddf97d4f1f401771d741ce4 100644 (file)
--- a/src/util/virnetdevtap.c
+++ b/src/util/virnetdevtap.c
@@ -32,7 +32,7 @@
 #include "virterror_internal.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "util.h"
+#include "virutil.h"
 
 #include <sys/ioctl.h>
 #include <net/if.h>

diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprofile.h
index c4585a8aafef8821d68c977825a6394164dde220..cc106b857bc4b3581c8b9082dda6f11998445c99 100644 (file)
--- a/src/util/virnetdevvportprofile.h
+++ b/src/util/virnetdevvportprofile.h
@@ -25,7 +25,7 @@
 
 # include "internal.h"
 # include "uuid.h"
-# include "util.h"
+# include "virutil.h"
 # include "virmacaddr.h"
 
 # define LIBVIRT_IFLA_VF_PORT_PROFILE_MAX 40

diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c
index 3b3322b3dcf4aba563b2866cc9a30ad2af26a46b..29097e36229504999794e0b7238a8ba464889e01 100644 (file)
--- a/src/util/virpidfile.c
+++ b/src/util/virpidfile.c
@@ -30,7 +30,7 @@
 #include "virpidfile.h"
 #include "virfile.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "intprops.h"
 #include "virlog.h"
 #include "virterror_internal.h"

diff --git a/src/util/virprocess.c b/src/util/virprocess.c
index 3959ae19b1cd3332c56969577ea758f84ad40bda..38335960ef4b7ecba7223997e6f4a10499ef9e22 100644 (file)
--- a/src/util/virprocess.c
+++ b/src/util/virprocess.c
@@ -31,7 +31,7 @@
 #include "virterror_internal.h"
 #include "viralloc.h"
 #include "virlog.h"
-#include "util.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

diff --git a/src/util/virrandom.c b/src/util/virrandom.c
index 1dd96cf2bdfaa538322e93bc527a2981c0160b1b..1b6de6b20580a3f27ec707f5fa6b7c9b2e504fda 100644 (file)
--- a/src/util/virrandom.c
+++ b/src/util/virrandom.c
@@ -29,7 +29,7 @@
 #include "virrandom.h"
 #include "virthread.h"
 #include "count-one-bits.h"
-#include "util.h"
+#include "virutil.h"
 #include "virterror_internal.h"
 #include "virlog.h"
 

diff --git a/src/util/virsexpr.c b/src/util/virsexpr.c
index 72174c287d1529a8a4e69e91e23edc8260f81831..0e07c115fc7e1121ea9021f747611d95d3955967 100644 (file)
--- a/src/util/virsexpr.c
+++ b/src/util/virsexpr.c
@@ -30,7 +30,7 @@
 
 #include "virterror_internal.h"
 #include "virsexpr.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 
 #define VIR_FROM_THIS VIR_FROM_SEXPR

diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c
index 488ff4b7cc18fc2068ac01010ec314d5f167d2c9..0f2f23d135d42dd3d7f5786b19a966158aebded3 100644 (file)
--- a/src/util/virsocketaddr.c
+++ b/src/util/virsocketaddr.c
@@ -25,7 +25,7 @@
 
 #include "virsocketaddr.h"
 #include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
 
 #include <netdb.h>
 

diff --git a/src/util/virstatslinux.c b/src/util/virstatslinux.c
index 3baa72a916a40e276861c2ef07b46d6676b32d73..7d3f9589a295ffdb868a6d1b4d4f859cd6a09def 100644 (file)
--- a/src/util/virstatslinux.c
+++ b/src/util/virstatslinux.c
@@ -34,7 +34,7 @@
 
 # include "virterror_internal.h"
 # include "datatypes.h"
-# include "util.h"
+# include "virutil.h"
 # include "virstatslinux.h"
 # include "viralloc.h"
 # include "virfile.h"

diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 6929fd01fe328ecb93c4f20b51dd76470a585977..618b028225e4c4801253bdd63bf8da1768949c15 100644 (file)
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -24,7 +24,7 @@
 #ifndef __VIR_STORAGE_FILE_H__
 # define __VIR_STORAGE_FILE_H__
 
-# include "util.h"
+# include "virutil.h"
 
 enum virStorageFileFormat {
     VIR_STORAGE_FILE_AUTO_SAFE = -2,

diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
index d5788b5c5512322d82ea35560f2a83ed10f0baea..6ebeaf68b0b056659d1c1f03fe102b815cdea407 100644 (file)
--- a/src/util/virsysinfo.c
+++ b/src/util/virsysinfo.c
@@ -32,7 +32,7 @@
 
 #include "virterror_internal.h"
 #include "virsysinfo.h"
-#include "util.h"
+#include "virutil.h"
 #include "virlog.h"
 #include "viralloc.h"
 #include "vircommand.h"

diff --git a/src/util/virsysinfo.h b/src/util/virsysinfo.h
index 83a33612a41aa06cee69a26a65424a7a50ecbba2..fbb505b58e72498eee2938b5cafd944dba64eafd 100644 (file)
--- a/src/util/virsysinfo.h
+++ b/src/util/virsysinfo.h
@@ -25,7 +25,7 @@
 # define __VIR_SYSINFOS_H__
 
 # include "internal.h"
-# include "util.h"
+# include "virutil.h"
 # include "virbuffer.h"
 
 enum virSysinfoType {

diff --git a/src/util/virterror.c b/src/util/virterror.c
index 6c773d3ec3e93c7615c20cf450018479fda25f71..a5867386dc2b1841ac4b9f38c455b17851f18301 100644 (file)
--- a/src/util/virterror.c
+++ b/src/util/virterror.c
@@ -32,7 +32,7 @@
 #include "virlog.h"
 #include "viralloc.h"
 #include "virthread.h"
-#include "util.h"
+#include "virutil.h"
 
 virThreadLocal virLastErr;
 

diff --git a/src/util/virtime.c b/src/util/virtime.c
index f9fc2820cfeb32a3b75610acd61a47e00ed3a481..c614380f909be96836970d27c7c9594fd7a58354 100644 (file)
--- a/src/util/virtime.c
+++ b/src/util/virtime.c
@@ -37,7 +37,7 @@
 #include <sys/time.h>
 
 #include "virtime.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virterror_internal.h"
 

diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c
index e08530e17fab817f4d4cd0deabcfac68503b6cc8..60fb485f0774854ad032ce6a915829b44e9522bf 100644 (file)
--- a/src/util/virtypedparam.c
+++ b/src/util/virtypedparam.c
@@ -25,7 +25,7 @@
 #include <stdarg.h>
 
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virterror_internal.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE

diff --git a/src/util/viruri.c b/src/util/viruri.c
index f48079d947f8a7af94fa16c7d0dc1944df9ec474..e59cd5adb0c8ae2935e7adb1dc31a61eaf4c2047 100644 (file)
--- a/src/util/viruri.c
+++ b/src/util/viruri.c
@@ -23,7 +23,7 @@
 #include "viruri.h"
 
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virterror_internal.h"
 #include "virbuffer.h"
 

diff --git a/src/util/virusb.c b/src/util/virusb.c
index c3dd50eaf09b203d72e6e1535c60203a2169e8ef..64bc66e42084c6bdcc8b3157f93ddb3cb120ee49 100644 (file)
--- a/src/util/virusb.c
+++ b/src/util/virusb.c
@@ -36,7 +36,7 @@
 #include "virusb.h"
 #include "virlog.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virterror_internal.h"
 
 #define USB_SYSFS "/sys/bus/usb"

diff --git a/src/util/util.c b/src/util/virutil.c
similarity index 99%
rename from src/util/util.c
rename to src/util/virutil.c
index c7d4aa519848fb05fb22450e9bcce4c26b69ac78..7866aac98fdef17838600b308a08a3fd75c28410 100644 (file)
--- a/src/util/util.c
+++ b/src/util/virutil.c
@@ -1,5 +1,5 @@
 /*
- * utils.c: common, generic utility functions
+ * virutil.c: common, generic utility functions
  *
  * Copyright (C) 2006-2012 Red Hat, Inc.
  * Copyright (C) 2006 Daniel P. Berrange
@@ -78,7 +78,7 @@
 #include "virterror_internal.h"
 #include "virlog.h"
 #include "virbuffer.h"
-#include "util.h"
+#include "virutil.h"
 #include "virstoragefile.h"
 #include "viralloc.h"
 #include "virthread.h"

diff --git a/src/util/util.h b/src/util/virutil.h
similarity index 99%
rename from src/util/util.h
rename to src/util/virutil.h
index 6d5dd038e1c81bb3e3f9e6f15ab02b2938d100a5..e5116edacf4b1ecec5133ce4b4ffc767b7178abd 100644 (file)
--- a/src/util/util.h
+++ b/src/util/virutil.h
@@ -1,5 +1,5 @@
 /*
- * utils.h: common, generic utility functions
+ * virutil.h: common, generic utility functions
  *
  * Copyright (C) 2010-2012 Red Hat, Inc.
  * Copyright (C) 2006, 2007 Binary Karma

diff --git a/src/util/xml.c b/src/util/xml.c
index caf26a3d926552b30e857c824d5249c49b5f9772..05c7f331d69a713c238f121c29d1d045e6482c42 100644 (file)
--- a/src/util/xml.c
+++ b/src/util/xml.c
@@ -33,7 +33,7 @@
 #include "virterror_internal.h"
 #include "xml.h"
 #include "virbuffer.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virfile.h"
 

diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c
index cab4398bececf65975185c590af73ab82064d9e0..36539f62d01f37fde5af18b5bb848966b4ca6d52 100644 (file)
--- a/src/vbox/vbox_MSCOMGlue.c
+++ b/src/vbox/vbox_MSCOMGlue.c
@@ -31,7 +31,7 @@
 
 #include "internal.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virlog.h"
 #include "virterror_internal.h"
 #include "vbox_MSCOMGlue.h"

diff --git a/src/vbox/vbox_XPCOMCGlue.c b/src/vbox/vbox_XPCOMCGlue.c
index 5296127e4b1301b95b0f3fbcc042b1a673f7ce38..1954ddbc1f93076ef0930e6cb0c677dd4a05c853 100644 (file)
--- a/src/vbox/vbox_XPCOMCGlue.c
+++ b/src/vbox/vbox_XPCOMCGlue.c
@@ -38,7 +38,7 @@
 #include "vbox_XPCOMCGlue.h"
 #include "internal.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virlog.h"
 #include "virterror_internal.h"
 

diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c
index cd29e1957c63a4b5a6fdd1b97392646a6d71a0b1..f2a0c8f889c5467d55498852333b2778c20f3e6d 100644 (file)
--- a/src/vbox/vbox_driver.c
+++ b/src/vbox/vbox_driver.c
@@ -38,7 +38,7 @@
 #include "vbox_driver.h"
 #include "vbox_glue.h"
 #include "virterror_internal.h"
-#include "util.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_VBOX
 

diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c
index 233804ed511a7e45e29ceb8ac67bfc60f94b497e..12195bf7d7bcd381e903a21db9289c176a76ad7b 100644 (file)
--- a/src/vmware/vmware_driver.c
+++ b/src/vmware/vmware_driver.c
@@ -28,7 +28,7 @@
 #include "datatypes.h"
 #include "virfile.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "uuid.h"
 #include "vircommand.h"
 #include "vmx.h"

diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c
index 126283b93def5b51785afa418e92718ede5b8029..3f7c97b778ebc15c54f1c74743dbdd8008526929 100644 (file)
--- a/src/xen/block_stats.c
+++ b/src/xen/block_stats.c
@@ -40,7 +40,7 @@
 
 # include "virterror_internal.h"
 # include "datatypes.h"
-# include "util.h"
+# include "virutil.h"
 # include "block_stats.h"
 # include "viralloc.h"
 # include "virfile.h"

diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c
index 9b2fcf3eca0cc4d54624f4886aa30f757c99d6bf..2b8496c77b03396cc552624d7e1a673d5aab0c96 100644 (file)
--- a/src/xen/xen_driver.c
+++ b/src/xen/xen_driver.c
@@ -54,7 +54,7 @@
 # include "xen_inotify.h"
 #endif
 #include "xml.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "node_device_conf.h"
 #include "virpci.h"

diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 22714a3879f8ba346e4879685f385c947588618b..9443d9869d286761cf2615013d973232251df05e 100644 (file)
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -66,7 +66,7 @@
 #include "virlog.h"
 #include "datatypes.h"
 #include "driver.h"
-#include "util.h"
+#include "virutil.h"
 #include "xen_driver.h"
 #include "xen_hypervisor.h"
 #include "xs_internal.h"

diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c
index 6e8bc2f69877b0899211e829c6f58e6b90cbe3de..7ffc5bb7fc4a0a5797412f04c70d8715748e1ef1 100644 (file)
--- a/src/xen/xend_internal.c
+++ b/src/xen/xend_internal.c
@@ -34,7 +34,7 @@
 #include "datatypes.h"
 #include "xend_internal.h"
 #include "driver.h"
-#include "util.h"
+#include "virutil.h"
 #include "virsexpr.h"
 #include "xen_sxpr.h"
 #include "virbuffer.h"

diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c
index 2109972425bd53572f03497f818aefbd491ff8f9..e3206ebb9e760fecb0f2a7163714c16ed94bd31a 100644 (file)
--- a/src/xen/xm_internal.c
+++ b/src/xen/xm_internal.c
@@ -45,7 +45,7 @@
 #include "virhash.h"
 #include "virbuffer.h"
 #include "uuid.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virlog.h"
 #include "count-one-bits.h"

diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index d49181c0af8a98231f7a7d368427a0f548d3c904..49a8a74f728c1f1aeb9350f652634c4eb1f6e39c 100644 (file)
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -31,7 +31,7 @@
 #include "virterror_internal.h"
 #include "datatypes.h"
 #include "virauth.h"
-#include "util.h"
+#include "virutil.h"
 #include "uuid.h"
 #include "viralloc.h"
 #include "virbuffer.h"

diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c
index 33aa4d7559138708e4e4980ff1668689502c1f7e..15be403329877d0fc97cf3a4da4c6155d758be85 100644 (file)
--- a/src/xenapi/xenapi_utils.c
+++ b/src/xenapi/xenapi_utils.c
@@ -29,7 +29,7 @@
 #include "domain_conf.h"
 #include "virterror_internal.h"
 #include "datatypes.h"
-#include "util.h"
+#include "virutil.h"
 #include "uuid.h"
 #include "viralloc.h"
 #include "virbuffer.h"

diff --git a/tests/commandhelper.c b/tests/commandhelper.c
index 3c7fef550a6c436b1d5483e8abd218ab33099e55..39f3c53ae052ff3d894926fafb7a3172107676d0 100644 (file)
--- a/tests/commandhelper.c
+++ b/tests/commandhelper.c
@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include "internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virfile.h"
 #include "testutils.h"

diff --git a/tests/commandtest.c b/tests/commandtest.c
index b15c1688d4183dbe26c0428a6f50c12508e85a88..d6a285e85937c45a72a5ed6421aa6596c0e63642 100644 (file)
--- a/tests/commandtest.c
+++ b/tests/commandtest.c
@@ -31,7 +31,7 @@
 #include "testutils.h"
 #include "internal.h"
 #include "nodeinfo.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "vircommand.h"
 #include "virfile.h"

diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c
index b65009b7880ed5a1a416de5152634e65f5f641f3..55b362309cde7395854d0c29c876ee8d72d02700 100644 (file)
--- a/tests/esxutilstest.c
+++ b/tests/esxutilstest.c
@@ -9,7 +9,7 @@
 # include "internal.h"
 # include "viralloc.h"
 # include "testutils.h"
-# include "util.h"
+# include "virutil.h"
 # include "vmx/vmx.h"
 # include "esx/esx_util.h"
 # include "esx/esx_vi_types.h"

diff --git a/tests/eventtest.c b/tests/eventtest.c
index 6d00ea8c3fe140af99a8e49a9f2f97496bdf7aa7..16a693c2f656aa0317501e16a2e1c72878fe5510 100644 (file)
--- a/tests/eventtest.c
+++ b/tests/eventtest.c
@@ -30,7 +30,7 @@
 #include "internal.h"
 #include "virthread.h"
 #include "virlog.h"
-#include "util.h"
+#include "virutil.h"
 #include "vireventpoll.h"
 
 #define NUM_FDS 31

diff --git a/tests/libvirtdconftest.c b/tests/libvirtdconftest.c
index 0365ade12e481f31e570188ddf8a9562c3937c77..c1d94d224ce22a19dcdc0abe2d590bad823aa58f 100644 (file)
--- a/tests/libvirtdconftest.c
+++ b/tests/libvirtdconftest.c
@@ -24,7 +24,7 @@
 
 #include "testutils.h"
 #include "daemon/libvirtd-config.h"
-#include "util.h"
+#include "virutil.h"
 #include "c-ctype.h"
 #include "virterror_internal.h"
 #include "virlog.h"

diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c
index c79788ea987541e070503c3be5a2796b306c50d6..d900eb9ae9f77a379d3006248dba823fbbe70219 100644 (file)
--- a/tests/nodeinfotest.c
+++ b/tests/nodeinfotest.c
@@ -8,7 +8,7 @@
 #include "testutils.h"
 #include "internal.h"
 #include "nodeinfo.h"
-#include "util.h"
+#include "virutil.h"
 #include "virfile.h"
 
 #if ! (defined __linux__  &&  (defined(__x86_64__) || \

diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c
index 80701a23a6eb2a267cf2195ce71cdf7a2cde7bb2..9fb71787aa23392dc2aaab883e969b655d59cb29 100644 (file)
--- a/tests/openvzutilstest.c
+++ b/tests/openvzutilstest.c
@@ -9,7 +9,7 @@
 # include "internal.h"
 # include "viralloc.h"
 # include "testutils.h"
-# include "util.h"
+# include "virutil.h"
 # include "openvz/openvz_conf.h"
 
 static int

diff --git a/tests/qemumonitortest.c b/tests/qemumonitortest.c
index 21a6828c16c869713a10ff5ab6208ba6161c5ebb..285dfa889eaf37512c44558b74526e56f923b457 100644 (file)
--- a/tests/qemumonitortest.c
+++ b/tests/qemumonitortest.c
@@ -10,7 +10,7 @@
 # include "internal.h"
 # include "viralloc.h"
 # include "testutils.h"
-# include "util.h"
+# include "virutil.h"
 # include "qemu/qemu_monitor.h"
 
 struct testEscapeString

diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index cc388035bfe23b22057684e32762a3d245544541..b82eb5d06383f823391b30e9d24d0a3fe8d2dd87 100644 (file)
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -30,7 +30,7 @@
 #include "qemu/qemu_monitor.h"
 #include "rpc/virnetsocket.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virlog.h"
 #include "virterror_internal.h"
 

diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c
index 0e4959e6dc98500a8a8df39356bbf0c41a92fe65..93742cf50f19e8fc75fe80f9d41bce3dc5898dfa 100644 (file)
--- a/tests/securityselinuxtest.c
+++ b/tests/securityselinuxtest.c
@@ -31,7 +31,7 @@
 #include "internal.h"
 #include "testutils.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virlog.h"
 #include "virterror_internal.h"
 #include "security/security_manager.h"

diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c
index 5dca523beee5ef02f0a466d4ce94dd140f826b7a..aee57e6642442a2711880b3098fe8dd34f848e17 100644 (file)
--- a/tests/sysinfotest.c
+++ b/tests/sysinfotest.c
@@ -33,7 +33,7 @@
 #include "virbuffer.h"
 #include "virsysinfo.h"
 #include "testutils.h"
-#include "util.h"
+#include "virutil.h"
 #include "virfile.h"
 
 #if defined (__linux__)

diff --git a/tests/testutils.c b/tests/testutils.c
index c6b1d233a651ea165ae287b315958677ec298966..d88af21b1fc700bad125ddc3463212495e5f9aa9 100644 (file)
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -40,7 +40,7 @@
 #include "testutils.h"
 #include "internal.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virthread.h"
 #include "virterror_internal.h"
 #include "virbuffer.h"

diff --git a/tests/utiltest.c b/tests/utiltest.c
index 4fbb25ca7025c7f58d380e937fba3a7d091c1b78..9d186526783d4d4c6aa3f5175d8da6803b3b84e0 100644 (file)
--- a/tests/utiltest.c
+++ b/tests/utiltest.c
@@ -8,7 +8,7 @@
 #include "internal.h"
 #include "viralloc.h"
 #include "testutils.h"
-#include "util.h"
+#include "virutil.h"
 
 
 static void

diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c
index 9e7dac5859bb5d420ba50b5515fcc7aca08ce8e6..2ad237d50c0dc8eaa68280ec8bc1ced238e95a72 100644 (file)
--- a/tests/virauthconfigtest.c
+++ b/tests/virauthconfigtest.c
@@ -24,7 +24,7 @@
 #include <signal.h>
 
 #include "testutils.h"
-#include "util.h"
+#include "virutil.h"
 #include "virterror_internal.h"
 #include "viralloc.h"
 #include "virlog.h"

diff --git a/tests/virbuftest.c b/tests/virbuftest.c
index ec93939c4318d1424cb06dec5ba79c47c494da83..7f9ee665bf5b9aa96c3e43db7d8131dcb7b0d161 100644 (file)
--- a/tests/virbuftest.c
+++ b/tests/virbuftest.c
@@ -5,7 +5,7 @@
 #include <string.h>
 
 #include "internal.h"
-#include "util.h"
+#include "virutil.h"
 #include "testutils.h"
 #include "virbuffer.h"
 #include "viralloc.h"

diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c
index e06179fbee5246dd0c99c954c6aa97893de65eaa..cab47d37517cdd7b064ca04045f4136052de4d33 100644 (file)
--- a/tests/virdrivermoduletest.c
+++ b/tests/virdrivermoduletest.c
@@ -21,7 +21,7 @@
 #include <config.h>
 
 #include "testutils.h"
-#include "util.h"
+#include "virutil.h"
 #include "virterror_internal.h"
 #include "viralloc.h"
 #include "virlog.h"

diff --git a/tests/virhashtest.c b/tests/virhashtest.c
index a2a40c6dfe95c7387d36b44483071593fa431ff3..6e4f2670a66dbdef39262b15b4334f60b65a2af1 100644 (file)
--- a/tests/virhashtest.c
+++ b/tests/virhashtest.c
@@ -10,7 +10,7 @@
 #include "virhashdata.h"
 #include "testutils.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virlog.h"
 
 

diff --git a/tests/virkeyfiletest.c b/tests/virkeyfiletest.c
index ad5a516a6d4667333008d997c38372a8e3802a8e..33f64c145d0d477dca26e0042cbf8c521aec3502 100644 (file)
--- a/tests/virkeyfiletest.c
+++ b/tests/virkeyfiletest.c
@@ -24,7 +24,7 @@
 #include <signal.h>
 
 #include "testutils.h"
-#include "util.h"
+#include "virutil.h"
 #include "virterror_internal.h"
 #include "viralloc.h"
 #include "virlog.h"

diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c
index 80478d94b97181f15d4a4ee89b6fd58e17660783..c434f472fbaa4daa09c7da598312a144acc0e2ef 100644 (file)
--- a/tests/virlockspacetest.c
+++ b/tests/virlockspacetest.c
@@ -25,7 +25,7 @@
 #include <sys/stat.h>
 
 #include "testutils.h"
-#include "util.h"
+#include "virutil.h"
 #include "virterror_internal.h"
 #include "viralloc.h"
 #include "virlog.h"

diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c
index e3517e88c8efe01d994e99035ca67fd310ec1940..4e7a1fdfd0c8510c95a2a74b2694239a4dbbefbd 100644 (file)
--- a/tests/virnetmessagetest.c
+++ b/tests/virnetmessagetest.c
@@ -24,7 +24,7 @@
 #include <signal.h>
 
 #include "testutils.h"
-#include "util.h"
+#include "virutil.h"
 #include "virterror_internal.h"
 #include "viralloc.h"
 #include "virlog.h"

diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index 399c4fdc4cb68394a0e1d5a74a0a4c8ecac965df..819257b655d61776d8f190eb8fb99241fe36dd7c 100644 (file)
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -28,7 +28,7 @@
 #include <netdb.h>
 
 #include "testutils.h"
-#include "util.h"
+#include "virutil.h"
 #include "virterror_internal.h"
 #include "viralloc.h"
 #include "virlog.h"

diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c
index 27078ea6b4ad0a4e6698d6f75693d46814ddd6b9..d945181d5eba6d32bc13d6c696ad6d8b64cb8a23 100644 (file)
--- a/tests/virnettlscontexttest.c
+++ b/tests/virnettlscontexttest.c
@@ -27,7 +27,7 @@
 #include <gnutls/x509.h>
 
 #include "testutils.h"
-#include "util.h"
+#include "virutil.h"
 #include "virterror_internal.h"
 #include "viralloc.h"
 #include "virlog.h"

diff --git a/tests/virshtest.c b/tests/virshtest.c
index 72f2a1ec54d1b522628c763170ecd2cb94ff6842..8741d47c473bbc85101e32b34e3750dbac39a4b3 100644 (file)
--- a/tests/virshtest.c
+++ b/tests/virshtest.c
@@ -6,7 +6,7 @@
 
 #include "internal.h"
 #include "xml.h"
-#include "util.h"
+#include "virutil.h"
 #include "testutils.h"
 
 #ifdef WIN32

diff --git a/tests/virstringtest.c b/tests/virstringtest.c
index a8f4c793401bbdd86b4f17e6f20e0b01000e902c..58ab843add72bbd33b3d75a4fb22edaae47b2da0 100644 (file)
--- a/tests/virstringtest.c
+++ b/tests/virstringtest.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 
 #include "testutils.h"
-#include "util.h"
+#include "virutil.h"
 #include "virterror_internal.h"
 #include "viralloc.h"
 #include "virlog.h"

diff --git a/tests/virtimetest.c b/tests/virtimetest.c
index 7d7a2d6ffe839eaf51a3874175ec283727b47d24..1c22d07ef214ca6abb5c988a6b3e3c57a67b7134 100644 (file)
--- a/tests/virtimetest.c
+++ b/tests/virtimetest.c
@@ -24,7 +24,7 @@
 #include <signal.h>
 
 #include "testutils.h"
-#include "util.h"
+#include "virutil.h"
 #include "virterror_internal.h"
 #include "viralloc.h"
 #include "virlog.h"

diff --git a/tests/viruritest.c b/tests/viruritest.c
index 57d38955e2cb29c695f7471f5b0e6f6850160de2..ad59270489fe548f4d200160a3b5d488575f4e3f 100644 (file)
--- a/tests/viruritest.c
+++ b/tests/viruritest.c
@@ -24,7 +24,7 @@
 #include <signal.h>
 
 #include "testutils.h"
-#include "util.h"
+#include "virutil.h"
 #include "virterror_internal.h"
 #include "viralloc.h"
 #include "virlog.h"

diff --git a/tools/console.c b/tools/console.c
index d0313086d9420e6c1c8b453e06f13e923af927a4..d024d38415e38fa7452df916326fbb27d5c3cee8 100644 (file)
--- a/tools/console.c
+++ b/tools/console.c
@@ -39,7 +39,7 @@
 # include "internal.h"
 # include "console.h"
 # include "virlog.h"
-# include "util.h"
+# include "virutil.h"
 # include "virfile.h"
 # include "viralloc.h"
 # include "virthread.h"

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index b0b0c9452770e7bed8dc1bccb3f33154ea12c019..244ffb820477513c14e9b50ebd50b431bdf88660 100644 (file)
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -43,7 +43,7 @@
 #include "conf/domain_conf.h"
 #include "console.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virfile.h"
 #include "virkeycode.h"
 #include "virmacaddr.h"

diff --git a/tools/virsh-host.c b/tools/virsh-host.c
index 2d59a75d065bf14106c593b6e79963cf31622212..0ad4296eafbeea363be4943525e63765684bf2b9 100644 (file)
--- a/tools/virsh-host.c
+++ b/tools/virsh-host.c
@@ -34,7 +34,7 @@
 #include "internal.h"
 #include "virbuffer.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virsh-domain.h"
 #include "xml.h"
 #include "virtypedparam.h"

diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c
index 40216c6b418163db0e02f3b04ed5a70037b19760..ea8a6c5500e56f55a852281231292e2bb572c958 100644 (file)
--- a/tools/virsh-interface.c
+++ b/tools/virsh-interface.c
@@ -34,7 +34,7 @@
 #include "internal.h"
 #include "virbuffer.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "xml.h"
 
 virInterfacePtr

diff --git a/tools/virsh-network.c b/tools/virsh-network.c
index 66ee7e357cc73332edb525c5715eee2e1af175f8..918dee68853ebf8461dd403e3e1eb32cb81cfe37 100644 (file)
--- a/tools/virsh-network.c
+++ b/tools/virsh-network.c
@@ -34,7 +34,7 @@
 #include "internal.h"
 #include "virbuffer.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "xml.h"
 #include "conf/network_conf.h"
 

diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c
index 7e569b3fc3a603cf27f9675da049e9585cb3f3f2..974e495b30fd90be1fa99e9300d61072e07197ee 100644 (file)
--- a/tools/virsh-nodedev.c
+++ b/tools/virsh-nodedev.c
@@ -34,7 +34,7 @@
 #include "internal.h"
 #include "virbuffer.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "xml.h"
 #include "conf/node_device_conf.h"
 

diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c
index c3dba0c662cfbbd97725bdb2166bc87ef7dd442a..1480d133b64aba7b0bc96d7b99c4bac75e80ddf6 100644 (file)
--- a/tools/virsh-nwfilter.c
+++ b/tools/virsh-nwfilter.c
@@ -34,7 +34,7 @@
 #include "internal.h"
 #include "virbuffer.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "xml.h"
 
 virNWFilterPtr

diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c
index 6e296044cdbc120f417b878629b33ae2557d6952..b3177e0c42f7fa10870cbee8fc6351acc66b6714 100644 (file)
--- a/tools/virsh-pool.c
+++ b/tools/virsh-pool.c
@@ -34,7 +34,7 @@
 #include "internal.h"
 #include "virbuffer.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "xml.h"
 #include "conf/storage_conf.h"
 

diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c
index d81e8cef8439da14c5e247905cf5adf118cf95fc..a29454ff276e255a0b71acf64bae7d50bb6f7585 100644 (file)
--- a/tools/virsh-secret.c
+++ b/tools/virsh-secret.c
@@ -35,7 +35,7 @@
 #include "base64.h"
 #include "virbuffer.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "xml.h"
 
 static virSecretPtr

diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c
index 3fecde6bad53dca2a207c4deb6104c7a84d4c406..842828215829c58720352da5ac2c83a44d0c71a9 100644 (file)
--- a/tools/virsh-snapshot.c
+++ b/tools/virsh-snapshot.c
@@ -36,7 +36,7 @@
 #include "internal.h"
 #include "virbuffer.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virsh-domain.h"
 #include "xml.h"
 #include "conf/snapshot_conf.h"

diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c
index ebfe52d8f55e34aefd7dc07a63167dd2a612bd01..6f2c5910fe7bafa569ff0be5878c032c98db1afc 100644 (file)
--- a/tools/virsh-volume.c
+++ b/tools/virsh-volume.c
@@ -36,7 +36,7 @@
 #include "internal.h"
 #include "virbuffer.h"
 #include "viralloc.h"
-#include "util.h"
+#include "virutil.h"
 #include "virfile.h"
 #include "virsh-pool.h"
 #include "xml.h"

diff --git a/tools/virsh.c b/tools/virsh.c
index 91a9677887191c0b8776229a8c2bbeb7047617b6..bfeaaa14d6d6858c9bd1265f27ec58c6c80a2955 100644 (file)
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -58,7 +58,7 @@
 #include "base64.h"
 #include "virbuffer.h"
 #include "console.h"
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "xml.h"
 #include "libvirt/libvirt-qemu.h"

diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c
index cd75ebad96cd2b3664f3c17ee43885fdc02451b3..34a527f7c715bf616ade8ac767d1940ef69737d5 100644 (file)
--- a/tools/virt-host-validate-common.c
+++ b/tools/virt-host-validate-common.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <sys/utsname.h>
 
-#include "util.h"
+#include "virutil.h"
 #include "viralloc.h"
 #include "virfile.h"
 #include "virt-host-validate-common.h"