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

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

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"

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"

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

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);

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

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"

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"

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"

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"
 

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"
 

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"

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"

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

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 */

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"
 

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"

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"

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>

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"

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"
 

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)
 

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"

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"
 

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"
 

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"

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>
 

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"

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"

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
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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 {

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"

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
 

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"
 

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"

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"

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"

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"

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"

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"
 

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"

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

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"

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"

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"

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"

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"

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"

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"

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

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"
 

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
 

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"

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"

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"
 

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"

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"

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"

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"

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

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"
 

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"
 

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"

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"

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"

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"

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"
 

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"

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"

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"