virsh: include virutil.h where used

Include virutil.h in all files that use it,
instead of relying on it being pulled in somehow.
Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NDaniel Henrique Barboza <danielhb413@gmail.com>

src/bhyve/bhyve_domain.c

@@ -27,6 +27,7 @@
 #include "bhyve_capabilities.h"
 #include "viralloc.h"
 #include "virlog.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_BHYVE
 

src/bhyve/bhyve_driver.c

@@ -53,6 +53,7 @@
 #include "virhostmem.h"
 #include "virportallocator.h"
 #include "conf/domain_capabilities.h"
+#include "virutil.h"
 
 #include "bhyve_conf.h"
 #include "bhyve_device.h"

src/conf/capabilities.c

@@ -40,6 +40,7 @@
 #include "virtypedparam.h"
 #include "viruuid.h"
 #include "virenum.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_CAPABILITIES
 

src/conf/domain_conf.c

@@ -61,6 +61,7 @@
 #include "virmdev.h"
 #include "virdomainsnapshotobjlist.h"
 #include "virdomaincheckpointobjlist.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_DOMAIN
 

src/conf/node_device_util.c

@@ -26,6 +26,7 @@
 #include "virstring.h"
 #include "virvhba.h"
 #include "viralloc.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NODEDEV
 

src/conf/storage_conf.c

@@ -42,6 +42,7 @@
 #include "virstring.h"
 #include "virlog.h"
 #include "virvhba.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE
 

src/conf/virnetworkportdef.c

@@ -19,6 +19,7 @@
  */
 
 #include <config.h>
+#include <unistd.h>
 
 #include "viralloc.h"
 #include "virerror.h"

src/conf/virnwfilterbindingobj.c

@@ -19,6 +19,7 @@
  */
 
 #include <config.h>
+#include <unistd.h>
 
 #include "viralloc.h"
 #include "virerror.h"

src/esx/esx_vi.c

@@ -35,6 +35,7 @@
 #include "esx_vi_methods.h"
 #include "esx_util.h"
 #include "virstring.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_ESX
 

src/hypervisor/domain_cgroup.c

@@ -23,6 +23,8 @@
 #include "domain_cgroup.h"
 #include "domain_driver.h"
 
+#include "virutil.h"
+
 #define VIR_FROM_THIS VIR_FROM_DOMAIN
 
 

src/interface/interface_backend_netcf.c

@@ -34,6 +34,7 @@
 #include "virstring.h"
 #include "viraccessapicheck.h"
 #include "virinterfaceobj.h"
+#include "virutil.h"
 
 #include "configmake.h"
 

src/interface/interface_backend_udev.c

@@ -35,6 +35,7 @@
 #include "viraccessapicheck.h"
 #include "virinterfaceobj.h"
 #include "virnetdev.h"
+#include "virutil.h"
 
 #include "configmake.h"
 

src/libvirt-domain.c

@@ -26,6 +26,7 @@
 #include "virfile.h"
 #include "virlog.h"
 #include "virtypedparam.h"
+#include "virutil.h"
 
 VIR_LOG_INIT("libvirt.domain");
 

src/libxl/libxl_driver.c

@@ -55,6 +55,7 @@
 #include "locking/domain_lock.h"
 #include "virnetdevtap.h"
 #include "cpu/cpu.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_LIBXL
 

src/libxl/libxl_migration.c

@@ -41,6 +41,7 @@
 #include "locking/domain_lock.h"
 #include "virtypedparam.h"
 #include "virfdstream.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_LIBXL
 

src/locking/lock_driver_lockd.c

@@ -33,6 +33,7 @@
 #include "lock_protocol.h"
 #include "configmake.h"
 #include "virstring.h"
+#include "virutil.h"
 
 #include "lock_driver_lockd.h"
 

src/locking/lock_driver_sanlock.c

@@ -39,6 +39,7 @@
 #include "virfile.h"
 #include "virconf.h"
 #include "virstring.h"
+#include "virutil.h"
 
 #include "configmake.h"
 

src/logging/log_handler.c

