[libvirt PATCH 0/8] Reduce usage of virutil.h (include epistles)
With the introduction of virenum.h and GLib, the need for including this file diminishes. Remove its transitive inclusion from almost anywhere to discourage its use as a generic helper dump. The remaining functions should be repatriated into other files if possible. Ján Tomko (8): Remove virutil.h where possible tests: include unistd.h instead of virutil.h util: vircgroup: include unistd.h rather than virutil.h util: virportallocator: add includes tools: virt-host-validate: move virutil.h include Include unistd.h where used virsh: include virutil.h where used Remove virutil.h from all header files src/access/viraccessperm.h | 1 - src/bhyve/bhyve_domain.c | 1 + src/bhyve/bhyve_driver.c | 1 + src/conf/capabilities.c | 1 + src/conf/cpu_conf.h | 1 - src/conf/device_conf.h | 1 - src/conf/domain_conf.c | 1 + src/conf/interface_conf.h | 1 - src/conf/node_device_conf.h | 1 - src/conf/node_device_util.c | 1 + src/conf/numa_conf.h | 1 - src/conf/secret_conf.h | 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_conf.c | 2 ++ src/lxc/lxc_container.c | 1 + src/lxc/lxc_controller.c | 1 + src/lxc/lxc_domain.c | 1 - src/lxc/lxc_driver.c | 1 + src/lxc/lxc_fuse.c | 2 ++ 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/qemu/qemu_vhost_user_gpu.c | 1 - src/remote/remote_driver.c | 1 + src/rpc/virnetlibsshsession.c | 1 - src/rpc/virnetsshsession.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/iohelper.c | 1 - src/util/vircgroup.h | 1 - src/util/vircgroupv1.c | 1 + src/util/vircgroupv2.c | 1 + src/util/virconf.h | 1 - src/util/virerror.c | 1 - src/util/virfirewall.c | 1 - src/util/virgic.c | 1 - src/util/virgic.h | 1 - src/util/virkeycode.h | 1 - src/util/virmdev.h | 1 - src/util/virmodule.c | 1 + src/util/virnetdevbandwidth.c | 1 - src/util/virnetdevbridge.c | 1 - src/util/virnetdevip.c | 1 - src/util/virnetdevveth.c | 1 - src/util/virnetdevvlan.h | 2 -- src/util/virnetdevvportprofile.h | 1 - src/util/virnuma.c | 1 + src/util/virnuma.h | 1 - src/util/virpci.c | 1 - src/util/virpci.h | 1 - src/util/virperf.c | 1 + src/util/virperf.h | 1 - src/util/virpolkit.c | 2 ++ src/util/virportallocator.c | 3 +++ src/util/virprocess.h | 1 - src/util/virrandom.c | 1 - src/util/virresctrl.c | 1 + src/util/virresctrl.h | 1 - src/util/virscsi.c | 1 - src/util/virscsivhost.h | 1 - src/util/virsecret.h | 1 - src/util/virstorageencryption.h | 1 - src/util/virstoragefile.c | 1 - src/util/virstoragefile.h | 1 - src/util/virsysinfo.h | 1 - src/util/virtypedparam.c | 1 - src/util/virtypedparam.h | 1 - src/util/viruri.c | 1 - src/util/virusb.c | 1 - src/util/virxml.c | 1 - src/vbox/vbox_common.c | 1 + src/vbox/vbox_driver.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/fdstreamtest.c | 1 - tests/objecteventtest.c | 2 ++ tests/scsihosttest.c | 1 + tests/testutils.c | 1 - tests/testutilsqemu.c | 1 + tests/vboxsnapshotxmltest.c | 2 ++ tests/virfiletest.c | 1 + tests/virkeycodetest.c | 1 - tests/virlockspacetest.c | 2 +- tests/virnetsockettest.c | 2 +- tests/virnettlscontexttest.c | 2 +- tests/virnettlshelpers.c | 1 + tests/virportallocatortest.c | 1 - tests/virscsitest.c | 1 + tests/virstoragetest.c | 1 + tests/virsystemdtest.c | 1 + tools/virsh-domain.c | 1 + tools/virsh-interface.c | 1 - tools/virsh-nodedev.c | 1 + tools/virsh-nwfilter.c | 1 - tools/virt-host-validate-common.c | 1 + tools/virt-host-validate-common.h | 1 - tools/vsh.c | 1 + 144 files changed, 100 insertions(+), 57 deletions(-) -- 2.24.1
Historically, this file was a dump for most of our helper functions and needed almost everywhere. With the introduction of virfile.h and virstring.h, and more importantly, virenum.h and the introduction of GLib, that is no longer true. Remove its include from C files that don't even use it. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/lxc/lxc_domain.c | 1 - src/qemu/qemu_vhost_user_gpu.c | 1 - src/rpc/virnetlibsshsession.c | 1 - src/rpc/virnetsshsession.c | 1 - src/util/iohelper.c | 1 - src/util/virerror.c | 1 - src/util/virfirewall.c | 1 - src/util/virgic.c | 1 - src/util/virnetdevbandwidth.c | 1 - src/util/virnetdevbridge.c | 1 - src/util/virnetdevip.c | 1 - src/util/virnetdevveth.c | 1 - src/util/virpci.c | 1 - src/util/virrandom.c | 1 - src/util/virscsi.c | 1 - src/util/virstoragefile.c | 1 - src/util/virtypedparam.c | 1 - src/util/viruri.c | 1 - src/util/virusb.c | 1 - src/util/virxml.c | 1 - src/vbox/vbox_driver.c | 1 - tests/fdstreamtest.c | 1 - tests/testutils.c | 1 - tests/virkeycodetest.c | 1 - tests/virportallocatortest.c | 1 - tools/virsh-interface.c | 1 - tools/virsh-nwfilter.c | 1 - 27 files changed, 27 deletions(-) diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index 2439ec4f4b..03d0f46b24 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -27,7 +27,6 @@ #include "virlog.h" #include "virerror.h" #include "virstring.h" -#include "virutil.h" #include "virfile.h" #include "virtime.h" #include "virsystemd.h" diff --git a/src/qemu/qemu_vhost_user_gpu.c b/src/qemu/qemu_vhost_user_gpu.c index ae1f530338..6a37e165ba 100644 --- a/src/qemu/qemu_vhost_user_gpu.c +++ b/src/qemu/qemu_vhost_user_gpu.c @@ -29,7 +29,6 @@ #include "vircommand.h" #include "viralloc.h" #include "virlog.h" -#include "virutil.h" #include "virfile.h" #include "virstring.h" #include "virtime.h" diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index e874929740..9c20a80b88 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -26,7 +26,6 @@ #include "viralloc.h" #include "virlog.h" #include "configmake.h" -#include "virutil.h" #include "virerror.h" #include "virobject.h" #include "virstring.h" diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index c31d80d4eb..fabdc3ef22 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -29,7 +29,6 @@ #include "virlog.h" #include "configmake.h" #include "virthread.h" -#include "virutil.h" #include "virerror.h" #include "virfile.h" #include "virobject.h" diff --git a/src/util/iohelper.c b/src/util/iohelper.c index 618bfb1d3d..342bae229b 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -28,7 +28,6 @@ #include <unistd.h> #include <fcntl.h> -#include "virutil.h" #include "virthread.h" #include "virfile.h" #include "viralloc.h" diff --git a/src/util/virerror.c b/src/util/virerror.c index 0f3ee1faaa..16c384d2f9 100644 --- a/src/util/virerror.c +++ b/src/util/virerror.c @@ -27,7 +27,6 @@ #include "viralloc.h" #include "virlog.h" #include "virthread.h" -#include "virutil.h" #include "virstring.h" #define LIBVIRT_VIRERRORPRIV_H_ALLOW diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index ee72b579e4..22760e6389 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -27,7 +27,6 @@ #include "virfirewalld.h" #include "viralloc.h" #include "virerror.h" -#include "virutil.h" #include "virstring.h" #include "vircommand.h" #include "virlog.h" diff --git a/src/util/virgic.c b/src/util/virgic.c index a3ea3ce6ff..dcae97356d 100644 --- a/src/util/virgic.c +++ b/src/util/virgic.c @@ -21,7 +21,6 @@ #include <config.h> #include "internal.h" #include "virgic.h" -#include "virutil.h" VIR_ENUM_IMPL(virGICVersion, VIR_GIC_VERSION_LAST, diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index 5fd7186760..d00ef57606 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -24,7 +24,6 @@ #include "viralloc.h" #include "virerror.h" #include "virstring.h" -#include "virutil.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index 1119846e61..e1ba119b8b 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -21,7 +21,6 @@ #include "virnetdevbridge.h" #include "virnetdev.h" #include "virerror.h" -#include "virutil.h" #include "virfile.h" #include "viralloc.h" #include "virlog.h" diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index bfb93cf258..cb624c7eec 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -25,7 +25,6 @@ #include "virerror.h" #include "virlog.h" #include "virstring.h" -#include "virutil.h" #include "vircommand.h" #include "viralloc.h" diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index b9a27951fb..b3eee1afce 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -26,7 +26,6 @@ #include "virerror.h" #include "virfile.h" #include "virstring.h" -#include "virutil.h" #include "virnetdev.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/src/util/virpci.c b/src/util/virpci.c index 0b1222373e..db9528478d 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -36,7 +36,6 @@ #include "virfile.h" #include "virkmod.h" #include "virstring.h" -#include "virutil.h" #include "viralloc.h" VIR_LOG_INIT("util.pci"); diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 227480352d..0487b4e70b 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -29,7 +29,6 @@ #include "virrandom.h" #include "virthread.h" -#include "virutil.h" #include "virerror.h" #include "virfile.h" #include "virlog.h" diff --git a/src/util/virscsi.c b/src/util/virscsi.c index 06659c45c7..e3bd81b569 100644 --- a/src/util/virscsi.c +++ b/src/util/virscsi.c @@ -31,7 +31,6 @@ #include "virlog.h" #include "virscsi.h" #include "virfile.h" -#include "virutil.h" #include "virstring.h" #include "virerror.h" #include "viralloc.h" diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index b984204b93..3208279d96 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -34,7 +34,6 @@ #include "virhash.h" #include "virendian.h" #include "virstring.h" -#include "virutil.h" #include "viruri.h" #include "virbuffer.h" #include "virjson.h" diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index d6103bdcb6..e4e50d837a 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -25,7 +25,6 @@ #include <stdarg.h> #include "viralloc.h" -#include "virutil.h" #include "virerror.h" #include "virstring.h" diff --git a/src/util/viruri.c b/src/util/viruri.c index f16ea16ac1..58d9016a61 100644 --- a/src/util/viruri.c +++ b/src/util/viruri.c @@ -27,7 +27,6 @@ #include "virbuffer.h" #include "virlog.h" #include "virstring.h" -#include "virutil.h" #define VIR_FROM_THIS VIR_FROM_URI diff --git a/src/util/virusb.c b/src/util/virusb.c index a2562b7ea8..a28604c3f4 100644 --- a/src/util/virusb.c +++ b/src/util/virusb.c @@ -29,7 +29,6 @@ #include "virusb.h" #include "virlog.h" -#include "virutil.h" #include "virerror.h" #include "virfile.h" #include "virstring.h" diff --git a/src/util/virxml.c b/src/util/virxml.c index 0e66d1623b..9ea7b99dba 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -29,7 +29,6 @@ #include "virerror.h" #include "virxml.h" #include "virbuffer.h" -#include "virutil.h" #include "viralloc.h" #include "virfile.h" #include "virstring.h" diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index 5bc9ae6102..ed427622bd 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -38,7 +38,6 @@ #include "vbox_driver.h" #include "vbox_glue.h" #include "virerror.h" -#include "virutil.h" #include "domain_event.h" #include "domain_conf.h" diff --git a/tests/fdstreamtest.c b/tests/fdstreamtest.c index 7c784a49f1..83973137e7 100644 --- a/tests/fdstreamtest.c +++ b/tests/fdstreamtest.c @@ -29,7 +29,6 @@ #include "virlog.h" #include "virstring.h" #include "virfile.h" -#include "virutil.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/testutils.c b/tests/testutils.c index 8326602c9c..2f6d65364e 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -29,7 +29,6 @@ #include "testutils.h" #include "internal.h" #include "viralloc.h" -#include "virutil.h" #include "virthread.h" #include "virerror.h" #include "virbuffer.h" diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c index 298409e919..0f0c7b17da 100644 --- a/tests/virkeycodetest.c +++ b/tests/virkeycodetest.c @@ -22,7 +22,6 @@ #include "testutils.h" #include "virkeycode.h" -#include "virutil.h" #include "virerror.h" #include "viralloc.h" #include "virlog.h" diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c index 7690377ad3..0a938f6410 100644 --- a/tests/virportallocatortest.c +++ b/tests/virportallocatortest.c @@ -26,7 +26,6 @@ #if defined(__linux__) && defined(RTLD_NEXT) -# include "virutil.h" # include "virerror.h" # include "viralloc.h" # include "virlog.h" diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 8aa2fcf71d..a3cdf8630f 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -40,7 +40,6 @@ #include "viralloc.h" #include "virfile.h" #include "virmacaddr.h" -#include "virutil.h" #include "virxml.h" #include "virstring.h" #include "vsh-table.h" diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c index b87040ee6e..6e5213dea3 100644 --- a/tools/virsh-nwfilter.c +++ b/tools/virsh-nwfilter.c @@ -25,7 +25,6 @@ #include "virbuffer.h" #include "viralloc.h" #include "virfile.h" -#include "virutil.h" #include "vsh-table.h" virNWFilterPtr -- 2.24.1
These tests do not use anything from virutil.h apart from the transitive include. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- tests/virlockspacetest.c | 2 +- tests/virnetsockettest.c | 2 +- tests/virnettlscontexttest.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c index 3afedb4c46..1f156ba3d6 100644 --- a/tests/virlockspacetest.c +++ b/tests/virlockspacetest.c @@ -19,10 +19,10 @@ #include <config.h> #include <signal.h> +#include <unistd.h> #include <sys/stat.h> #include "testutils.h" -#include "virutil.h" #include "virerror.h" #include "viralloc.h" #include "virfile.h" diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 9dfc707c90..78fb9cbffd 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -19,12 +19,12 @@ #include <config.h> #include <signal.h> +#include <unistd.h> #ifdef HAVE_IFADDRS_H # include <ifaddrs.h> #endif #include "testutils.h" -#include "virutil.h" #include "virerror.h" #include "viralloc.h" #include "virlog.h" diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index 328b1340d6..6d970d0ea8 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -19,10 +19,10 @@ #include <config.h> #include <fcntl.h> +#include <unistd.h> #include "testutils.h" #include "virnettlshelpers.h" -#include "virutil.h" #include "virerror.h" #include "viralloc.h" #include "virlog.h" -- 2.24.1
There is nothing in the vircgroup.h header file requiring virutil.h. Remove it and include unistd.h in the C files. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/util/vircgroup.h | 1 - src/util/vircgroupv1.c | 1 + src/util/vircgroupv2.c | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index a5bd35586d..1dcd0688f1 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -21,7 +21,6 @@ #pragma once -#include "virutil.h" #include "virbitmap.h" #include "virenum.h" diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index d2ec7106db..5504441fa6 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -20,6 +20,7 @@ */ #include <config.h> +#include <unistd.h> #ifdef __linux__ # include <mntent.h> # include <sys/stat.h> diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c index 1d8c599f6a..80f596542c 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -19,6 +19,7 @@ */ #include <config.h> +#include <unistd.h> #ifdef __linux__ # include <mntent.h> # include <sys/mount.h> -- 2.24.1
Include both virutil.h and unistd.h. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/util/virportallocator.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index 285b8ddc45..2d34b617a6 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -21,6 +21,8 @@ #include <config.h> +#include <unistd.h> + #include "virsocket.h" #include "viralloc.h" #include "virbitmap.h" @@ -29,6 +31,7 @@ #include "virerror.h" #include "virfile.h" #include "virstring.h" +#include "virutil.h" #define VIR_FROM_THIS VIR_FROM_NONE -- 2.24.1
After the introduction of virenum.h in commit 285c5f28c41, it is only needed in the C file. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- tools/virt-host-validate-common.c | 1 + tools/virt-host-validate-common.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index 6a715ede76..dc7523dd86 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -32,6 +32,7 @@ #include "virt-host-validate-common.h" #include "virstring.h" #include "virarch.h" +#include "virutil.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tools/virt-host-validate-common.h b/tools/virt-host-validate-common.h index 1b7e93e520..a20470fa72 100644 --- a/tools/virt-host-validate-common.h +++ b/tools/virt-host-validate-common.h @@ -22,7 +22,6 @@ #pragma once #include "internal.h" -#include "virutil.h" #include "virbitmap.h" #include "virenum.h" -- 2.24.1
Include unistd.h in all files that use it, instead of relying on it being pulled in via virutil.h Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/lxc/lxc_conf.c | 2 ++ src/lxc/lxc_fuse.c | 1 + src/util/virperf.c | 1 + src/util/virpolkit.c | 1 + src/util/virresctrl.c | 1 + tests/objecteventtest.c | 2 ++ tests/scsihosttest.c | 1 + tests/vboxsnapshotxmltest.c | 2 ++ tests/virfiletest.c | 1 + tests/virscsitest.c | 1 + tests/virstoragetest.c | 1 + tests/virsystemdtest.c | 1 + 12 files changed, 15 insertions(+) diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index 43022a3441..8469f30b9e 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -23,6 +23,8 @@ /* includes */ #include <config.h> +#include <unistd.h> + #include "lxc_conf.h" #include "lxc_domain.h" #include "virerror.h" diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index 44f240a0b5..164b284bb8 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -23,6 +23,7 @@ #include <fcntl.h> #include <sys/mount.h> #include <mntent.h> +#include <unistd.h> #include "lxc_fuse.h" #include "lxc_cgroup.h" diff --git a/src/util/virperf.c b/src/util/virperf.c index 04d27309e1..90d60c04fb 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -17,6 +17,7 @@ */ #include <config.h> +#include <unistd.h> #ifndef WIN32 # include <sys/ioctl.h> #endif diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c index 5c2d0d4bd4..5a9fa0cfed 100644 --- a/src/util/virpolkit.c +++ b/src/util/virpolkit.c @@ -20,6 +20,7 @@ */ #include <config.h> +#include <unistd.h> #include "virpolkit.h" #include "virerror.h" diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 569a9ee770..c537d606cc 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -22,6 +22,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> +#include <unistd.h> #define LIBVIRT_VIRRESCTRLPRIV_H_ALLOW #include "virresctrlpriv.h" diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c index 80889339bd..1e84d4be11 100644 --- a/tests/objecteventtest.c +++ b/tests/objecteventtest.c @@ -19,6 +19,8 @@ #include <config.h> +#include <unistd.h> + #include "testutils.h" #include "virerror.h" diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c index e8193836ff..b58318d295 100644 --- a/tests/scsihosttest.c +++ b/tests/scsihosttest.c @@ -25,6 +25,7 @@ # include <fcntl.h> # include <sys/stat.h> +# include <unistd.h> # include "virstring.h" # include "virerror.h" # include "virlog.h" diff --git a/tests/vboxsnapshotxmltest.c b/tests/vboxsnapshotxmltest.c index dbeebec196..2ea460d8bd 100644 --- a/tests/vboxsnapshotxmltest.c +++ b/tests/vboxsnapshotxmltest.c @@ -1,5 +1,7 @@ #include <config.h> +#include <unistd.h> + #include "testutils.h" #ifdef WITH_VBOX diff --git a/tests/virfiletest.c b/tests/virfiletest.c index a412fdad23..d410bb68e4 100644 --- a/tests/virfiletest.c +++ b/tests/virfiletest.c @@ -19,6 +19,7 @@ #include <config.h> #include <fcntl.h> +#include <unistd.h> #include "testutils.h" #include "virfile.h" diff --git a/tests/virscsitest.c b/tests/virscsitest.c index d5a0da4753..47035e927e 100644 --- a/tests/virscsitest.c +++ b/tests/virscsitest.c @@ -19,6 +19,7 @@ #include <config.h> +#include <unistd.h> #include "virscsi.h" #include "testutils.h" diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 39040bf4cb..50f04887db 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -18,6 +18,7 @@ #include <config.h> +#include <unistd.h> #include "testutils.h" #include "vircommand.h" diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index a9b02af7db..b7dfd64d06 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -24,6 +24,7 @@ # include <dbus/dbus.h> # include <fcntl.h> +# include <unistd.h> # define LIBVIRT_VIRSYSTEMDPRIV_H_ALLOW # include "virsystemdpriv.h" -- 2.24.1
Include virutil.h in all files that use it, instead of relying on it being pulled in somehow. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- 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 713301399e..db8f38c873 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 cef49df3f8..bcc457c72f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -62,6 +62,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 <config.h> +#include <unistd.h> #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 <config.h> +#include <unistd.h> #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 <unistd.h> #include <fcntl.h> 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 <fcntl.h> #include <sys/stat.h> 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 f69a9e651c..4e94c9f479 100644 --- a/src/qemu/qemu_command.c +++ b/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> 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 <sys/sysmacros.h> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ef7838a3af..8920d905f4 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 <stdio.h> #include <stdbool.h> +#include <unistd.h> #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 c2754dbb93..30afa9e7b8 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 4362da6cee..4f39b9802b 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -32,6 +32,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 877692aeba..5fd25682a4 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 */ -- 2.24.1
After the split of enum functions into virenum.h, this function does not contain anything worth including in another header file. Signed-off-by: Ján Tomko <jtomko@redhat.com> --- src/access/viraccessperm.h | 1 - src/conf/cpu_conf.h | 1 - src/conf/device_conf.h | 1 - src/conf/interface_conf.h | 1 - src/conf/node_device_conf.h | 1 - src/conf/numa_conf.h | 1 - src/conf/secret_conf.h | 1 - src/util/virconf.h | 1 - src/util/virgic.h | 1 - src/util/virkeycode.h | 1 - src/util/virmdev.h | 1 - src/util/virnetdevvlan.h | 2 -- src/util/virnetdevvportprofile.h | 1 - src/util/virnuma.h | 1 - src/util/virpci.h | 1 - src/util/virperf.h | 1 - src/util/virprocess.h | 1 - src/util/virresctrl.h | 1 - src/util/virscsivhost.h | 1 - src/util/virsecret.h | 1 - src/util/virstorageencryption.h | 1 - src/util/virstoragefile.h | 1 - src/util/virsysinfo.h | 1 - src/util/virtypedparam.h | 1 - 24 files changed, 25 deletions(-) diff --git a/src/access/viraccessperm.h b/src/access/viraccessperm.h index 7480ee8c2f..42996b9741 100644 --- a/src/access/viraccessperm.h +++ b/src/access/viraccessperm.h @@ -21,7 +21,6 @@ #pragma once #include "internal.h" -#include "virutil.h" #include "virenum.h" typedef enum { diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index 6cef9e9726..a95d56d017 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -20,7 +20,6 @@ #pragma once -#include "virutil.h" #include "virbuffer.h" #include "virxml.h" #include "virbitmap.h" diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index e091d7cfe2..d7395f2201 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -25,7 +25,6 @@ #include <libxml/xpath.h> #include "internal.h" -#include "virutil.h" #include "virthread.h" #include "virbuffer.h" #include "virpci.h" diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h index ce405e5b15..31063d206c 100644 --- a/src/conf/interface_conf.h +++ b/src/conf/interface_conf.h @@ -25,7 +25,6 @@ #include <libxml/xpath.h> #include "internal.h" -#include "virutil.h" #include "virthread.h" #include "device_conf.h" #include "virenum.h" diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index 4ff616ee90..9e4b0847fb 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -24,7 +24,6 @@ #include "internal.h" #include "virbitmap.h" -#include "virutil.h" #include "virscsihost.h" #include "virpci.h" #include "virvhba.h" diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h index b1b8e3274d..ae3599bb8b 100644 --- a/src/conf/numa_conf.h +++ b/src/conf/numa_conf.h @@ -23,7 +23,6 @@ #include <libxml/xpath.h> #include "internal.h" -#include "virutil.h" #include "virbitmap.h" #include "virbuffer.h" #include "virenum.h" diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h index ac94751ef3..77457ecd7a 100644 --- a/src/conf/secret_conf.h +++ b/src/conf/secret_conf.h @@ -21,7 +21,6 @@ #pragma once #include "internal.h" -#include "virutil.h" typedef struct _virSecretDef virSecretDef; typedef virSecretDef *virSecretDefPtr; diff --git a/src/util/virconf.h b/src/util/virconf.h index 0b2de34d36..6f0101bd3a 100644 --- a/src/util/virconf.h +++ b/src/util/virconf.h @@ -20,7 +20,6 @@ #pragma once -#include "virutil.h" #include "virenum.h" /** diff --git a/src/util/virgic.h b/src/util/virgic.h index 6552ab53f8..08838a619c 100644 --- a/src/util/virgic.h +++ b/src/util/virgic.h @@ -20,7 +20,6 @@ #pragma once -#include "virutil.h" #include "virenum.h" typedef enum { diff --git a/src/util/virkeycode.h b/src/util/virkeycode.h index b8d167ff14..b725613458 100644 --- a/src/util/virkeycode.h +++ b/src/util/virkeycode.h @@ -21,7 +21,6 @@ #pragma once -#include "virutil.h" #include "virenum.h" VIR_ENUM_DECL(virKeycodeSet); diff --git a/src/util/virmdev.h b/src/util/virmdev.h index e0905a3f6e..51f7f608a2 100644 --- a/src/util/virmdev.h +++ b/src/util/virmdev.h @@ -20,7 +20,6 @@ #include "internal.h" #include "virobject.h" -#include "virutil.h" #include "virenum.h" typedef enum { diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h index 9dbf07a6e2..0c1f5f1ecd 100644 --- a/src/util/virnetdevvlan.h +++ b/src/util/virnetdevvlan.h @@ -18,8 +18,6 @@ #pragma once -#include <virutil.h> - #include "virenum.h" typedef enum { diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprofile.h index 88a42a1816..3873fdf067 100644 --- a/src/util/virnetdevvportprofile.h +++ b/src/util/virnetdevvportprofile.h @@ -20,7 +20,6 @@ #include "internal.h" #include "viruuid.h" -#include "virutil.h" #include "virmacaddr.h" #include "virenum.h" diff --git a/src/util/virnuma.h b/src/util/virnuma.h index 5a6b36f7e9..c5bb5ffece 100644 --- a/src/util/virnuma.h +++ b/src/util/virnuma.h @@ -23,7 +23,6 @@ #include "internal.h" #include "virbitmap.h" -#include "virutil.h" char *virNumaGetAutoPlacementAdvice(unsigned short vcpus, diff --git a/src/util/virpci.h b/src/util/virpci.h index f6796fc422..f16d23614a 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -23,7 +23,6 @@ #include "internal.h" #include "virmdev.h" #include "virobject.h" -#include "virutil.h" #include "virenum.h" typedef struct _virPCIDevice virPCIDevice; diff --git a/src/util/virperf.h b/src/util/virperf.h index db61f94888..46307714c3 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -18,7 +18,6 @@ #pragma once -#include "virutil.h" #include "virenum.h" /* Some Intel processor families introduced some RDT (Resource Director diff --git a/src/util/virprocess.h b/src/util/virprocess.h index 04adae6b82..437deb1830 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -25,7 +25,6 @@ #include "internal.h" #include "virbitmap.h" -#include "virutil.h" #include "virenum.h" typedef enum { diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h index 11f275acf4..dcd9ca2bb2 100644 --- a/src/util/virresctrl.h +++ b/src/util/virresctrl.h @@ -22,7 +22,6 @@ #include "virobject.h" #include "virbitmap.h" -#include "virutil.h" #include "virenum.h" typedef enum { diff --git a/src/util/virscsivhost.h b/src/util/virscsivhost.h index a5296890cd..802c4d7bd7 100644 --- a/src/util/virscsivhost.h +++ b/src/util/virscsivhost.h @@ -22,7 +22,6 @@ #include "internal.h" #include "virobject.h" -#include "virutil.h" typedef struct _virSCSIVHostDevice virSCSIVHostDevice; typedef virSCSIVHostDevice *virSCSIVHostDevicePtr; diff --git a/src/util/virsecret.h b/src/util/virsecret.h index bf056cb3b2..8c49cfbc89 100644 --- a/src/util/virsecret.h +++ b/src/util/virsecret.h @@ -23,7 +23,6 @@ #include "internal.h" -#include "virutil.h" #include "virxml.h" #include "virenum.h" diff --git a/src/util/virstorageencryption.h b/src/util/virstorageencryption.h index 3e5485d88b..a107161f0f 100644 --- a/src/util/virstorageencryption.h +++ b/src/util/virstorageencryption.h @@ -23,7 +23,6 @@ #include "internal.h" #include "virbuffer.h" #include "virsecret.h" -#include "virutil.h" #include "virenum.h" #include <libxml/tree.h> diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 1f41e6e357..b4c5e1c9bf 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -27,7 +27,6 @@ #include "virobject.h" #include "virseclabel.h" #include "virstorageencryption.h" -#include "virutil.h" #include "virsecret.h" #include "virenum.h" #include "virpci.h" diff --git a/src/util/virsysinfo.h b/src/util/virsysinfo.h index 3ce936205c..f1d280e1c9 100644 --- a/src/util/virsysinfo.h +++ b/src/util/virsysinfo.h @@ -22,7 +22,6 @@ #pragma once #include "internal.h" -#include "virutil.h" #include "virbuffer.h" #include "virenum.h" diff --git a/src/util/virtypedparam.h b/src/util/virtypedparam.h index 3ac2e68144..0a430924a7 100644 --- a/src/util/virtypedparam.h +++ b/src/util/virtypedparam.h @@ -22,7 +22,6 @@ #pragma once #include "internal.h" -#include "virutil.h" #include "virenum.h" /** -- 2.24.1
On 2/23/20 8:25 PM, Ján Tomko wrote:
With the introduction of virenum.h and GLib, the need for including this file diminishes.
Remove its transitive inclusion from almost anywhere to discourage its use as a generic helper dump. The remaining functions should be repatriated into other files if possible.
Ján Tomko (8): Remove virutil.h where possible tests: include unistd.h instead of virutil.h util: vircgroup: include unistd.h rather than virutil.h util: virportallocator: add includes tools: virt-host-validate: move virutil.h include Include unistd.h where used virsh: include virutil.h where used Remove virutil.h from all header files
All patches: Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
src/access/viraccessperm.h | 1 - src/bhyve/bhyve_domain.c | 1 + src/bhyve/bhyve_driver.c | 1 + src/conf/capabilities.c | 1 + src/conf/cpu_conf.h | 1 - src/conf/device_conf.h | 1 - src/conf/domain_conf.c | 1 + src/conf/interface_conf.h | 1 - src/conf/node_device_conf.h | 1 - src/conf/node_device_util.c | 1 + src/conf/numa_conf.h | 1 - src/conf/secret_conf.h | 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_conf.c | 2 ++ src/lxc/lxc_container.c | 1 + src/lxc/lxc_controller.c | 1 + src/lxc/lxc_domain.c | 1 - src/lxc/lxc_driver.c | 1 + src/lxc/lxc_fuse.c | 2 ++ 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/qemu/qemu_vhost_user_gpu.c | 1 - src/remote/remote_driver.c | 1 + src/rpc/virnetlibsshsession.c | 1 - src/rpc/virnetsshsession.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/iohelper.c | 1 - src/util/vircgroup.h | 1 - src/util/vircgroupv1.c | 1 + src/util/vircgroupv2.c | 1 + src/util/virconf.h | 1 - src/util/virerror.c | 1 - src/util/virfirewall.c | 1 - src/util/virgic.c | 1 - src/util/virgic.h | 1 - src/util/virkeycode.h | 1 - src/util/virmdev.h | 1 - src/util/virmodule.c | 1 + src/util/virnetdevbandwidth.c | 1 - src/util/virnetdevbridge.c | 1 - src/util/virnetdevip.c | 1 - src/util/virnetdevveth.c | 1 - src/util/virnetdevvlan.h | 2 -- src/util/virnetdevvportprofile.h | 1 - src/util/virnuma.c | 1 + src/util/virnuma.h | 1 - src/util/virpci.c | 1 - src/util/virpci.h | 1 - src/util/virperf.c | 1 + src/util/virperf.h | 1 - src/util/virpolkit.c | 2 ++ src/util/virportallocator.c | 3 +++ src/util/virprocess.h | 1 - src/util/virrandom.c | 1 - src/util/virresctrl.c | 1 + src/util/virresctrl.h | 1 - src/util/virscsi.c | 1 - src/util/virscsivhost.h | 1 - src/util/virsecret.h | 1 - src/util/virstorageencryption.h | 1 - src/util/virstoragefile.c | 1 - src/util/virstoragefile.h | 1 - src/util/virsysinfo.h | 1 - src/util/virtypedparam.c | 1 - src/util/virtypedparam.h | 1 - src/util/viruri.c | 1 - src/util/virusb.c | 1 - src/util/virxml.c | 1 - src/vbox/vbox_common.c | 1 + src/vbox/vbox_driver.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/fdstreamtest.c | 1 - tests/objecteventtest.c | 2 ++ tests/scsihosttest.c | 1 + tests/testutils.c | 1 - tests/testutilsqemu.c | 1 + tests/vboxsnapshotxmltest.c | 2 ++ tests/virfiletest.c | 1 + tests/virkeycodetest.c | 1 - tests/virlockspacetest.c | 2 +- tests/virnetsockettest.c | 2 +- tests/virnettlscontexttest.c | 2 +- tests/virnettlshelpers.c | 1 + tests/virportallocatortest.c | 1 - tests/virscsitest.c | 1 + tests/virstoragetest.c | 1 + tests/virsystemdtest.c | 1 + tools/virsh-domain.c | 1 + tools/virsh-interface.c | 1 - tools/virsh-nodedev.c | 1 + tools/virsh-nwfilter.c | 1 - tools/virt-host-validate-common.c | 1 + tools/virt-host-validate-common.h | 1 - tools/vsh.c | 1 + 144 files changed, 100 insertions(+), 57 deletions(-)
participants (2)
-
Daniel Henrique Barboza -
Ján Tomko