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