@@ -29,6 +29,7 @@
 #include "virlog.h"
 #include "virrotatingfile.h"
 #include "viruuid.h"
+#include "virutil.h"
 
 #include <unistd.h>
 #include <fcntl.h>

src/lxc/lxc_cgroup.c

@@ -30,6 +30,7 @@
 #include "viralloc.h"
 #include "virstring.h"
 #include "virsystemd.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 

src/lxc/lxc_container.c

@@ -60,6 +60,7 @@
 #include "virnetdevip.h"
 #include "virprocess.h"
 #include "virstring.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 

src/lxc/lxc_controller.c

@@ -65,6 +65,7 @@
 #include "virstring.h"
 #include "virgettext.h"
 #include "virsocket.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 

src/lxc/lxc_driver.c

@@ -73,6 +73,7 @@
 #include "virhostdev.h"
 #include "netdev_bandwidth_conf.h"
 #include "virsocket.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 

src/lxc/lxc_fuse.c

@@ -32,6 +32,7 @@
 #include "virbuffer.h"
 #include "virstring.h"
 #include "viralloc.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 

src/lxc/lxc_native.c

@@ -30,6 +30,7 @@
 #include "util/virstring.h"
 #include "util/virconf.h"
 #include "conf/domain_conf.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 

src/lxc/lxc_process.c

@@ -51,6 +51,7 @@
 #include "virprocess.h"
 #include "virsystemd.h"
 #include "netdev_bandwidth_conf.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_LXC
 

src/network/bridge_driver.c

@@ -67,6 +67,7 @@
 #include "virhook.h"
 #include "virjson.h"
 #include "virnetworkportdef.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NETWORK
 #define MAX_BRIDGE_ID 256

src/network/leaseshelper.c

@@ -35,6 +35,7 @@
 #include "virenum.h"
 #include "configmake.h"
 #include "virgettext.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NETWORK
 

src/node_device/node_device_driver.c

@@ -39,6 +39,7 @@
 #include "virvhba.h"
 #include "viraccessapicheck.h"
 #include "virnetdev.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NODEDEV
 

src/node_device/node_device_udev.c

@@ -40,6 +40,7 @@
 #include "virstring.h"
 #include "virnetdev.h"
 #include "virmdev.h"
+#include "virutil.h"
 
 #include "configmake.h"
 

src/nwfilter/nwfilter_ebiptables_driver.c

@@ -42,6 +42,7 @@
 #include "configmake.h"
 #include "virstring.h"
 #include "virfirewall.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NWFILTER
 

src/openvz/openvz_conf.c

@@ -40,6 +40,7 @@
 #include "vircommand.h"
 #include "virstring.h"
 #include "virhostcpu.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_OPENVZ
 

src/openvz/openvz_driver.c

@@ -47,6 +47,7 @@
 #include "viruri.h"
 #include "virnetdevtap.h"
 #include "virstring.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_OPENVZ
 

src/openvz/openvz_util.c

@@ -34,6 +34,8 @@
 #include "openvz_conf.h"
 #include "openvz_util.h"
 
+#include "virutil.h"
+
 #define VIR_FROM_THIS VIR_FROM_OPENVZ
 
 long

src/qemu/qemu_agent.c

@@ -39,6 +39,7 @@
 #include "virstring.h"
 #include "virenum.h"
 #include "virsocket.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 

src/qemu/qemu_alias.c

@@ -25,6 +25,7 @@
 #include "viralloc.h"
 #include "virlog.h"
 #include "virstring.h"
+#include "virutil.h"
 
 #define QEMU_DRIVE_HOST_PREFIX "drive-"
 

src/qemu/qemu_capabilities.c

@@ -47,6 +47,7 @@
 #include "qemu_qapi.h"
 #include "qemu_process.h"
 #include "qemu_firmware.h"
+#include "virutil.h"
 
 #include <fcntl.h>
 #include <sys/stat.h>

src/qemu/qemu_cgroup.c

@@ -38,6 +38,7 @@
 #include "virnuma.h"
 #include "virsystemd.h"
 #include "virdevmapper.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 

src/qemu/qemu_command.c

