This series was inspired by the cleanup proposed by Michal in his recent security driver work. I pointed out the mess he was cleaning up was in fact across the entire codebase: https://www.redhat.com/archives/libvir-list/2018-December/msg00136.html This series addresses it globally Daniel P. Berrangé (2): Fix many mistakes & inconsistencies in header file layout Enforce a standard header file guard symbol name build-aux/header-ifdef.pl | 156 ++++++++++++++++++++ cfg.mk | 7 +- docs/apibuild.py | 2 + include/libvirt/libvirt-admin.h | 6 +- include/libvirt/libvirt-domain-snapshot.h | 6 +- include/libvirt/libvirt-domain.h | 6 +- include/libvirt/libvirt-event.h | 6 +- include/libvirt/libvirt-host.h | 6 +- include/libvirt/libvirt-interface.h | 6 +- include/libvirt/libvirt-lxc.h | 6 +- include/libvirt/libvirt-network.h | 6 +- include/libvirt/libvirt-nodedev.h | 6 +- include/libvirt/libvirt-nwfilter.h | 6 +- include/libvirt/libvirt-qemu.h | 6 +- include/libvirt/libvirt-secret.h | 6 +- include/libvirt/libvirt-storage.h | 6 +- include/libvirt/libvirt-stream.h | 6 +- include/libvirt/libvirt.h | 6 +- include/libvirt/virterror.h | 6 +- src/access/viraccessdriver.h | 6 +- src/access/viraccessdrivernop.h | 6 +- src/access/viraccessdriverpolkit.h | 6 +- src/access/viraccessdriverstack.h | 6 +- src/access/viraccessmanager.h | 6 +- src/access/viraccessperm.h | 6 +- src/admin/admin_server.h | 6 +- src/admin/admin_server_dispatch.h | 6 +- src/bhyve/bhyve_capabilities.h | 6 +- src/bhyve/bhyve_command.h | 6 +- src/bhyve/bhyve_conf.h | 6 +- src/bhyve/bhyve_device.h | 6 +- src/bhyve/bhyve_domain.h | 6 +- src/bhyve/bhyve_driver.h | 6 +- src/bhyve/bhyve_monitor.h | 6 +- src/bhyve/bhyve_parse_command.h | 6 +- src/bhyve/bhyve_process.h | 6 +- src/bhyve/bhyve_utils.h | 6 +- src/conf/capabilities.h | 6 +- src/conf/cpu_conf.h | 6 +- src/conf/device_conf.h | 6 +- src/conf/domain_addr.h | 6 +- src/conf/domain_audit.h | 6 +- src/conf/domain_capabilities.h | 6 +- src/conf/domain_conf.h | 6 +- src/conf/domain_event.h | 9 +- src/conf/domain_nwfilter.h | 7 +- src/conf/interface_conf.h | 6 +- src/conf/netdev_bandwidth_conf.h | 6 +- src/conf/netdev_vlan_conf.h | 6 +- src/conf/netdev_vport_profile_conf.h | 6 +- src/conf/network_conf.h | 6 +- src/conf/network_event.h | 12 +- src/conf/networkcommon_conf.h | 6 +- src/conf/node_device_conf.h | 6 +- src/conf/node_device_event.h | 12 +- src/conf/node_device_util.h | 6 +- src/conf/numa_conf.h | 6 +- src/conf/nwfilter_conf.h | 7 +- src/conf/nwfilter_ipaddrmap.h | 6 +- src/conf/nwfilter_params.h | 7 +- src/conf/object_event.h | 10 +- src/conf/object_event_private.h | 8 +- src/conf/secret_conf.h | 7 +- src/conf/secret_event.h | 12 +- src/conf/snapshot_conf.h | 6 +- src/conf/storage_adapter_conf.h | 6 +- src/conf/storage_conf.h | 6 +- src/conf/storage_event.h | 12 +- src/conf/virchrdev.h | 8 +- src/conf/virdomainobjlist.h | 6 +- src/conf/virinterfaceobj.h | 6 +- src/conf/virnetworkobj.h | 6 +- src/conf/virnodedeviceobj.h | 6 +- src/conf/virnwfilterbindingdef.h | 7 +- src/conf/virnwfilterbindingobj.h | 7 +- src/conf/virnwfilterbindingobjlist.h | 6 +- src/conf/virnwfilterobj.h | 7 +- src/conf/virsavecookie.h | 7 +- src/conf/virsecretobj.h | 6 +- src/conf/virstorageobj.h | 6 +- src/cpu/cpu.h | 6 +- src/cpu/cpu_arm.h | 6 +- src/cpu/cpu_map.h | 6 +- src/cpu/cpu_ppc64.h | 6 +- src/cpu/cpu_ppc64_data.h | 6 +- src/cpu/cpu_s390.h | 6 +- src/cpu/cpu_x86.h | 6 +- src/cpu/cpu_x86_data.h | 6 +- src/datatypes.h | 6 +- src/driver-hypervisor.h | 6 +- src/driver-interface.h | 6 +- src/driver-network.h | 6 +- src/driver-nodedev.h | 6 +- src/driver-nwfilter.h | 6 +- src/driver-secret.h | 6 +- src/driver-state.h | 6 +- src/driver-storage.h | 6 +- src/driver-stream.h | 6 +- src/driver.h | 6 +- src/esx/esx_driver.h | 6 +- src/esx/esx_interface_driver.h | 6 +- src/esx/esx_network_driver.h | 6 +- src/esx/esx_private.h | 6 +- src/esx/esx_storage_backend_iscsi.h | 6 +- src/esx/esx_storage_backend_vmfs.h | 6 +- src/esx/esx_storage_driver.h | 6 +- src/esx/esx_stream.h | 6 +- src/esx/esx_util.h | 6 +- src/esx/esx_vi.h | 6 +- src/esx/esx_vi_methods.h | 6 +- src/esx/esx_vi_types.h | 6 +- src/hyperv/hyperv_driver.h | 6 +- src/hyperv/hyperv_private.h | 6 +- src/hyperv/hyperv_util.h | 6 +- src/hyperv/hyperv_wmi.h | 6 +- src/hyperv/hyperv_wmi_classes.h | 6 +- src/hyperv/openwsman.h | 6 +- src/interface/interface_driver.h | 7 +- src/internal.h | 6 +- src/libvirt_internal.h | 6 +- src/libxl/libxl_capabilities.h | 6 +- src/libxl/libxl_conf.h | 6 +- src/libxl/libxl_domain.h | 6 +- src/libxl/libxl_driver.h | 6 +- src/libxl/libxl_logger.h | 6 +- src/libxl/libxl_migration.h | 6 +- src/locking/domain_lock.h | 6 +- src/locking/lock_daemon.h | 6 +- src/locking/lock_daemon_config.h | 6 +- src/locking/lock_daemon_dispatch.h | 6 +- src/locking/lock_driver.h | 6 +- src/locking/lock_driver_lockd.h | 6 +- src/locking/lock_driver_nop.h | 6 +- src/locking/lock_manager.h | 6 +- src/logging/log_daemon.h | 6 +- src/logging/log_daemon_config.h | 6 +- src/logging/log_daemon_dispatch.h | 6 +- src/logging/log_handler.h | 6 +- src/logging/log_manager.h | 7 +- src/lxc/lxc_cgroup.h | 6 +- src/lxc/lxc_conf.h | 6 +- src/lxc/lxc_container.h | 6 +- src/lxc/lxc_domain.h | 7 +- src/lxc/lxc_driver.h | 6 +- src/lxc/lxc_fuse.h | 6 +- src/lxc/lxc_hostdev.h | 6 +- src/lxc/lxc_monitor.h | 6 +- src/lxc/lxc_native.h | 6 +- src/lxc/lxc_process.h | 6 +- src/network/bridge_driver.h | 7 +- src/network/bridge_driver_platform.h | 6 +- src/node_device/node_device_driver.h | 6 +- src/node_device/node_device_hal.h | 6 +- src/node_device/node_device_udev.h | 13 +- src/nwfilter/nwfilter_dhcpsnoop.h | 6 +- src/nwfilter/nwfilter_driver.h | 6 +- src/nwfilter/nwfilter_ebiptables_driver.h | 7 +- src/nwfilter/nwfilter_gentech_driver.h | 7 +- src/nwfilter/nwfilter_learnipaddr.h | 6 +- src/nwfilter/nwfilter_tech_driver.h | 6 +- src/openvz/openvz_conf.h | 6 +- src/openvz/openvz_driver.h | 7 +- src/openvz/openvz_util.h | 7 +- src/phyp/phyp_driver.h | 6 +- src/qemu/qemu_agent.h | 7 +- src/qemu/qemu_alias.h | 6 +- src/qemu/qemu_block.h | 6 +- src/qemu/qemu_blockjob.h | 6 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 6 +- src/qemu/qemu_capspriv.h | 11 +- src/qemu/qemu_cgroup.h | 6 +- src/qemu/qemu_command.h | 6 +- src/qemu/qemu_conf.h | 6 +- src/qemu/qemu_domain.h | 6 +- src/qemu/qemu_domain_address.h | 7 +- src/qemu/qemu_driver.h | 6 +- src/qemu/qemu_extdevice.h | 7 +- src/qemu/qemu_hostdev.h | 6 +- src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_hotplug.h | 6 +- src/qemu/qemu_hotplugpriv.h | 10 +- src/qemu/qemu_interface.h | 6 +- src/qemu/qemu_migration.h | 6 +- src/qemu/qemu_migration_cookie.h | 6 +- src/qemu/qemu_migration_params.c | 1 + src/qemu/qemu_migration_params.h | 6 +- src/qemu/qemu_migration_paramspriv.h | 10 +- src/qemu/qemu_monitor.c | 2 +- src/qemu/qemu_monitor.h | 7 +- src/qemu/qemu_monitor_json.h | 7 +- src/qemu/qemu_monitor_priv.h | 10 +- src/qemu/qemu_monitor_text.h | 7 +- src/qemu/qemu_parse_command.h | 6 +- src/qemu/qemu_process.c | 1 + src/qemu/qemu_process.h | 6 +- src/qemu/qemu_processpriv.h | 10 +- src/qemu/qemu_qapi.h | 6 +- src/qemu/qemu_security.h | 6 +- src/qemu/qemu_tpm.h | 7 +- src/remote/remote_daemon.h | 7 +- src/remote/remote_daemon_config.h | 6 +- src/remote/remote_daemon_dispatch.h | 6 +- src/remote/remote_daemon_stream.h | 7 +- src/remote/remote_driver.h | 6 +- src/rpc/virkeepalive.h | 6 +- src/rpc/virnetclient.h | 6 +- src/rpc/virnetclientprogram.h | 6 +- src/rpc/virnetclientstream.h | 6 +- src/rpc/virnetdaemon.h | 6 +- src/rpc/virnetlibsshsession.h | 7 +- src/rpc/virnetmessage.h | 6 +- src/rpc/virnetsaslcontext.h | 6 +- src/rpc/virnetserver.h | 6 +- src/rpc/virnetserverclient.h | 6 +- src/rpc/virnetservermdns.h | 6 +- src/rpc/virnetserverprogram.h | 6 +- src/rpc/virnetserverservice.h | 6 +- src/rpc/virnetsocket.h | 6 +- src/rpc/virnetsshsession.h | 7 +- src/rpc/virnettlscontext.h | 6 +- src/secret/secret_driver.h | 6 +- src/secret/secret_util.h | 6 +- src/security/security_apparmor.h | 7 +- src/security/security_dac.h | 8 +- src/security/security_driver.h | 7 +- src/security/security_manager.h | 6 +- src/security/security_nop.h | 6 +- src/security/security_selinux.h | 7 +- src/security/security_stack.h | 8 +- src/storage/storage_backend.h | 6 +- src/storage/storage_backend_disk.h | 6 +- src/storage/storage_backend_fs.h | 6 +- src/storage/storage_backend_gluster.h | 6 +- src/storage/storage_backend_iscsi.h | 6 +- src/storage/storage_backend_iscsi_direct.h | 22 ++- src/storage/storage_backend_logical.h | 6 +- src/storage/storage_backend_mpath.h | 6 +- src/storage/storage_backend_rbd.h | 6 +- src/storage/storage_backend_scsi.h | 6 +- src/storage/storage_backend_sheepdog.c | 1 + src/storage/storage_backend_sheepdog.h | 6 +- src/storage/storage_backend_sheepdog_priv.h | 10 +- src/storage/storage_backend_vstorage.h | 6 +- src/storage/storage_backend_zfs.h | 6 +- src/storage/storage_driver.h | 6 +- src/storage/storage_file_fs.h | 6 +- src/storage/storage_file_gluster.h | 6 +- src/storage/storage_util.h | 6 +- src/test/test_driver.h | 6 +- src/uml/uml_conf.h | 6 +- src/uml/uml_driver.h | 7 +- src/util/viralloc.h | 7 +- src/util/virarch.h | 6 +- src/util/virarptable.h | 6 +- src/util/viratomic.h | 6 +- src/util/viraudit.h | 7 +- src/util/virauth.h | 6 +- src/util/virauthconfig.h | 6 +- src/util/virbitmap.h | 6 +- src/util/virbuffer.h | 6 +- src/util/vircgroup.c | 2 +- src/util/vircgroup.h | 6 +- src/util/vircgroupbackend.c | 3 +- src/util/vircgroupbackend.h | 6 +- src/util/vircgrouppriv.h | 10 +- src/util/vircgroupv1.c | 3 +- src/util/vircgroupv1.h | 6 +- src/util/vircgroupv2.c | 3 +- src/util/vircgroupv2.h | 6 +- src/util/virclosecallbacks.h | 6 +- src/util/vircommand.c | 2 +- src/util/vircommand.h | 6 +- src/util/vircommandpriv.h | 10 +- src/util/virconf.h | 6 +- src/util/vircrypto.h | 6 +- src/util/virdbus.c | 1 + src/util/virdbus.h | 6 +- src/util/virdbuspriv.h | 10 +- src/util/virdevmapper.h | 6 +- src/util/virdnsmasq.h | 6 +- src/util/virebtables.h | 6 +- src/util/virendian.h | 6 +- src/util/virerror.h | 6 +- src/util/virevent.h | 6 +- src/util/vireventpoll.h | 6 +- src/util/virfcp.h | 6 +- src/util/virfdstream.h | 7 +- src/util/virfile.h | 7 +- src/util/virfilecache.h | 6 +- src/util/virfirewall.c | 3 +- src/util/virfirewall.h | 6 +- src/util/virfirewallpriv.h | 10 +- src/util/virfirmware.h | 6 +- src/util/virgettext.h | 7 +- src/util/virgic.h | 6 +- src/util/virhash.h | 6 +- src/util/virhashcode.h | 6 +- src/util/virhook.h | 6 +- src/util/virhostcpu.c | 1 + src/util/virhostcpu.h | 6 +- src/util/virhostcpupriv.h | 10 +- src/util/virhostdev.h | 6 +- src/util/virhostmem.h | 6 +- src/util/viridentity.h | 6 +- src/util/virinitctl.h | 6 +- src/util/viriptables.h | 6 +- src/util/viriscsi.h | 7 +- src/util/virjson.h | 7 +- src/util/virkeycode.h | 6 +- src/util/virkeyfile.h | 6 +- src/util/virkmod.h | 6 +- src/util/virlease.h | 7 +- src/util/virlockspace.h | 6 +- src/util/virlog.h | 6 +- src/util/virmacaddr.h | 6 +- src/util/virmacmap.h | 7 +- src/util/virmdev.h | 6 +- src/util/virmodule.h | 6 +- src/util/virnetdev.h | 6 +- src/util/virnetdevbandwidth.h | 6 +- src/util/virnetdevbridge.h | 6 +- src/util/virnetdevip.h | 6 +- src/util/virnetdevmacvlan.h | 6 +- src/util/virnetdevmidonet.h | 6 +- src/util/virnetdevopenvswitch.h | 6 +- src/util/virnetdevtap.h | 6 +- src/util/virnetdevveth.h | 6 +- src/util/virnetdevvlan.h | 7 +- src/util/virnetdevvportprofile.h | 6 +- src/util/virnetlink.h | 6 +- src/util/virnodesuspend.h | 7 +- src/util/virnuma.h | 6 +- src/util/virobject.h | 6 +- src/util/virpci.h | 6 +- src/util/virperf.h | 6 +- src/util/virpidfile.h | 6 +- src/util/virpolkit.h | 6 +- src/util/virportallocator.h | 6 +- src/util/virprobe.h | 6 +- src/util/virprocess.h | 6 +- src/util/virqemu.h | 7 +- src/util/virrandom.h | 6 +- src/util/virresctrl.c | 1 + src/util/virresctrl.h | 6 +- src/util/virresctrlpriv.h | 10 +- src/util/virrotatingfile.h | 6 +- src/util/virscsi.h | 6 +- src/util/virscsihost.h | 6 +- src/util/virscsivhost.h | 6 +- src/util/virseclabel.h | 6 +- src/util/virsecret.h | 6 +- src/util/virsexpr.h | 6 +- src/util/virsocketaddr.h | 6 +- src/util/virstorageencryption.h | 6 +- src/util/virstoragefile.h | 6 +- src/util/virstoragefilebackend.h | 6 +- src/util/virstring.h | 6 +- src/util/virsysinfo.c | 2 +- src/util/virsysinfo.h | 6 +- src/util/virsysinfopriv.h | 10 +- src/util/virsystemd.c | 2 +- src/util/virsystemd.h | 6 +- src/util/virsystemdpriv.h | 10 +- src/util/virthread.h | 6 +- src/util/virthreadjob.h | 6 +- src/util/virthreadpool.h | 6 +- src/util/virtime.h | 6 +- src/util/virtpm.h | 7 +- src/util/virtypedparam.h | 7 +- src/util/viruri.h | 6 +- src/util/virusb.h | 6 +- src/util/virutil.h | 6 +- src/util/viruuid.h | 6 +- src/util/virvhba.h | 6 +- src/util/virvsock.h | 6 +- src/util/virxdrdefs.h | 6 +- src/util/virxml.h | 6 +- src/vbox/vbox_MSCOMGlue.h | 6 +- src/vbox/vbox_common.h | 6 +- src/vbox/vbox_driver.h | 10 +- src/vbox/vbox_get_driver.h | 6 +- src/vbox/vbox_glue.h | 6 +- src/vbox/vbox_snapshot_conf.h | 6 +- src/vbox/vbox_uniformed_api.h | 6 +- src/vmware/vmware_conf.h | 8 +- src/vmware/vmware_driver.h | 11 +- src/vmx/vmx.h | 6 +- src/vz/vz_driver.h | 6 +- src/vz/vz_sdk.h | 9 +- src/vz/vz_utils.h | 8 +- src/xenapi/xenapi_driver.h | 7 +- src/xenapi/xenapi_driver_private.h | 7 +- src/xenapi/xenapi_utils.h | 6 +- src/xenconfig/xen_common.h | 6 +- src/xenconfig/xen_sxpr.h | 6 +- src/xenconfig/xen_xl.h | 6 +- src/xenconfig/xen_xm.h | 6 +- src/xenconfig/xenxs_private.h | 6 +- tests/cputest.c | 3 +- tests/networkxml2firewalltest.c | 4 +- tests/nwfilterebiptablestest.c | 4 +- tests/nwfilterxml2firewalltest.c | 4 +- tests/qemucapabilitiestest.c | 4 +- tests/qemucapsprobe.c | 2 +- tests/qemucpumock.c | 3 +- tests/qemuhotplugtest.c | 1 + tests/qemumigparamstest.c | 1 + tests/qemumonitorjsontest.c | 1 + tests/qemumonitortestutils.c | 1 + tests/qemumonitortestutils.h | 6 +- tests/qemuxml2argvtest.c | 3 +- tests/storagebackendsheepdogtest.c | 1 + tests/sysinfotest.c | 2 +- tests/testutils.h | 6 +- tests/testutilshostcpus.h | 27 +++- tests/testutilslxc.h | 27 +++- tests/testutilsqemu.c | 2 +- tests/testutilsqemu.h | 35 ++++- tests/testutilsqemuschema.h | 11 +- tests/testutilsxen.h | 22 ++- tests/vircgrouptest.c | 2 +- tests/virdbustest.c | 2 +- tests/virfilewrapper.h | 5 +- tests/virfirewalltest.c | 6 +- tests/virhashdata.h | 21 +++ tests/virhostcputest.c | 1 + tests/viriscsitest.c | 3 +- tests/virkmodtest.c | 2 +- tests/virmock.h | 6 +- tests/virnetdevbandwidthtest.c | 2 +- tests/virnettlshelpers.h | 17 ++- tests/virresctrltest.c | 1 + tests/virsystemdtest.c | 2 +- tools/nss/libvirt_nss.h | 6 +- tools/virsh-completer.h | 6 +- tools/virsh-console.h | 6 +- tools/virsh-domain-monitor.h | 6 +- tools/virsh-domain.h | 6 +- tools/virsh-host.h | 6 +- tools/virsh-interface.h | 6 +- tools/virsh-network.h | 6 +- tools/virsh-nodedev.h | 6 +- tools/virsh-nwfilter.h | 6 +- tools/virsh-pool.h | 6 +- tools/virsh-secret.h | 6 +- tools/virsh-snapshot.h | 6 +- tools/virsh-util.h | 6 +- tools/virsh-volume.h | 6 +- tools/virsh.h | 6 +- tools/virt-admin-completer.h | 6 +- tools/virt-admin.h | 6 +- tools/virt-host-validate-bhyve.h | 6 +- tools/virt-host-validate-common.h | 6 +- tools/virt-host-validate-lxc.h | 6 +- tools/virt-host-validate-qemu.h | 6 +- tools/vsh-table.h | 6 +- tools/vsh.h | 6 +- tools/wireshark/src/packet-libvirt.h | 7 +- 459 files changed, 1685 insertions(+), 1358 deletions(-) create mode 100644 build-aux/header-ifdef.pl -- 2.19.2 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
