From 7e0d11be5b00d96beb70efc12927d0cd183f2357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Sun, 16 Feb 2020 22:59:28 +0100 Subject: [PATCH] virsh: include virutil.h where used MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Include virutil.h in all files that use it, instead of relying on it being pulled in somehow. Signed-off-by: Ján Tomko Reviewed-by: Daniel Henrique Barboza --- src/bhyve/bhyve_domain.c | 1 + src/bhyve/bhyve_driver.c | 1 + src/conf/capabilities.c | 1 + src/conf/domain_conf.c | 1 + src/conf/node_device_util.c | 1 + src/conf/storage_conf.c | 1 + src/conf/virnetworkportdef.c | 1 + src/conf/virnwfilterbindingobj.c | 1 + src/esx/esx_vi.c | 1 + src/hypervisor/domain_cgroup.c | 2 ++ src/interface/interface_backend_netcf.c | 1 + src/interface/interface_backend_udev.c | 1 + src/libvirt-domain.c | 1 + src/libxl/libxl_driver.c | 1 + src/libxl/libxl_migration.c | 1 + src/locking/lock_driver_lockd.c | 1 + src/locking/lock_driver_sanlock.c | 1 + src/logging/log_handler.c | 1 + src/lxc/lxc_cgroup.c | 1 + src/lxc/lxc_container.c | 1 + src/lxc/lxc_controller.c | 1 + src/lxc/lxc_driver.c | 1 + src/lxc/lxc_fuse.c | 1 + src/lxc/lxc_native.c | 1 + src/lxc/lxc_process.c | 1 + src/network/bridge_driver.c | 1 + src/network/leaseshelper.c | 1 + src/node_device/node_device_driver.c | 1 + src/node_device/node_device_udev.c | 1 + src/nwfilter/nwfilter_ebiptables_driver.c | 1 + src/openvz/openvz_conf.c | 1 + src/openvz/openvz_driver.c | 1 + src/openvz/openvz_util.c | 2 ++ src/qemu/qemu_agent.c | 1 + src/qemu/qemu_alias.c | 1 + src/qemu/qemu_capabilities.c | 1 + src/qemu/qemu_cgroup.c | 1 + src/qemu/qemu_command.c | 1 + src/qemu/qemu_conf.c | 1 + src/qemu/qemu_domain.c | 1 + src/qemu/qemu_driver.c | 1 + src/qemu/qemu_hostdev.c | 1 + src/qemu/qemu_interop_config.c | 1 + src/qemu/qemu_migration.c | 1 + src/qemu/qemu_monitor.c | 1 + src/qemu/qemu_process.c | 1 + src/qemu/qemu_shim.c | 1 + src/qemu/qemu_vhost_user.c | 1 + src/remote/remote_driver.c | 1 + src/secret/secret_driver.c | 1 + src/storage/storage_backend_disk.c | 1 + src/storage/storage_backend_iscsi.c | 1 + src/storage/storage_backend_logical.c | 1 + src/storage/storage_backend_mpath.c | 1 + src/storage/storage_driver.c | 1 + src/storage/storage_file_fs.c | 1 + src/storage/storage_util.c | 1 + src/test/test_driver.c | 1 + src/util/virmodule.c | 1 + src/util/virnuma.c | 1 + src/util/virpolkit.c | 1 + src/vbox/vbox_common.c | 1 + src/vbox/vbox_storage.c | 1 + src/vmware/vmware_conf.c | 1 + src/vmx/vmx.c | 1 + src/vz/vz_driver.c | 1 + src/vz/vz_sdk.c | 1 + src/vz/vz_utils.c | 1 + tests/commandtest.c | 1 + tests/testutilsqemu.c | 1 + tests/virnettlshelpers.c | 1 + tools/virsh-domain.c | 1 + tools/virsh-nodedev.c | 1 + tools/vsh.c | 1 + 74 files changed, 76 insertions(+) diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index 82910ea261..a2a0619846 100644 --- a/src/bhyve/bhyve_domain.c +++ b/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 diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index 05ffc2f050..b6204c7fb9 100644 --- a/src/bhyve/bhyve_driver.c +++ b/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" diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index d279ea0576..99b69aebb5 100644 --- a/src/conf/capabilities.c +++ b/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 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fc1e936bd0..17867eeece 100644 --- a/src/conf/domain_conf.c +++ b/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 diff --git a/src/conf/node_device_util.c b/src/conf/node_device_util.c index d8f4a48225..5e80422d7f 100644 --- a/src/conf/node_device_util.c +++ b/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 diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 252d28cbfb..626ddd9528 100644 --- a/src/conf/storage_conf.c +++ b/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 diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c index a0705a8322..64692ab63a 100644 --- a/src/conf/virnetworkportdef.c +++ b/src/conf/virnetworkportdef.c @@ -19,6 +19,7 @@ */ #include +#include #include "viralloc.h" #include "virerror.h" diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbindingobj.c index 00ffb0b248..7cfc2e9efa 100644 --- a/src/conf/virnwfilterbindingobj.c +++ b/src/conf/virnwfilterbindingobj.c @@ -19,6 +19,7 @@ */ #include +#include #include "viralloc.h" #include "virerror.h" diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 421905c693..16690edfbe 100644 --- a/src/esx/esx_vi.c +++ b/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 diff --git a/src/hypervisor/domain_cgroup.c b/src/hypervisor/domain_cgroup.c index 2b3e1d6956..eb4fa20a9e 100644 --- a/src/hypervisor/domain_cgroup.c +++ b/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 diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index 06eb1ace08..dd0c1481d9 100644 --- a/src/interface/interface_backend_netcf.c +++ b/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" diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c index e87b884c17..e388f98536 100644 --- a/src/interface/interface_backend_udev.c +++ b/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" diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 1365451373..65813b68cc 100644 --- a/src/libvirt-domain.c +++ b/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"); diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 2b06f1be1e..8f855891d0 100644 --- a/src/libxl/libxl_driver.c +++ b/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 diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 873b2b3e01..95516f676b 100644 --- a/src/libxl/libxl_migration.c +++ b/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 diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lockd.c index 393154bb3c..bec98dd05f 100644 --- a/src/locking/lock_driver_lockd.c +++ b/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" diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 088255a111..4ebe98e86d 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/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" diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c index f21cac68ac..576d0d6921 100644 --- a/src/logging/log_handler.c +++ b/src/logging/log_handler.c @@ -29,6 +29,7 @@ #include "virlog.h" #include "virrotatingfile.h" #include "viruuid.h" +#include "virutil.h" #include #include diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index 4ebe5ef467..b9a19e25e6 100644 --- a/src/lxc/lxc_cgroup.c +++ b/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 diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 41efe43a14..ec7104f88a 100644 --- a/src/lxc/lxc_container.c +++ b/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 diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index c3dec0859c..f3b78ef815 100644 --- a/src/lxc/lxc_controller.c +++ b/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 diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index b2e9bc3a46..7bf4134f7c 100644 --- a/src/lxc/lxc_driver.c +++ b/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 diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index 164b284bb8..5de49be5b5 100644 --- a/src/lxc/lxc_fuse.c +++ b/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 diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index 02d2bf33e4..4545d8cde1 100644 --- a/src/lxc/lxc_native.c +++ b/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 diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 6851b3e3e2..f016cbe6eb 100644 --- a/src/lxc/lxc_process.c +++ b/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 diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index fbc0bea238..d7edeeb734 100644 --- a/src/network/bridge_driver.c +++ b/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 diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index dd1d5f70ee..a1780ca4e4 100644 --- a/src/network/leaseshelper.c +++ b/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 diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index fda77ede24..da92a4cf94 100644 --- a/src/node_device/node_device_driver.c +++ b/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 diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 396763fa29..56d5cb2ee0 100644 --- a/src/node_device/node_device_udev.c +++ b/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" diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index f4c192aebb..235a002495 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/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 diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 0a69216315..1d60afae93 100644 --- a/src/openvz/openvz_conf.c +++ b/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 diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 23811d3d08..1a189dbbe7 100644 --- a/src/openvz/openvz_driver.c +++ b/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 diff --git a/src/openvz/openvz_util.c b/src/openvz/openvz_util.c index 3cdc1c2bdc..6d12056b4b 100644 --- a/src/openvz/openvz_util.c +++ b/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 diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 7d01d21a11..23a775034f 100644 --- a/src/qemu/qemu_agent.c +++ b/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 diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index 93bdcb7548..95086fc65a 100644 --- a/src/qemu/qemu_alias.c +++ b/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-" diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0e727093bc..7875776d94 100644 --- a/src/qemu/qemu_capabilities.c +++ b/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 #include diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 548c5ec274..d550d4f58a 100644 --- a/src/qemu/qemu_cgroup.c +++ b/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 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 6d5b53d30a..7cb141cbd6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -64,6 +64,7 @@ # include #endif #include "logging/log_manager.h" +#include "virutil.h" #include #include diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 0357501dc6..eeb29f46bd 100644 --- a/src/qemu/qemu_conf.c +++ b/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 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index af6817cc05..446a517df9 100644 --- a/src/qemu/qemu_domain.c +++ b/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 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 900c16fba9..e9a62684f0 100644 --- a/src/qemu/qemu_driver.c +++ b/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 diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 1774850640..fb63da2601 100644 --- a/src/qemu/qemu_hostdev.c +++ b/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 diff --git a/src/qemu/qemu_interop_config.c b/src/qemu/qemu_interop_config.c index f5f419e630..975cbf0afd 100644 --- a/src/qemu/qemu_interop_config.c +++ b/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 diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a307c5ebe2..3fc5388d6a 100644 --- a/src/qemu/qemu_migration.c +++ b/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 diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 008d4a0e75..6c0a658def 100644 --- a/src/qemu/qemu_monitor.c +++ b/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" diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 8c1ed76677..c4b794c4bd 100644 --- a/src/qemu/qemu_process.c +++ b/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 diff --git a/src/qemu/qemu_shim.c b/src/qemu/qemu_shim.c index 07ae6eab90..5b7840e971 100644 --- a/src/qemu/qemu_shim.c +++ b/src/qemu/qemu_shim.c @@ -22,6 +22,7 @@ #include #include +#include #include "virfile.h" #include "virstring.h" diff --git a/src/qemu/qemu_vhost_user.c b/src/qemu/qemu_vhost_user.c index 4c25b30664..1bcb007a1b 100644 --- a/src/qemu/qemu_vhost_user.c +++ b/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 diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 7971cde769..7bae0c2514 100644 --- a/src/remote/remote_driver.c +++ b/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 diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 210a16c3d3..1cb342878f 100644 --- a/src/secret/secret_driver.c +++ b/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 diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 00e8b1aa13..35b07abbfe 100644 --- a/src/storage/storage_backend_disk.c +++ b/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" diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 45a80b5f2a..32892e1d75 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/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 diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index d26ca9c58e..60958d3d2c 100644 --- a/src/storage/storage_backend_logical.c +++ b/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 diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index 8843dffc30..7cb084b2d6 100644 --- a/src/storage/storage_backend_mpath.c +++ b/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 diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 2dd093a9da..7e593359a8 100644 --- a/src/storage/storage_driver.c +++ b/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 diff --git a/src/storage/storage_file_fs.c b/src/storage/storage_file_fs.c index 8817970f44..0d3f134765 100644 --- a/src/storage/storage_file_fs.c +++ b/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 diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index 8e43c7868d..1ec1d13625 100644 --- a/src/storage/storage_util.c +++ b/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 diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 6a629988ef..029d560fb9 100644 --- a/src/test/test_driver.c +++ b/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 diff --git a/src/util/virmodule.c b/src/util/virmodule.c index da64fbd1c3..bc05fc6f4d 100644 --- a/src/util/virmodule.c +++ b/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 diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 17ab64b5d6..eeca438f25 100644 --- a/src/util/virnuma.c +++ b/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 diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c index 5a9fa0cfed..1570d667ee 100644 --- a/src/util/virpolkit.c +++ b/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 diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 7cd9b7be20..618663952a 100644 --- a/src/vbox/vbox_common.c +++ b/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" diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index 7f240c5333..b9dcacc62e 100644 --- a/src/vbox/vbox_storage.c +++ b/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" diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 0256f1832f..fd62bb96f7 100644 --- a/src/vmware/vmware_conf.c +++ b/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 diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index b0f7b6a977..f0140129a2 100644 --- a/src/vmx/vmx.c +++ b/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"); diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 2c71f618cd..6605247dd9 100644 --- a/src/vz/vz_driver.c +++ b/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" diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 2c68c7cb27..c49204de1d 100644 --- a/src/vz/vz_sdk.c +++ b/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" diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index 001c3e96af..c31ff53cfb 100644 --- a/src/vz/vz_utils.c +++ b/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" diff --git a/tests/commandtest.c b/tests/commandtest.c index ae2598d5fd..a64aa9ad33 100644 --- a/tests/commandtest.c +++ b/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 diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 4dd5664f7b..f3b4e2b3b2 100644 --- a/tests/testutilsqemu.c +++ b/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 diff --git a/tests/virnettlshelpers.c b/tests/virnettlshelpers.c index 5aaf98e345..e2b8e8359a 100644 --- a/tests/virnettlshelpers.c +++ b/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 diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d184e25f42..9d0f7d68d2 100644 --- a/tools/virsh-domain.c +++ b/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", \ diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index 68790ea802..7f091d7cf8 100644 --- a/tools/virsh-nodedev.c +++ b/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 diff --git a/tools/vsh.c b/tools/vsh.c index 59e9aab6cc..d392f5b05b 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -45,6 +45,7 @@ #include "vircommand.h" #include "virtypedparam.h" #include "virstring.h" +#include "virutil.h" #ifdef WITH_READLINE /* For autocompletion */