@@ -64,6 +64,7 @@
 # include <linux/capability.h>
 #endif
 #include "logging/log_manager.h"
+#include "virutil.h"
 
 #include <sys/stat.h>
 #include <fcntl.h>

src/qemu/qemu_conf.c

@@ -45,6 +45,7 @@
 #include "virsocket.h"
 #include "virstring.h"
 #include "storage_conf.h"
+#include "virutil.h"
 #include "configmake.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU

src/qemu/qemu_domain.c

@@ -61,6 +61,7 @@
 #include "virdomainsnapshotobjlist.h"
 #include "virdomaincheckpointobjlist.h"
 #include "backup_conf.h"
+#include "virutil.h"
 
 #ifdef __linux__
 # include <sys/sysmacros.h>

src/qemu/qemu_driver.c

@@ -104,6 +104,7 @@
 #include "virenum.h"
 #include "virdomaincheckpointobjlist.h"
 #include "virsocket.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 

src/qemu/qemu_hostdev.c

@@ -35,6 +35,7 @@
 #include "virnetdev.h"
 #include "virfile.h"
 #include "virhostdev.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 

src/qemu/qemu_interop_config.c

@@ -28,6 +28,7 @@
 #include "virhash.h"
 #include "virlog.h"
 #include "virstring.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 

src/qemu/qemu_migration.c

@@ -61,6 +61,7 @@
 #include "nwfilter_conf.h"
 #include "virdomainsnapshotobjlist.h"
 #include "virsocket.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 

src/qemu/qemu_monitor.c

@@ -40,6 +40,7 @@
 #include "virstring.h"
 #include "virtime.h"
 #include "virsocket.h"
+#include "virutil.h"
 
 #ifdef WITH_DTRACE_PROBES
 # include "libvirt_qemu_probes.h"

src/qemu/qemu_process.c

@@ -90,6 +90,7 @@
 #include "virvsock.h"
 #include "viridentity.h"
 #include "virthreadjob.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 

src/qemu/qemu_shim.c

@@ -22,6 +22,7 @@
 
 #include <stdio.h>
 #include <stdbool.h>
+#include <unistd.h>
 
 #include "virfile.h"
 #include "virstring.h"

src/qemu/qemu_vhost_user.c

@@ -27,6 +27,7 @@
 #include "virstring.h"
 #include "viralloc.h"
 #include "virenum.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_QEMU
 

src/remote/remote_driver.c

@@ -48,6 +48,7 @@
 #include "virauth.h"
 #include "virauthconfig.h"
 #include "virstring.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_REMOTE
 

src/secret/secret_driver.c

@@ -41,6 +41,7 @@
 #include "virstring.h"
 #include "viraccessapicheck.h"
 #include "secret_event.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_SECRET
 

src/storage/storage_backend_disk.c

@@ -29,6 +29,7 @@
 #include "viralloc.h"
 #include "vircommand.h"
 #include "virfile.h"
+#include "virutil.h"
 #include "configmake.h"
 #include "virstring.h"
 

src/storage/storage_backend_iscsi.c

@@ -40,6 +40,7 @@
 #include "viruuid.h"
 #include "virsecret.h"
 #include "storage_util.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE
 

src/storage/storage_backend_logical.c

@@ -33,6 +33,7 @@
 #include "virlog.h"
 #include "virfile.h"
 #include "virstring.h"
+#include "virutil.h"
 #include "storage_util.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE

src/storage/storage_backend_mpath.c

@@ -34,6 +34,7 @@
 #include "virlog.h"
 #include "virfile.h"
 #include "virstring.h"
+#include "virutil.h"
 #include "storage_util.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE

src/storage/storage_driver.c

@@ -49,6 +49,7 @@
 #include "virstring.h"
 #include "viraccessapicheck.h"
 #include "storage_util.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE
 

src/storage/storage_file_fs.c

@@ -33,6 +33,7 @@
 #include "virfile.h"
 #include "virlog.h"
 #include "virstring.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE
 

src/storage/storage_util.c

@@ -73,6 +73,7 @@
 #include "virstring.h"
 #include "virxml.h"
 #include "virfdstream.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_STORAGE
 

src/test/test_driver.c

@@ -65,6 +65,7 @@
 #include "virdomaincheckpointobjlist.h"
 #include "virdomainsnapshotobjlist.h"
 #include "virkeycode.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_TEST
 

src/util/virmodule.c

@@ -26,6 +26,7 @@
 #include "virerror.h"
 #include "virfile.h"
 #include "virlog.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

src/util/virnuma.c

@@ -46,6 +46,7 @@
 #include "virstring.h"
 #include "virfile.h"
 #include "virhostmem.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

src/util/virpolkit.c

@@ -30,6 +30,7 @@
 #include "viralloc.h"
 #include "virdbus.h"
 #include "virfile.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_POLKIT
 

src/vbox/vbox_common.c

@@ -37,6 +37,7 @@
 #include "snapshot_conf.h"
 #include "vbox_snapshot_conf.h"
 #include "virfdstream.h"
+#include "virutil.h"
 #include "configmake.h"
 
 #include "vbox_common.h"

src/vbox/vbox_storage.c

@@ -27,6 +27,7 @@
 #include "virlog.h"
 #include "virstring.h"
 #include "storage_conf.h"
+#include "virutil.h"
 
 #include "vbox_common.h"
 #include "vbox_uniformed_api.h"

src/vmware/vmware_conf.c

@@ -32,6 +32,7 @@
 #include "vmware_conf.h"
 #include "virstring.h"
 #include "virlog.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_VMWARE
 

src/vmx/vmx.c

@@ -31,6 +31,7 @@
 #include "vmx.h"
 #include "viruri.h"
 #include "virstring.h"
+#include "virutil.h"
 
 VIR_LOG_INIT("vmx.vmx");
 

src/vz/vz_driver.c

@@ -48,6 +48,7 @@
 #include "virhostmem.h"
 #include "virhostcpu.h"
 #include "viraccessapicheck.h"
+#include "virutil.h"
 
 #include "vz_driver.h"
 #include "vz_utils.h"

src/vz/vz_sdk.c

@@ -33,6 +33,7 @@
 #include "virtime.h"
 #include "virhostcpu.h"
 #include "virsocketaddr.h"
+#include "virutil.h"
 
 #include "vz_sdk.h"
 

src/vz/vz_utils.c

@@ -34,6 +34,7 @@
 #include "datatypes.h"
 #include "virlog.h"
 #include "virtime.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_PARALLELS
 #define PRLSRVCTL "prlsrvctl"

tests/commandtest.c

@@ -38,6 +38,7 @@
 #include "virthread.h"
 #include "virstring.h"
 #include "virprocess.h"
+#include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE
 

tests/testutilsqemu.c

@@ -12,6 +12,7 @@
 # include "qemu/qemu_capspriv.h"
 # include "virstring.h"
 # include "virfilecache.h"
+# include "virutil.h"
 
 # define VIR_FROM_THIS VIR_FROM_QEMU
 

tests/virnettlshelpers.c

@@ -25,6 +25,7 @@
 #include "virlog.h"
 #include "virfile.h"
 #include "virsocketaddr.h"
+#include "virutil.h"
 
 #if !defined WIN32 && HAVE_LIBTASN1_H && LIBGNUTLS_VERSION_NUMBER >= 0x020600
 

tools/virsh-domain.c

@@ -54,6 +54,7 @@
 #include "viruri.h"
 #include "vsh-table.h"
 #include "virenum.h"
+#include "virutil.h"
 
 #define VIRSH_COMMON_OPT_DOMAIN_PERSISTENT \
     {.name = "persistent", \

tools/virsh-nodedev.c

@@ -29,6 +29,7 @@
 #include "virtime.h"
 #include "conf/node_device_conf.h"
 #include "virenum.h"
+#include "virutil.h"
 
 /*
  * "nodedev-create" command

tools/vsh.c

@@ -45,6 +45,7 @@
 #include "vircommand.h"
 #include "virtypedparam.h"
 #include "virstring.h"
+#include "virutil.h"
 
 #ifdef WITH_READLINE
 /* For autocompletion */