[libvirt] [PATCH 0/2] Sanitize header file conditionals and layout
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
This introduces a syntax-check script that validates header files use a common layout: /* ...copyright header... */ <one blank line> #ifndef SYMBOL # define SYMBOL ....content.... #endif /* SYMBOL */ For any file ending priv.h, before the #ifndef, we will require a guard to prevent bogus imports: #ifndef SYMBOL_ALLOW # error .... #endif /* SYMBOL_ALLOW */ <one blank line> The many mistakes this script identifies are then fixed. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- build-aux/header-ifdef.pl | 149 ++++++++++++++++++++ cfg.mk | 7 +- src/bhyve/bhyve_capabilities.h | 2 +- src/bhyve/bhyve_parse_command.h | 2 +- src/conf/domain_event.h | 5 +- src/conf/domain_nwfilter.h | 1 + src/conf/netdev_vlan_conf.h | 2 +- src/conf/network_event.h | 10 +- src/conf/node_device_event.h | 10 +- src/conf/nwfilter_conf.h | 1 + src/conf/nwfilter_params.h | 1 + src/conf/object_event.h | 10 +- src/conf/object_event_private.h | 6 +- src/conf/secret_conf.h | 3 +- src/conf/secret_event.h | 10 +- src/conf/storage_event.h | 10 +- src/conf/virchrdev.h | 4 +- src/conf/virnwfilterbindingdef.h | 1 + src/conf/virnwfilterbindingobj.h | 1 + src/conf/virnwfilterobj.h | 1 + src/conf/virsavecookie.h | 3 +- src/datatypes.h | 2 +- src/interface/interface_driver.h | 1 - src/internal.h | 2 +- src/libvirt_internal.h | 2 +- src/libxl/libxl_migration.h | 2 +- src/locking/lock_daemon_config.h | 2 +- src/logging/log_daemon_config.h | 2 +- src/logging/log_handler.h | 2 +- src/logging/log_manager.h | 1 - src/lxc/lxc_domain.h | 1 - src/network/bridge_driver.h | 1 - src/node_device/node_device_udev.h | 13 +- src/nwfilter/nwfilter_ebiptables_driver.h | 3 +- src/nwfilter/nwfilter_gentech_driver.h | 3 +- src/openvz/openvz_driver.h | 3 +- src/openvz/openvz_util.h | 3 +- src/qemu/qemu_agent.h | 1 - src/qemu/qemu_alias.h | 2 +- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_capspriv.h | 5 +- src/qemu/qemu_command.h | 2 +- src/qemu/qemu_domain_address.h | 3 +- src/qemu/qemu_extdevice.h | 1 + src/qemu/qemu_hotplug.c | 1 + src/qemu/qemu_hotplugpriv.h | 4 + src/qemu/qemu_migration_params.c | 1 + src/qemu/qemu_migration_paramspriv.h | 4 + src/qemu/qemu_monitor.h | 1 - src/qemu/qemu_monitor_json.h | 1 - src/qemu/qemu_monitor_priv.h | 4 +- src/qemu/qemu_monitor_text.h | 1 - src/qemu/qemu_parse_command.h | 2 +- src/qemu/qemu_process.c | 1 + src/qemu/qemu_processpriv.h | 4 + src/qemu/qemu_tpm.h | 1 + src/remote/remote_daemon.h | 1 - src/remote/remote_daemon_stream.h | 1 - src/rpc/virnetlibsshsession.h | 3 +- src/rpc/virnetserverservice.h | 2 +- src/rpc/virnetsshsession.h | 3 +- src/rpc/virnettlscontext.h | 2 +- src/security/security_apparmor.h | 1 + src/security/security_dac.h | 4 +- src/security/security_driver.h | 1 + src/security/security_selinux.h | 1 + src/security/security_stack.h | 4 +- src/storage/storage_backend_iscsi_direct.h | 16 +++ src/storage/storage_backend_sheepdog.c | 1 + src/storage/storage_backend_sheepdog_priv.h | 4 + src/uml/uml_driver.h | 1 - src/util/viralloc.h | 1 - src/util/viratomic.h | 2 +- src/util/viraudit.h | 1 - src/util/virbitmap.h | 2 +- src/util/vircgrouppriv.h | 2 +- src/util/vircommandpriv.h | 2 +- src/util/virdbus.c | 1 + src/util/virdbuspriv.h | 4 + src/util/virebtables.h | 2 +- src/util/virerror.h | 2 +- src/util/vireventpoll.h | 2 +- src/util/virfcp.h | 2 +- src/util/virfdstream.h | 1 - src/util/virfile.h | 3 +- src/util/virfirewallpriv.h | 2 +- src/util/virgettext.h | 1 + src/util/virhash.h | 2 +- src/util/virhostcpu.c | 1 + src/util/virhostcpu.h | 2 +- src/util/virhostcpupriv.h | 4 + src/util/virhostmem.h | 2 +- src/util/virinitctl.h | 2 +- src/util/viriscsi.h | 3 +- src/util/virjson.h | 1 - src/util/virkeycode.h | 2 +- src/util/virlease.h | 3 +- src/util/virlog.h | 2 +- src/util/virmacmap.h | 3 +- src/util/virnetdevvlan.h | 1 + src/util/virnodesuspend.h | 1 - src/util/virobject.h | 2 +- src/util/virqemu.h | 1 - src/util/virresctrl.c | 1 + src/util/virresctrl.h | 2 +- src/util/virresctrlpriv.h | 4 + src/util/virsexpr.h | 2 +- src/util/virsysinfopriv.h | 2 +- src/util/virsystemdpriv.h | 2 +- src/util/virthread.h | 2 +- src/util/virthreadjob.h | 2 +- src/util/virthreadpool.h | 2 +- src/util/virtime.h | 2 +- src/util/virtpm.h | 1 + src/util/virtypedparam.h | 3 +- src/util/virvhba.h | 2 +- src/util/virxml.h | 2 +- src/vbox/vbox_driver.h | 6 +- src/vbox/vbox_snapshot_conf.h | 2 +- src/vmware/vmware_conf.h | 4 +- src/vmware/vmware_driver.h | 7 +- src/vz/vz_driver.h | 2 +- src/vz/vz_sdk.h | 9 +- src/vz/vz_utils.h | 4 +- src/xenapi/xenapi_driver.h | 1 - src/xenapi/xenapi_driver_private.h | 1 - tests/qemuhotplugtest.c | 1 + tests/qemumigparamstest.c | 1 + tests/qemumonitorjsontest.c | 1 + tests/qemumonitortestutils.c | 1 + tests/storagebackendsheepdogtest.c | 1 + tests/testutilshostcpus.h | 27 +++- tests/testutilslxc.h | 27 +++- tests/testutilsqemu.h | 35 ++++- tests/testutilsqemuschema.h | 11 +- tests/testutilsxen.h | 16 +++ tests/virdbustest.c | 2 +- tests/virfilewrapper.h | 1 + tests/virfirewalltest.c | 1 + tests/virhashdata.h | 21 +++ tests/virhostcputest.c | 1 + tests/virnettlshelpers.h | 17 ++- tests/virresctrltest.c | 1 + tools/virsh-completer.h | 2 +- tools/virt-admin-completer.h | 2 +- tools/wireshark/src/packet-libvirt.h | 1 + 146 files changed, 496 insertions(+), 169 deletions(-) create mode 100644 build-aux/header-ifdef.pl diff --git a/build-aux/header-ifdef.pl b/build-aux/header-ifdef.pl new file mode 100644 index 0000000000..48a2bd4e31 --- /dev/null +++ b/build-aux/header-ifdef.pl @@ -0,0 +1,149 @@ +#!/usr/bin/perl +# +# Validate that header files follow a standard layout: +# +# /* +# ...copyright header... +# */ +# <one blank line> +# #ifndef SYMBOL +# # define SYMBOL +# ....content.... +# #endif /* SYMBOL */ +# +# For any file ending priv.h, before the #ifndef +# We will have a further section +# +# #ifndef SYMBOL_ALLOW +# # error .... +# #endif /* SYMBOL_ALLOW */ +# <one blank line> + +use strict; +use warnings; + +my $STATE_COPYRIGHT_COMMENT = 0; +my $STATE_COPYRIGHT_BLANK = 1; +my $STATE_PRIV_START = 2; +my $STATE_PRIV_ERROR = 3; +my $STATE_PRIV_END = 4; +my $STATE_PRIV_BLANK = 5; +my $STATE_GUARD_START = 6; +my $STATE_GUARD_DEFINE = 7; +my $STATE_GUARD_END = 8; +my $STATE_EOF = 9; + +my $file = " "; +my $ret = 0; +my $ifdef = ""; +my $ifdefpriv = ""; + +my $state = $STATE_EOF; +my $mistake = 0; + +sub mistake { + my $msg = shift; + warn $msg; + $mistake = 1; + $ret = 1; +} + +while (<>) { + if (not $file eq $ARGV) { + if ($state == $STATE_COPYRIGHT_COMMENT) { + &mistake("$file: missing copyright comment"); + } elsif ($state == $STATE_COPYRIGHT_BLANK) { + &mistake("$file: missing blank line after copyright header"); + } elsif ($state == $STATE_PRIV_START) { + &mistake("$file: missing '#ifndef $ifdefpriv'"); + } elsif ($state == $STATE_PRIV_ERROR) { + &mistake("$file: missing '# error ...priv allow...'"); + } elsif ($state == $STATE_PRIV_END) { + &mistake("$file: missing '#endif /* $ifdefpriv */'"); + } elsif ($state == $STATE_PRIV_BLANK) { + &mistake("$file: missing blank line after priv header check"); + } elsif ($state == $STATE_GUARD_START) { + &mistake("$file: missing '#ifndef $ifdef'"); + } elsif ($state == $STATE_GUARD_DEFINE) { + &mistake("$file: missing '# define $ifdef'"); + } elsif ($state == $STATE_GUARD_END) { + &mistake("$file: missing '#endif /* $ifdef */'"); + } + + $file = $ARGV; + $state = $STATE_COPYRIGHT_COMMENT; + $mistake = 0; + } + + if ($mistake || + $ARGV eq "config-post.h" || + $ARGV =~ /vbox_(CAPI|XPCOM)/) { + $state = $STATE_EOF; + next; + } + + if ($state == $STATE_COPYRIGHT_COMMENT) { + if (m,\*/,) { + $state = $STATE_COPYRIGHT_BLANK; + } + } elsif ($state == $STATE_COPYRIGHT_BLANK) { + if (! /^$/) { + &mistake("$file: missing blank line after copyright header"); + } + if ($ARGV =~ /priv\.h$/) { + $state = $STATE_PRIV_START; + } else { + $state = $STATE_GUARD_START; + } + } elsif ($state == $STATE_PRIV_START) { + if (/^$/) { + &mistake("$file: too many blank lines after coyright header"); + } elsif (/#ifndef\s(.*ALLOW.*)/) { + $ifdefpriv = $1; + $state = $STATE_PRIV_ERROR; + } else { + &mistake("$file: missing '#ifndef SYMBOL_ALLOW'"); + } + } elsif ($state == $STATE_PRIV_ERROR) { + if (/# error ".*"$/) { + $state = $STATE_PRIV_END; + } else { + &mistake("$file: missing '#error ...priv allow...'"); + } + } elsif ($state == $STATE_PRIV_END) { + if (m,#endif /\* $ifdefpriv \*/,) { + $state = $STATE_PRIV_BLANK; + } else { + &mistake("$file: missing '#endif /* $ifdefpriv */'"); + } + } elsif ($state == $STATE_PRIV_BLANK) { + if (! /^$/) { + &mistake("$file: missing blank line after priv guard"); + } + $state = $STATE_GUARD_START; + } elsif ($state == $STATE_GUARD_START) { + if (/^$/) { + &mistake("$file: too many blank lines after coyright header"); + } elsif (/#ifndef\s(.*)$/) { + $ifdef = $1; + $state = $STATE_GUARD_DEFINE; + } else { + &mistake("$file: missing '#ifndef SYMBOL'"); + } + } elsif ($state == $STATE_GUARD_DEFINE) { + if (/# define $ifdef$/) { + $state = $STATE_GUARD_END; + } else { + &mistake("$file: missing '# define $ifdef'"); + } + } elsif ($state == $STATE_GUARD_END) { + if (m,#endif /\* $ifdef \*/$,) { + $state = $STATE_EOF; + } + } elsif ($state == $STATE_EOF) { + die "$file: unexpected content after '#endif /* $ifdef */'"; + } else { + die "$file: unexpected state $state"; + } +} +exit $ret; diff --git a/cfg.mk b/cfg.mk index bd037ff3da..c739edf604 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1122,7 +1122,8 @@ _autogen_error: ifneq ($(_gl-Makefile),) syntax-check: spacing-check test-wrap-argv \ - prohibit-duplicate-header mock-noinline group-qemu-caps + prohibit-duplicate-header mock-noinline group-qemu-caps \ + header-ifdef endif # Don't include duplicate header in the source (either *.c or *.h) @@ -1139,6 +1140,10 @@ mock-noinline: $(AM_V_GEN)files=`$(VC_LIST) | grep '\.[ch]$$'`; \ $(PERL) $(top_srcdir)/build-aux/mock-noinline.pl $$files +header-ifdef: + $(AM_V_GEN)files=`$(VC_LIST) | grep '\.[h]$$'`; \ + $(PERL) $(top_srcdir)/build-aux/header-ifdef.pl $$files + test-wrap-argv: $(AM_V_GEN)files=`$(VC_LIST) | grep -E '\.(ldargs|args)'`; \ $(PERL) $(top_srcdir)/tests/test-wrap-argv.pl --check $$files diff --git a/src/bhyve/bhyve_capabilities.h b/src/bhyve/bhyve_capabilities.h index 873bc9c12d..9d3218127e 100644 --- a/src/bhyve/bhyve_capabilities.h +++ b/src/bhyve/bhyve_capabilities.h @@ -55,4 +55,4 @@ typedef enum { int virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps); int virBhyveProbeCaps(unsigned int *caps); -#endif +#endif /* _BHYVE_CAPABILITIES */ diff --git a/src/bhyve/bhyve_parse_command.h b/src/bhyve/bhyve_parse_command.h index 793685c338..236444e777 100644 --- a/src/bhyve/bhyve_parse_command.h +++ b/src/bhyve/bhyve_parse_command.h @@ -25,4 +25,4 @@ virDomainDefPtr bhyveParseCommandLineString(const char* nativeConfig, unsigned caps, virDomainXMLOptionPtr xmlopt); -#endif /* __BHYVE_PARSE_COMMAND_H__*/ +#endif /* __BHYVE_PARSE_COMMAND_H__ */ diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 4266930272..c70117526a 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -20,11 +20,10 @@ * <http://www.gnu.org/licenses/>. */ -#include "internal.h" - #ifndef __DOMAIN_EVENT_H__ # define __DOMAIN_EVENT_H__ +# include "internal.h" # include "object_event.h" # include "domain_conf.h" @@ -325,4 +324,4 @@ virDomainQemuMonitorEventNew(int id, const char *details) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); -#endif +#endif /* __DOMAIN_EVENT_H__ */ diff --git a/src/conf/domain_nwfilter.h b/src/conf/domain_nwfilter.h index 8f1bcbacad..4ab9fbbfa7 100644 --- a/src/conf/domain_nwfilter.h +++ b/src/conf/domain_nwfilter.h @@ -18,6 +18,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ + #ifndef DOMAIN_NWFILTER_H # define DOMAIN_NWFILTER_H diff --git a/src/conf/netdev_vlan_conf.h b/src/conf/netdev_vlan_conf.h index 4f21873aad..88667d47fa 100644 --- a/src/conf/netdev_vlan_conf.h +++ b/src/conf/netdev_vlan_conf.h @@ -27,4 +27,4 @@ int virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr def); int virNetDevVlanFormat(const virNetDevVlan *def, virBufferPtr buf); -#endif /* __VIR_NETDEV_VPORT_PROFILE_CONF_H__ */ +#endif /* __VIR_NETDEV_VLAN_CONF_H__ */ diff --git a/src/conf/network_event.h b/src/conf/network_event.h index 269475a3b1..fb43a27359 100644 --- a/src/conf/network_event.h +++ b/src/conf/network_event.h @@ -19,13 +19,13 @@ * <http://www.gnu.org/licenses/>. */ -#include "internal.h" -#include "object_event.h" -#include "object_event_private.h" - #ifndef __NETWORK_EVENT_H__ # define __NETWORK_EVENT_H__ +# include "internal.h" +# include "object_event.h" +# include "object_event_private.h" + int virNetworkEventStateRegisterID(virConnectPtr conn, virObjectEventStatePtr state, @@ -56,4 +56,4 @@ virNetworkEventLifecycleNew(const char *name, int type, int detail); -#endif +#endif /* __NETWORK_EVENT_H__ */ diff --git a/src/conf/node_device_event.h b/src/conf/node_device_event.h index 5a32d33abe..6c4fc50ef8 100644 --- a/src/conf/node_device_event.h +++ b/src/conf/node_device_event.h @@ -20,13 +20,13 @@ * <http://www.gnu.org/licenses/>. */ -#include "internal.h" -#include "object_event.h" -#include "object_event_private.h" - #ifndef __NODE_DEVICE_EVENT_H__ # define __NODE_DEVICE_EVENT_H__ +# include "internal.h" +# include "object_event.h" +# include "object_event_private.h" + int virNodeDeviceEventStateRegisterID(virConnectPtr conn, virObjectEventStatePtr state, @@ -59,4 +59,4 @@ virNodeDeviceEventLifecycleNew(const char *name, virObjectEventPtr virNodeDeviceEventUpdateNew(const char *name); -#endif +#endif /* __NODE_DEVICE_EVENT_H__ */ diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 9d94dd7937..da70f0d80b 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -21,6 +21,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ + #ifndef NWFILTER_CONF_H # define NWFILTER_CONF_H diff --git a/src/conf/nwfilter_params.h b/src/conf/nwfilter_params.h index c02ddd20a6..762e94ed0f 100644 --- a/src/conf/nwfilter_params.h +++ b/src/conf/nwfilter_params.h @@ -18,6 +18,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ + #ifndef NWFILTER_PARAMS_H # define NWFILTER_PARAMS_H diff --git a/src/conf/object_event.h b/src/conf/object_event.h index c1e87a2423..ebded5ab7a 100644 --- a/src/conf/object_event.h +++ b/src/conf/object_event.h @@ -20,13 +20,13 @@ * <http://www.gnu.org/licenses/>. */ -#include "internal.h" - -#include "virobject.h" - #ifndef __OBJECT_EVENT_H__ # define __OBJECT_EVENT_H__ +# include "internal.h" + +# include "virobject.h" + /** * Dispatching domain events that come in while * in a call / response rpc @@ -89,4 +89,4 @@ virObjectEventStateSetRemote(virConnectPtr conn, int remoteID) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -#endif +#endif /* __OBJECT_EVENT_H__ */ diff --git a/src/conf/object_event_private.h b/src/conf/object_event_private.h index a45902827d..6f15290670 100644 --- a/src/conf/object_event_private.h +++ b/src/conf/object_event_private.h @@ -20,11 +20,11 @@ * <http://www.gnu.org/licenses/>. */ -#include "datatypes.h" - #ifndef __OBJECT_EVENT_PRIVATE_H__ # define __OBJECT_EVENT_PRIVATE_H__ +# include "datatypes.h" + struct _virObjectMeta { int id; char *name; @@ -106,4 +106,4 @@ virObjectEventNew(virClassPtr klass, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5) ATTRIBUTE_NONNULL(7); -#endif +#endif /* __OBJECT_EVENT_PRIVATE_H__ */ diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h index 4b824e4023..d871ad7e93 100644 --- a/src/conf/secret_conf.h +++ b/src/conf/secret_conf.h @@ -52,5 +52,4 @@ char *virSecretDefFormat(const virSecretDef *def); (VIR_CONNECT_LIST_SECRETS_FILTERS_EPHEMERAL | \ VIR_CONNECT_LIST_SECRETS_FILTERS_PRIVATE) - -#endif +#endif /* __VIR_SECRET_CONF_H__ */ diff --git a/src/conf/secret_event.h b/src/conf/secret_event.h index 5fd52f3fd3..3aa651c533 100644 --- a/src/conf/secret_event.h +++ b/src/conf/secret_event.h @@ -20,13 +20,13 @@ * <http://www.gnu.org/licenses/>. */ -#include "internal.h" -#include "object_event.h" -#include "object_event_private.h" - #ifndef __SECRET_EVENT_H__ # define __SECRET_EVENT_H__ +# include "internal.h" +# include "object_event.h" +# include "object_event_private.h" + int virSecretEventStateRegisterID(virConnectPtr conn, virObjectEventStatePtr state, @@ -62,4 +62,4 @@ virSecretEventValueChangedNew(const unsigned char *uuid, int usage_type, const char *usage_id); -#endif +#endif /* __SECRET_EVENT_H__ */ diff --git a/src/conf/storage_event.h b/src/conf/storage_event.h index ea726911fa..936023584d 100644 --- a/src/conf/storage_event.h +++ b/src/conf/storage_event.h @@ -20,13 +20,13 @@ * <http://www.gnu.org/licenses/>. */ -#include "internal.h" -#include "object_event.h" -#include "object_event_private.h" - #ifndef __STORAGE_EVENT_H__ # define __STORAGE_EVENT_H__ +# include "internal.h" +# include "object_event.h" +# include "object_event_private.h" + int virStoragePoolEventStateRegisterID(virConnectPtr conn, virObjectEventStatePtr state, @@ -61,4 +61,4 @@ virObjectEventPtr virStoragePoolEventRefreshNew(const char *name, const unsigned char *uuid); -#endif +#endif /* __STORAGE_EVENT_H__ */ diff --git a/src/conf/virchrdev.h b/src/conf/virchrdev.h index 652767583b..b9dac9b31d 100644 --- a/src/conf/virchrdev.h +++ b/src/conf/virchrdev.h @@ -18,6 +18,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ + #ifndef __VIR_CHRDEV_H__ # define __VIR_CHRDEV_H__ @@ -32,4 +33,5 @@ void virChrdevFree(virChrdevsPtr devs); int virChrdevOpen(virChrdevsPtr devs, virDomainChrSourceDefPtr source, virStreamPtr st, bool force); -#endif /*__VIR_CHRDEV_H__*/ + +#endif /* __VIR_CHRDEV_H__ */ diff --git a/src/conf/virnwfilterbindingdef.h b/src/conf/virnwfilterbindingdef.h index af7fab6064..8a78278bee 100644 --- a/src/conf/virnwfilterbindingdef.h +++ b/src/conf/virnwfilterbindingdef.h @@ -18,6 +18,7 @@ * <http://www.gnu.org/licenses/>. * */ + #ifndef VIR_NWFILTER_BINDING_DEF_H # define VIR_NWFILTER_BINDING_DEF_H diff --git a/src/conf/virnwfilterbindingobj.h b/src/conf/virnwfilterbindingobj.h index 21ae85b064..2455a44dd8 100644 --- a/src/conf/virnwfilterbindingobj.h +++ b/src/conf/virnwfilterbindingobj.h @@ -18,6 +18,7 @@ * <http://www.gnu.org/licenses/>. * */ + #ifndef VIR_NWFILTER_BINDING_OBJ_H # define VIR_NWFILTER_BINDING_OBJ_H diff --git a/src/conf/virnwfilterobj.h b/src/conf/virnwfilterobj.h index 4a54dd50da..b047a7c88d 100644 --- a/src/conf/virnwfilterobj.h +++ b/src/conf/virnwfilterobj.h @@ -16,6 +16,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ + #ifndef VIRNWFILTEROBJ_H # define VIRNWFILTEROBJ_H diff --git a/src/conf/virsavecookie.h b/src/conf/virsavecookie.h index 4aed18466c..c225c8d0bc 100644 --- a/src/conf/virsavecookie.h +++ b/src/conf/virsavecookie.h @@ -17,6 +17,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ + #ifndef __VIR_SAVE_COOKIE_H__ # define __VIR_SAVE_COOKIE_H__ @@ -59,4 +60,4 @@ char * virSaveCookieFormat(virObjectPtr obj, virSaveCookieCallbacksPtr saveCookie); -#endif /*__VIR_SAVE_COOKIE_H__ */ +#endif /* __VIR_SAVE_COOKIE_H__ */ diff --git a/src/datatypes.h b/src/datatypes.h index e1b38706dc..08f1e033bb 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -777,4 +777,4 @@ int virAdmConnectCloseCallbackDataRegister(virAdmConnectCloseCallbackDataPtr cbd int virAdmConnectCloseCallbackDataUnregister(virAdmConnectCloseCallbackDataPtr cbdata, virAdmConnectCloseFunc cb); -#endif /* __VIR_DATATYPES_H__ */ +#endif /* __VIR_DATATYPES_H_ */ diff --git a/src/interface/interface_driver.h b/src/interface/interface_driver.h index 59d8564801..575f297953 100644 --- a/src/interface/interface_driver.h +++ b/src/interface/interface_driver.h @@ -18,7 +18,6 @@ * <http://www.gnu.org/licenses/>. */ - #ifndef __VIR_INTERFACE__DRIVER_H # define __VIR_INTERFACE__DRIVER_H diff --git a/src/internal.h b/src/internal.h index d30d5da499..fb2b56b662 100644 --- a/src/internal.h +++ b/src/internal.h @@ -513,4 +513,4 @@ enum { # define ENODATA EIO # endif -#endif /* __VIR_INTERNAL_H__ */ +#endif /* __VIR_INTERNAL_H__ */ diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index 0e008a6551..5d60f2654d 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -298,4 +298,4 @@ int virStreamInData(virStreamPtr stream, int *data, long long *length); -#endif +#endif /* __LIBVIRT_H_ */ diff --git a/src/libxl/libxl_migration.h b/src/libxl/libxl_migration.h index db5cdfcd03..954968deef 100644 --- a/src/libxl/libxl_migration.h +++ b/src/libxl/libxl_migration.h @@ -98,4 +98,4 @@ libxlDomainMigrationSrcConfirm(libxlDriverPrivatePtr driver, unsigned int flags, int cancelled); -#endif /* LIBXL_DRIVER_H */ +#endif /* LIBXL_MIGRATION_H */ diff --git a/src/locking/lock_daemon_config.h b/src/locking/lock_daemon_config.h index 9b2a8c2ebb..cda71311f5 100644 --- a/src/locking/lock_daemon_config.h +++ b/src/locking/lock_daemon_config.h @@ -43,4 +43,4 @@ int virLockDaemonConfigLoadFile(virLockDaemonConfigPtr data, const char *filename, bool allow_missing); -#endif /* __LIBVIRTD_CONFIG_H__ */ +#endif /* __VIR_LOCK_DAEMON_CONFIG_H__ */ diff --git a/src/logging/log_daemon_config.h b/src/logging/log_daemon_config.h index 35914fc4ef..12610ba7ac 100644 --- a/src/logging/log_daemon_config.h +++ b/src/logging/log_daemon_config.h @@ -46,4 +46,4 @@ int virLogDaemonConfigLoadFile(virLogDaemonConfigPtr data, const char *filename, bool allow_missing); -#endif /* __LIBVIRTD_CONFIG_H__ */ +#endif /* __VIR_LOG_DAEMON_CONFIG_H__ */ diff --git a/src/logging/log_handler.h b/src/logging/log_handler.h index 16bcd0df65..670504bec4 100644 --- a/src/logging/log_handler.h +++ b/src/logging/log_handler.h @@ -77,4 +77,4 @@ int virLogHandlerDomainAppendLogFile(virLogHandlerPtr handler, virJSONValuePtr virLogHandlerPreExecRestart(virLogHandlerPtr handler); -#endif /** __VIR_LOG_HANDLER_H__ */ +#endif /* __VIR_LOG_HANDLER_H__ */ diff --git a/src/logging/log_manager.h b/src/logging/log_manager.h index 0f3d55a5f0..a16f3b1989 100644 --- a/src/logging/log_manager.h +++ b/src/logging/log_manager.h @@ -18,7 +18,6 @@ * <http://www.gnu.org/licenses/>. */ - #ifndef __VIR_LOG_MANAGER_H__ # define __VIR_LOG_MANAGER_H__ diff --git a/src/lxc/lxc_domain.h b/src/lxc/lxc_domain.h index b248cdfd6f..77ec523a63 100644 --- a/src/lxc/lxc_domain.h +++ b/src/lxc/lxc_domain.h @@ -19,7 +19,6 @@ * <http://www.gnu.org/licenses/>. */ - #ifndef __LXC_DOMAIN_H__ # define __LXC_DOMAIN_H__ diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h index dff37930d3..5d621521cb 100644 --- a/src/network/bridge_driver.h +++ b/src/network/bridge_driver.h @@ -19,7 +19,6 @@ * <http://www.gnu.org/licenses/>. */ - #ifndef __VIR_NETWORK__DRIVER_H # define __VIR_NETWORK__DRIVER_H diff --git a/src/node_device/node_device_udev.h b/src/node_device/node_device_udev.h index af877160cd..79e7278cc6 100644 --- a/src/node_device/node_device_udev.h +++ b/src/node_device/node_device_udev.h @@ -18,8 +18,13 @@ * <http://www.gnu.org/licenses/>. */ -#include <libudev.h> +#ifndef __NODE_DEVICE_UDEV_H__ +# define __NODE_DEVICE_UDEV_H__ -#define SYSFS_DATA_SIZE 4096 -#define DMI_DEVPATH "/sys/devices/virtual/dmi/id" -#define DMI_DEVPATH_FALLBACK "/sys/class/dmi/id" +# include <libudev.h> + +# define SYSFS_DATA_SIZE 4096 +# define DMI_DEVPATH "/sys/devices/virtual/dmi/id" +# define DMI_DEVPATH_FALLBACK "/sys/class/dmi/id" + +#endif /* __NODE_DEVICE_UDEV_H__ */ diff --git a/src/nwfilter/nwfilter_ebiptables_driver.h b/src/nwfilter/nwfilter_ebiptables_driver.h index 2b6b74277f..a8e696aa37 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.h +++ b/src/nwfilter/nwfilter_ebiptables_driver.h @@ -18,6 +18,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ + #ifndef VIR_NWFILTER_EBTABLES_DRIVER_H__ # define VIR_NWFILTER_EBTABLES_DRIVER_H__ @@ -31,4 +32,4 @@ extern virNWFilterTechDriver ebiptables_driver; # define IPTABLES_MAX_COMMENT_LENGTH 256 -#endif +#endif /* VIR_NWFILTER_EBTABLES_DRIVER_H__ */ diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h index 57ce5d05ec..71a8cad938 100644 --- a/src/nwfilter/nwfilter_gentech_driver.h +++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -19,6 +19,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ + #ifndef __NWFILTER_GENTECH_DRIVER_H # define __NWFILTER_GENTECH_DRIVER_H @@ -55,4 +56,4 @@ virHashTablePtr virNWFilterCreateVarHashmap(const char *macaddr, int virNWFilterBuildAll(virNWFilterDriverStatePtr driver, bool newFilters); -#endif +#endif /* __NWFILTER_GENTECH_DRIVER_H */ diff --git a/src/openvz/openvz_driver.h b/src/openvz/openvz_driver.h index d78a877c51..68d2c1f03c 100644 --- a/src/openvz/openvz_driver.h +++ b/src/openvz/openvz_driver.h @@ -20,7 +20,6 @@ * <http://www.gnu.org/licenses/>. */ - #ifndef OPENVZ_DRIVER_H # define OPENVZ_DRIVER_H @@ -38,4 +37,4 @@ int openvzRegister(void); -#endif +#endif /* OPENVZ_DRIVER_H */ diff --git a/src/openvz/openvz_util.h b/src/openvz/openvz_util.h index 0c8d55ae29..98d13ae336 100644 --- a/src/openvz/openvz_util.h +++ b/src/openvz/openvz_util.h @@ -19,11 +19,10 @@ * */ - #ifndef OPENVZ_UTIL_H # define OPENVZ_UTIL_H long openvzKBPerPages(void); char *openvzVEGetStringParam(virDomainPtr dom, const char *param); -#endif +#endif /* OPENVZ_UTIL_H */ diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index 219cb9e1dd..698b2e0639 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -19,7 +19,6 @@ * <http://www.gnu.org/licenses/>. */ - #ifndef __QEMU_AGENT_H__ # define __QEMU_AGENT_H__ diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h index 441cb16bc1..4afa6f1256 100644 --- a/src/qemu/qemu_alias.h +++ b/src/qemu/qemu_alias.h @@ -97,4 +97,4 @@ const char *qemuDomainGetManagedPRAlias(void); char *qemuDomainGetUnmanagedPRAlias(const char *parentalias); -#endif /* __QEMU_ALIAS_H__*/ +#endif /* __QEMU_ALIAS_H__ */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 2a3057e249..e19b9d070f 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -636,4 +636,4 @@ bool virQEMUCapsCPUFilterFeatures(const char *name, virSEVCapabilityPtr virQEMUCapsGetSEVCapabilities(virQEMUCapsPtr qemuCaps); -#endif /* __QEMU_CAPABILITIES_H__*/ +#endif /* __QEMU_CAPABILITIES_H__ */ diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index 3262a63eae..b4183b5e66 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -21,7 +21,7 @@ #ifndef __QEMU_CAPSPRIV_H_ALLOW__ # error "qemu_capspriv.h may only be included by qemu_capabilities.c or test suites" -#endif +#endif /* __QEMU_CAPSPRIV_H_ALLOW__ */ #ifndef __QEMU_CAPSPRIV_H__ # define __QEMU_CAPSPRIV_H__ @@ -98,4 +98,5 @@ virQEMUCapsSetMicrocodeVersion(virQEMUCapsPtr qemuCaps, void virQEMUCapsStripMachineAliases(virQEMUCapsPtr qemuCaps); -#endif + +#endif /* __QEMU_CAPSPRIV_H__ */ diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 2ee0633d6c..c5bca612c1 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -227,4 +227,4 @@ qemuBuildTPMOpenBackendFDs(const char *tpmdev, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); -#endif /* __QEMU_COMMAND_H__*/ +#endif /* __QEMU_COMMAND_H__ */ diff --git a/src/qemu/qemu_domain_address.h b/src/qemu/qemu_domain_address.h index 62d92777bc..0f360fcc49 100644 --- a/src/qemu/qemu_domain_address.h +++ b/src/qemu/qemu_domain_address.h @@ -20,6 +20,7 @@ */ #ifndef __QEMU_DOMAIN_ADDRESS_H__ +# define __QEMU_DOMAIN_ADDRESS_H__ # include "domain_addr.h" # include "domain_conf.h" @@ -65,6 +66,4 @@ int qemuDomainEnsureVirtioAddress(bool *releaseAddr, virDomainDeviceDefPtr dev, const char *devicename); -# define __QEMU_DOMAIN_ADDRESS_H__ - #endif /* __QEMU_DOMAIN_ADDRESS_H__ */ diff --git a/src/qemu/qemu_extdevice.h b/src/qemu/qemu_extdevice.h index f5d6945636..ad48dbba67 100644 --- a/src/qemu/qemu_extdevice.h +++ b/src/qemu/qemu_extdevice.h @@ -17,6 +17,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ + #ifndef __QEMU_EXTDEVICE_H__ # define __QEMU_EXTDEVICE_H__ diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 72b09f92ca..aede7b2c7d 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -23,6 +23,7 @@ #include <config.h> #include "qemu_hotplug.h" +#define __QEMU_HOTPLUGPRIV_H_ALLOW__ #include "qemu_hotplugpriv.h" #include "qemu_alias.h" #include "qemu_capabilities.h" diff --git a/src/qemu/qemu_hotplugpriv.h b/src/qemu/qemu_hotplugpriv.h index c1653ee0d4..2239013701 100644 --- a/src/qemu/qemu_hotplugpriv.h +++ b/src/qemu/qemu_hotplugpriv.h @@ -19,6 +19,10 @@ * */ +#ifndef __QEMU_HOTPLUGPRIV_H_ALLOW__ +# error "qemu_hotplugpriv.h may only be included by qemu_hotplug.c or test suites" +#endif /* __QEMU_HOTPLUGPRIV_H_ALLOW__ */ + #ifndef __QEMU_HOTPLUGPRIV_H__ # define __QEMU_HOTPLUGPRIV_H__ diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c index 9ecd2ab39d..f34c3f6c06 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -30,6 +30,7 @@ #include "qemu_hotplug.h" #include "qemu_migration.h" #include "qemu_migration_params.h" +#define __QEMU_MIGRATION_PARAMSPRIV_H_ALLOW__ #include "qemu_migration_paramspriv.h" #include "qemu_monitor.h" diff --git a/src/qemu/qemu_migration_paramspriv.h b/src/qemu/qemu_migration_paramspriv.h index 30773a679d..52f1591251 100644 --- a/src/qemu/qemu_migration_paramspriv.h +++ b/src/qemu/qemu_migration_paramspriv.h @@ -19,6 +19,10 @@ * */ +#ifndef __QEMU_MIGRATION_PARAMSPRIV_H_ALLOW__ +# error "qemu_migration_paramspriv.h may only be included by qemu_migration_params.c or test suites" +#endif /* __QEMU_MIGRATION_PARAMSPRIV_H_ALLOW__ */ + #ifndef __QEMU_MIGRATION_PARAMSPRIV_H__ # define __QEMU_MIGRATION_PARAMSPRIV_H__ diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 5d30973a37..95a21fde05 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -19,7 +19,6 @@ * <http://www.gnu.org/licenses/>. */ - #ifndef QEMU_MONITOR_H # define QEMU_MONITOR_H diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index a82814dde6..331419890b 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -19,7 +19,6 @@ * <http://www.gnu.org/licenses/>. */ - #ifndef QEMU_MONITOR_JSON_H # define QEMU_MONITOR_JSON_H diff --git a/src/qemu/qemu_monitor_priv.h b/src/qemu/qemu_monitor_priv.h index 45bda27c0f..6db3e3769f 100644 --- a/src/qemu/qemu_monitor_priv.h +++ b/src/qemu/qemu_monitor_priv.h @@ -18,7 +18,7 @@ #ifndef __QEMU_MONITOR_PRIV_H_ALLOW__ # error "qemu_monitor_priv.h may only be included by qemu_monitor.c or test suites" -#endif +#endif /* __QEMU_MONITOR_PRIV_H_ALLOW__ */ #ifndef __QEMU_MONITOR_PRIV_H__ # define __QEMU_MONITOR_PRIV_H__ @@ -28,4 +28,4 @@ void qemuMonitorResetCommandID(qemuMonitorPtr mon); -#endif +#endif /* __QEMU_MONITOR_PRIV_H__ */ diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h index 8b9a9caeb3..8ebdef67b6 100644 --- a/src/qemu/qemu_monitor_text.h +++ b/src/qemu/qemu_monitor_text.h @@ -19,7 +19,6 @@ * <http://www.gnu.org/licenses/>. */ - #ifndef QEMU_MONITOR_TEXT_H # define QEMU_MONITOR_TEXT_H diff --git a/src/qemu/qemu_parse_command.h b/src/qemu/qemu_parse_command.h index ffada71f58..901b5b438f 100644 --- a/src/qemu/qemu_parse_command.h +++ b/src/qemu/qemu_parse_command.h @@ -57,4 +57,4 @@ qemuParseKeywords(const char *str, int *retnkeywords, int allowEmptyValue); -#endif /* __QEMU_PARSE_COMMAND_H__*/ +#endif /* __QEMU_PARSE_COMMAND_H__ */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 2f8e19d29d..6809522d36 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -35,6 +35,7 @@ #include <sys/utsname.h> #include "qemu_process.h" +#define __QEMU_PROCESS_PRIV_H_ALLOW__ #include "qemu_processpriv.h" #include "qemu_alias.h" #include "qemu_block.h" diff --git a/src/qemu/qemu_processpriv.h b/src/qemu/qemu_processpriv.h index 782fcd5261..a7582558a9 100644 --- a/src/qemu/qemu_processpriv.h +++ b/src/qemu/qemu_processpriv.h @@ -19,6 +19,10 @@ * */ +#ifndef __QEMU_PROCESS_PRIV_H_ALLOW__ +# error "qemu_process_priv.h may only be included by qemu_process.c or test suites" +#endif /* __QEMU_PROCESS_PRIV_H_ALLOW__ */ + #ifndef __QEMU_PROCESSPRIV_H__ # define __QEMU_PROCESSPRIV_H__ diff --git a/src/qemu/qemu_tpm.h b/src/qemu/qemu_tpm.h index 93a45b9691..acae9520aa 100644 --- a/src/qemu/qemu_tpm.h +++ b/src/qemu/qemu_tpm.h @@ -17,6 +17,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ + #ifndef __QEMU_TPM_H__ # define __QEMU_TPM_H__ diff --git a/src/remote/remote_daemon.h b/src/remote/remote_daemon.h index 365a31c372..2184f9bda3 100644 --- a/src/remote/remote_daemon.h +++ b/src/remote/remote_daemon.h @@ -19,7 +19,6 @@ * <http://www.gnu.org/licenses/>. */ - #ifndef __REMOTE_DAEMON_H__ # define __REMOTE_DAEMON_H__ diff --git a/src/remote/remote_daemon_stream.h b/src/remote/remote_daemon_stream.h index 2c1eeddb18..55a483665c 100644 --- a/src/remote/remote_daemon_stream.h +++ b/src/remote/remote_daemon_stream.h @@ -18,7 +18,6 @@ * <http://www.gnu.org/licenses/>. */ - #ifndef __REMOTE_DAEMON_STREAM_H__ # define __REMOTE_DAEMON_STREAM_H__ diff --git a/src/rpc/virnetlibsshsession.h b/src/rpc/virnetlibsshsession.h index 4dcf398f53..b8844dc3ad 100644 --- a/src/rpc/virnetlibsshsession.h +++ b/src/rpc/virnetlibsshsession.h @@ -17,6 +17,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ + #ifndef __VIR_NET_LIBSSH_SESSION_H__ # define __VIR_NET_LIBSSH_SESSION_H__ @@ -72,4 +73,4 @@ ssize_t virNetLibsshChannelWrite(virNetLibsshSessionPtr sess, bool virNetLibsshSessionHasCachedData(virNetLibsshSessionPtr sess); -#endif /* ___VIR_NET_LIBSSH_SESSION_H_ */ +#endif /* __VIR_NET_LIBSSH_SESSION_H__ */ diff --git a/src/rpc/virnetserverservice.h b/src/rpc/virnetserverservice.h index 4a76704fb6..32371d979e 100644 --- a/src/rpc/virnetserverservice.h +++ b/src/rpc/virnetserverservice.h @@ -88,4 +88,4 @@ void virNetServerServiceToggle(virNetServerServicePtr svc, void virNetServerServiceClose(virNetServerServicePtr svc); -#endif +#endif /* __VIR_NET_SERVER_SERVICE_H__ */ diff --git a/src/rpc/virnetsshsession.h b/src/rpc/virnetsshsession.h index fa70ede414..faecb75064 100644 --- a/src/rpc/virnetsshsession.h +++ b/src/rpc/virnetsshsession.h @@ -17,6 +17,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ + #ifndef __VIR_NET_SSH_SESSION_H__ # define __VIR_NET_SSH_SESSION_H__ @@ -84,4 +85,4 @@ ssize_t virNetSSHChannelWrite(virNetSSHSessionPtr sess, bool virNetSSHSessionHasCachedData(virNetSSHSessionPtr sess); -#endif /* ___VIR_NET_SSH_SESSION_H_ */ +#endif /* __VIR_NET_SSH_SESSION_H__ */ diff --git a/src/rpc/virnettlscontext.h b/src/rpc/virnettlscontext.h index 6100b45c39..c20ea9a722 100644 --- a/src/rpc/virnettlscontext.h +++ b/src/rpc/virnettlscontext.h @@ -100,4 +100,4 @@ int virNetTLSSessionGetKeySize(virNetTLSSessionPtr sess); const char *virNetTLSSessionGetX509DName(virNetTLSSessionPtr sess); -#endif +#endif /* __VIR_NET_TLS_CONTEXT_H__ */ diff --git a/src/security/security_apparmor.h b/src/security/security_apparmor.h index f15238ab86..a3661a82ec 100644 --- a/src/security/security_apparmor.h +++ b/src/security/security_apparmor.h @@ -15,6 +15,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ + #ifndef __VIR_SECURITY_APPARMOR_H__ # define __VIR_SECURITY_APPARMOR_H__ diff --git a/src/security/security_dac.h b/src/security/security_dac.h index 97681c9610..adc5494328 100644 --- a/src/security/security_dac.h +++ b/src/security/security_dac.h @@ -18,11 +18,11 @@ * POSIX DAC security driver */ -#include "security_driver.h" - #ifndef __VIR_SECURITY_DAC # define __VIR_SECURITY_DAC +# include "security_driver.h" + extern virSecurityDriver virSecurityDriverDAC; int virSecurityDACSetUserAndGroup(virSecurityManagerPtr mgr, diff --git a/src/security/security_driver.h b/src/security/security_driver.h index 0de8826f31..1969f7f089 100644 --- a/src/security/security_driver.h +++ b/src/security/security_driver.h @@ -15,6 +15,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ + #ifndef __VIR_SECURITY_H__ # define __VIR_SECURITY_H__ diff --git a/src/security/security_selinux.h b/src/security/security_selinux.h index 5d02d79b47..3d46289849 100644 --- a/src/security/security_selinux.h +++ b/src/security/security_selinux.h @@ -15,6 +15,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ + #ifndef __VIR_SECURITY_SELINUX_H__ # define __VIR_SECURITY_SELINUX_H__ diff --git a/src/security/security_stack.h b/src/security/security_stack.h index b38f9a9481..633182fdd8 100644 --- a/src/security/security_stack.h +++ b/src/security/security_stack.h @@ -18,11 +18,11 @@ * Stacked security driver */ -#include "security_driver.h" - #ifndef __VIR_SECURITY_STACK # define __VIR_SECURITY_STACK +# include "security_driver.h" + extern virSecurityDriver virSecurityDriverStack; diff --git a/src/storage/storage_backend_iscsi_direct.h b/src/storage/storage_backend_iscsi_direct.h index 545579daf7..eb56e857ec 100644 --- a/src/storage/storage_backend_iscsi_direct.h +++ b/src/storage/storage_backend_iscsi_direct.h @@ -1,3 +1,19 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + #ifndef __VIR_STORAGE_BACKEND_ISCSI_H__ # define __VIR_STORAGE_BACKEND_ISCSI_H__ diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index 484a587474..96d825cc1d 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -25,6 +25,7 @@ #include "virerror.h" #include "storage_backend_sheepdog.h" +#define __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_ALLOW_H__ #include "storage_backend_sheepdog_priv.h" #include "storage_conf.h" #include "vircommand.h" diff --git a/src/storage/storage_backend_sheepdog_priv.h b/src/storage/storage_backend_sheepdog_priv.h index e324ef6181..7dc2d7db3c 100644 --- a/src/storage/storage_backend_sheepdog_priv.h +++ b/src/storage/storage_backend_sheepdog_priv.h @@ -16,6 +16,10 @@ * <http://www.gnu.org/licenses/>. */ +#ifndef __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_ALLOW_H__ +# error "storage_backend_sheepdog_priv.h may only be included by storage_backend_sheepdog.c or test suites" +#endif /* __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_ALLOW_H__ */ + #ifndef __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_H__ # define __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_H__ diff --git a/src/uml/uml_driver.h b/src/uml/uml_driver.h index d31b3bda8f..8f877b49c5 100644 --- a/src/uml/uml_driver.h +++ b/src/uml/uml_driver.h @@ -19,7 +19,6 @@ * <http://www.gnu.org/licenses/>. */ - #ifndef UML_DRIVER_H # define UML_DRIVER_H diff --git a/src/util/viralloc.h b/src/util/viralloc.h index ed72caaa13..9e45ab5f11 100644 --- a/src/util/viralloc.h +++ b/src/util/viralloc.h @@ -20,7 +20,6 @@ * */ - #ifndef __VIR_MEMORY_H_ # define __VIR_MEMORY_H_ diff --git a/src/util/viratomic.h b/src/util/viratomic.h index febe401f77..f63436fb6b 100644 --- a/src/util/viratomic.h +++ b/src/util/viratomic.h @@ -451,4 +451,4 @@ virAtomicIntXor(volatile unsigned int *atomic, # endif -#endif /* __VIR_ATOMIC_H */ +#endif /* __VIR_ATOMIC_H__ */ diff --git a/src/util/viraudit.h b/src/util/viraudit.h index 478dc8408f..9e3fc89771 100644 --- a/src/util/viraudit.h +++ b/src/util/viraudit.h @@ -19,7 +19,6 @@ * */ - #ifndef __LIBVIRT_AUDIT_H__ # define __LIBVIRT_AUDIT_H__ diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h index de16b43f63..4318db6766 100644 --- a/src/util/virbitmap.h +++ b/src/util/virbitmap.h @@ -156,4 +156,4 @@ void virBitmapShrink(virBitmapPtr map, size_t b); VIR_DEFINE_AUTOPTR_FUNC(virBitmap, virBitmapFree) -#endif +#endif /* __BITMAP_H__ */ diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h index 3bede28bd2..f0e3d349c8 100644 --- a/src/util/vircgrouppriv.h +++ b/src/util/vircgrouppriv.h @@ -21,7 +21,7 @@ #ifndef __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__ # error "vircgrouppriv.h may only be included by vircgroup.c or its test suite" -#endif +#endif /* __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__ */ #ifndef __VIR_CGROUP_PRIV_H__ # define __VIR_CGROUP_PRIV_H__ diff --git a/src/util/vircommandpriv.h b/src/util/vircommandpriv.h index 8930299d45..a21643555a 100644 --- a/src/util/vircommandpriv.h +++ b/src/util/vircommandpriv.h @@ -21,7 +21,7 @@ #ifndef __VIR_COMMAND_PRIV_H_ALLOW__ # error "vircommandpriv.h may only be included by vircommand.c or test suites" -#endif +#endif /* __VIR_COMMAND_PRIV_H_ALLOW__ */ #ifndef __VIR_COMMAND_PRIV_H__ # define __VIR_COMMAND_PRIV_H__ diff --git a/src/util/virdbus.c b/src/util/virdbus.c index cb5371faef..1c84b9c8bd 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -21,6 +21,7 @@ #include <config.h> +#define __VIR_DBUS_PRIV_H_ALLOW__ #include "virdbuspriv.h" #include "viralloc.h" #include "virerror.h" diff --git a/src/util/virdbuspriv.h b/src/util/virdbuspriv.h index 74b395f70d..5f97a49676 100644 --- a/src/util/virdbuspriv.h +++ b/src/util/virdbuspriv.h @@ -19,6 +19,10 @@ * */ +#ifndef __VIR_DBUS_PRIV_H_ALLOW__ +# error "virdbuspriv.h may only be included by virdbus.c or test suites" +#endif /* __VIR_DBUS_PRIV_H_ALLOW__ */ + #ifndef __VIR_DBUS_PRIV_H__ # define __VIR_DBUS_PRIV_H__ diff --git a/src/util/virebtables.h b/src/util/virebtables.h index baca746f89..b8cb584963 100644 --- a/src/util/virebtables.h +++ b/src/util/virebtables.h @@ -38,4 +38,4 @@ int ebtablesRemoveForwardAllowIn (ebtablesContext *ctx, int ebtablesAddForwardPolicyReject(ebtablesContext *ctx); -#endif /* __QEMUD_ebtabLES_H__ */ +#endif /* __QEMUD_EBTABLES_H__ */ diff --git a/src/util/virerror.h b/src/util/virerror.h index 31577c5c8c..ff5bde9b10 100644 --- a/src/util/virerror.h +++ b/src/util/virerror.h @@ -208,4 +208,4 @@ void virErrorRestore(virErrorPtr *savederr); VIR_DEFINE_AUTOPTR_FUNC(virError, virFreeError) -#endif +#endif /* __VIRT_ERROR_H_ */ diff --git a/src/util/vireventpoll.h b/src/util/vireventpoll.h index 720e72db8d..199a658c2e 100644 --- a/src/util/vireventpoll.h +++ b/src/util/vireventpoll.h @@ -127,4 +127,4 @@ int virEventPollToNativeEvents(int events); int virEventPollInterrupt(void); -#endif /* __VIRTD_EVENT_H__ */ +#endif /* __VIR_EVENT_POLL_H__ */ diff --git a/src/util/virfcp.h b/src/util/virfcp.h index 3ca1eb1778..fab6e9403b 100644 --- a/src/util/virfcp.h +++ b/src/util/virfcp.h @@ -29,4 +29,4 @@ virFCReadRportValue(const char *rport, const char *entry, char **result); -#endif +#endif /* __VIR_FCP_H__ */ diff --git a/src/util/virfdstream.h b/src/util/virfdstream.h index 887c991d69..905975ff1e 100644 --- a/src/util/virfdstream.h +++ b/src/util/virfdstream.h @@ -19,7 +19,6 @@ * */ - #ifndef __VIR_FDSTREAM_H_ # define __VIR_FDSTREAM_H_ diff --git a/src/util/virfile.h b/src/util/virfile.h index 0f7dece958..795c339356 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -22,7 +22,6 @@ * */ - #ifndef __VIR_FILE_H_ # define __VIR_FILE_H_ @@ -383,4 +382,4 @@ int virFileInData(int fd, VIR_DEFINE_AUTOPTR_FUNC(virFileWrapperFd, virFileWrapperFdFree) -#endif /* __VIR_FILE_H */ +#endif /* __VIR_FILE_H_ */ diff --git a/src/util/virfirewallpriv.h b/src/util/virfirewallpriv.h index ab90bf3713..1dca0c5e9a 100644 --- a/src/util/virfirewallpriv.h +++ b/src/util/virfirewallpriv.h @@ -20,7 +20,7 @@ #ifndef __VIR_FIREWALL_PRIV_H_ALLOW__ # error "virfirewallpriv.h may only be included by virfirewall.c or test suites" -#endif +#endif /* __VIR_FIREWALL_PRIV_H_ALLOW__ */ #ifndef __VIR_FIREWALL_PRIV_H__ # define __VIR_FIREWALL_PRIV_H__ diff --git a/src/util/virgettext.h b/src/util/virgettext.h index 4584d8391c..5e9cfd2719 100644 --- a/src/util/virgettext.h +++ b/src/util/virgettext.h @@ -17,6 +17,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ + #ifndef __VIR_GETTEXT_H__ # define __VIR_GETTEXT_H__ diff --git a/src/util/virhash.h b/src/util/virhash.h index a201b8910d..811b6c5b21 100644 --- a/src/util/virhash.h +++ b/src/util/virhash.h @@ -199,4 +199,4 @@ void virHashValueFree(void *value, const void *name); VIR_DEFINE_AUTOPTR_FUNC(virHashTable, virHashFree) -#endif /* ! __VIR_HASH_H__ */ +#endif /* __VIR_HASH_H__ */ diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 7200bab16f..9e80c192ac 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -40,6 +40,7 @@ #include "c-ctype.h" #include "viralloc.h" +#define __VIR_HOSTCPU_PRIV_H_ALLOW__ #include "virhostcpupriv.h" #include "physmem.h" #include "virerror.h" diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h index 1d84dd72e5..9107bb32ff 100644 --- a/src/util/virhostcpu.h +++ b/src/util/virhostcpu.h @@ -66,4 +66,4 @@ int virHostCPUGetOnline(unsigned int cpu, bool *online); unsigned int virHostCPUGetMicrocodeVersion(void); -#endif /* __VIR_HOSTCPU_H__*/ +#endif /* __VIR_HOSTCPU_H__ */ diff --git a/src/util/virhostcpupriv.h b/src/util/virhostcpupriv.h index 5e7ae3b88a..52ab4a9fe0 100644 --- a/src/util/virhostcpupriv.h +++ b/src/util/virhostcpupriv.h @@ -19,6 +19,10 @@ * */ +#ifndef __VIR_HOSTCPU_PRIV_H_ALLOW__ +# error "virhostcpupriv.h may only be included by virhostcpu.c or test suites" +#endif /* __VIR_HOSTCPU_PRIV_H_ALLOW__ */ + #ifndef __VIR_HOSTCPU_PRIV_H__ # define __VIR_HOSTCPU_PRIV_H__ diff --git a/src/util/virhostmem.h b/src/util/virhostmem.h index 0b713235b2..c5a3853fdf 100644 --- a/src/util/virhostmem.h +++ b/src/util/virhostmem.h @@ -55,4 +55,4 @@ int virHostMemAllocPages(unsigned int npages, unsigned int cellCount, bool add); -#endif /* __VIR_HOSTMEM_H__*/ +#endif /* __VIR_HOSTMEM_H__ */ diff --git a/src/util/virinitctl.h b/src/util/virinitctl.h index b19742bf1e..83170753da 100644 --- a/src/util/virinitctl.h +++ b/src/util/virinitctl.h @@ -35,4 +35,4 @@ typedef enum { int virInitctlSetRunLevel(virInitctlRunLevel level); -#endif +#endif /* __VIR_INITCTL_H__ */ diff --git a/src/util/viriscsi.h b/src/util/viriscsi.h index 4da9becfb2..3fbf906637 100644 --- a/src/util/viriscsi.h +++ b/src/util/viriscsi.h @@ -68,4 +68,5 @@ virISCSINodeUpdate(const char *portal, const char *value) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; -#endif + +#endif /* __VIR_ISCSI_H__ */ diff --git a/src/util/virjson.h b/src/util/virjson.h index 75f7f17b44..804cc0ce95 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -20,7 +20,6 @@ * */ - #ifndef __VIR_JSON_H_ # define __VIR_JSON_H_ diff --git a/src/util/virkeycode.h b/src/util/virkeycode.h index 6947cfe913..106dae7a08 100644 --- a/src/util/virkeycode.h +++ b/src/util/virkeycode.h @@ -30,4 +30,4 @@ int virKeycodeValueTranslate(virKeycodeSet from_codeset, virKeycodeSet to_offset, int key_value); -#endif +#endif /* __VIR_UTIL_VIRTKEYCODE_H__ */ diff --git a/src/util/virlease.h b/src/util/virlease.h index b9f394e9aa..9f151aed74 100644 --- a/src/util/virlease.h +++ b/src/util/virlease.h @@ -41,4 +41,5 @@ int virLeaseNew(virJSONValuePtr *lease_ret, const char *hostname, const char *iaid, const char *server_duid); -#endif /* __VIR_LEASE_H */ + +#endif /* __VIR_LEASE_H_ */ diff --git a/src/util/virlog.h b/src/util/virlog.h index 35dba16cfe..1155d35663 100644 --- a/src/util/virlog.h +++ b/src/util/virlog.h @@ -239,4 +239,4 @@ int virLogParseOutputs(const char *src, int virLogParseFilters(const char *src, virLogFilterPtr **filters) ATTRIBUTE_NONNULL(1); -#endif +#endif /* __VIRTLOG_H_ */ diff --git a/src/util/virmacmap.h b/src/util/virmacmap.h index dab7a9f4cb..e34f98f661 100644 --- a/src/util/virmacmap.h +++ b/src/util/virmacmap.h @@ -46,4 +46,5 @@ int virMacMapWriteFile(virMacMapPtr mgr, int virMacMapDumpStr(virMacMapPtr mgr, char **str); -#endif /* __VIR_MACMAPPING_H__ */ + +#endif /* __VIR_MACMAP_H__ */ diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h index ca2793ae34..73e1ab40ad 100644 --- a/src/util/virnetdevvlan.h +++ b/src/util/virnetdevvlan.h @@ -15,6 +15,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ + #ifndef __VIR_NETDEV_VLAN_H__ # define __VIR_NETDEV_VLAN_H__ diff --git a/src/util/virnodesuspend.h b/src/util/virnodesuspend.h index 85941bf1ab..64558ab0a5 100644 --- a/src/util/virnodesuspend.h +++ b/src/util/virnodesuspend.h @@ -19,7 +19,6 @@ * */ - #ifndef __VIR_NODE_SUSPEND_H__ # define __VIR_NODE_SUSPEND_H__ diff --git a/src/util/virobject.h b/src/util/virobject.h index 77ebad1e8b..6c48fb6249 100644 --- a/src/util/virobject.h +++ b/src/util/virobject.h @@ -152,4 +152,4 @@ void virObjectListFreeCount(void *list, size_t count); -#endif /* __VIR_OBJECT_H */ +#endif /* __VIR_OBJECT_H__ */ diff --git a/src/util/virqemu.h b/src/util/virqemu.h index 309be45761..4a4d7e42cf 100644 --- a/src/util/virqemu.h +++ b/src/util/virqemu.h @@ -20,7 +20,6 @@ * */ - #ifndef __VIR_QEMU_H_ # define __VIR_QEMU_H_ diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index bc6b614ee9..c823ebb657 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -23,6 +23,7 @@ #include <sys/stat.h> #include <fcntl.h> +#define __VIR_RESCTRL_PRIV_H_ALLOW__ #include "virresctrlpriv.h" #include "viralloc.h" #include "virfile.h" diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h index 8ea9758b94..04202b5f09 100644 --- a/src/util/virresctrl.h +++ b/src/util/virresctrl.h @@ -235,4 +235,4 @@ virResctrlMonitorGetCacheOccupancy(virResctrlMonitorPtr monitor, void virResctrlMonitorFreeStats(virResctrlMonitorStatsPtr *stats, size_t nstats); -#endif /* __VIR_RESCTRL_H__ */ +#endif /* __VIR_RESCTRL_H__ */ diff --git a/src/util/virresctrlpriv.h b/src/util/virresctrlpriv.h index 72b115afd1..f8743d81ea 100644 --- a/src/util/virresctrlpriv.h +++ b/src/util/virresctrlpriv.h @@ -16,6 +16,10 @@ * <http://www.gnu.org/licenses/>. */ +#ifndef __VIR_RESCTRL_PRIV_H_ALLOW__ +# error "virresctrlpriv.h may only be included by virresctrl.c or test suites" +#endif /* __VIR_RESCTRL_PRIV_H_ALLOW__ */ + #ifndef __VIR_RESCTRL_PRIV_H__ # define __VIR_RESCTRL_PRIV_H__ diff --git a/src/util/virsexpr.h b/src/util/virsexpr.h index 72a49e4a41..7b8358cd72 100644 --- a/src/util/virsexpr.h +++ b/src/util/virsexpr.h @@ -66,4 +66,4 @@ int sexpr_int(const struct sexpr *sexpr, const char *name); double sexpr_float(const struct sexpr *sexpr, const char *name); uint64_t sexpr_u64(const struct sexpr *sexpr, const char *name); -#endif +#endif /* _LIBVIR_SEXPR_H_ */ diff --git a/src/util/virsysinfopriv.h b/src/util/virsysinfopriv.h index a50b280f64..607a9354fb 100644 --- a/src/util/virsysinfopriv.h +++ b/src/util/virsysinfopriv.h @@ -19,7 +19,7 @@ #ifndef __VIR_SYSINFO_PRIV_H_ALLOW__ # error "virsysinfopriv.h may only be included by virsysinfo.c or test suites" -#endif +#endif /* __VIR_SYSINFO_PRIV_H_ALLOW__ */ #ifndef __VIR_SYSINFO_PRIV_H__ # define __VIR_SYSINFO_PRIV_H__ diff --git a/src/util/virsystemdpriv.h b/src/util/virsystemdpriv.h index 4f4058b35f..c5423cf426 100644 --- a/src/util/virsystemdpriv.h +++ b/src/util/virsystemdpriv.h @@ -21,7 +21,7 @@ #ifndef __VIR_SYSTEMD_PRIV_H_ALLOW__ # error "virsystemdpriv.h may only be included by virsystemd.c or test suites" -#endif +#endif /* __VIR_SYSTEMD_PRIV_H_ALLOW__ */ #ifndef __VIR_SYSTEMD_PRIV_H__ # define __VIR_SYSTEMD_PRIV_H__ diff --git a/src/util/virthread.h b/src/util/virthread.h index e468ba941c..e4348e87a9 100644 --- a/src/util/virthread.h +++ b/src/util/virthread.h @@ -213,4 +213,4 @@ int virThreadLocalSet(virThreadLocalPtr l, void*) ATTRIBUTE_RETURN_CHECK; return 0; \ } -#endif +#endif /* __THREADS_H_ */ diff --git a/src/util/virthreadjob.h b/src/util/virthreadjob.h index 0c62ee6723..343b8b041a 100644 --- a/src/util/virthreadjob.h +++ b/src/util/virthreadjob.h @@ -28,4 +28,4 @@ void virThreadJobSetWorker(const char *caller); void virThreadJobSet(const char *caller); void virThreadJobClear(int rv); -#endif +#endif /* __VIR_THREAD_JOB_H__ */ diff --git a/src/util/virthreadpool.h b/src/util/virthreadpool.h index 26fb4b739c..12f12e4fc3 100644 --- a/src/util/virthreadpool.h +++ b/src/util/virthreadpool.h @@ -60,4 +60,4 @@ int virThreadPoolSetParameters(virThreadPoolPtr pool, long long int maxWorkers, long long int prioWorkers); -#endif +#endif /* __VIR_THREADPOOL_H__ */ diff --git a/src/util/virtime.h b/src/util/virtime.h index dec7238912..340ea5d588 100644 --- a/src/util/virtime.h +++ b/src/util/virtime.h @@ -73,4 +73,4 @@ int virTimeBackOffStart(virTimeBackOffVar *var, bool virTimeBackOffWait(virTimeBackOffVar *var); -#endif +#endif /* __VIR_TIME_H__ */ diff --git a/src/util/virtpm.h b/src/util/virtpm.h index 2ceb4a6af6..a363f37ec0 100644 --- a/src/util/virtpm.h +++ b/src/util/virtpm.h @@ -17,6 +17,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ + #ifndef __VIR_TPM_H__ # define __VIR_TPM_H__ diff --git a/src/util/virtypedparam.h b/src/util/virtypedparam.h index 120286a5a1..6df63a1e5c 100644 --- a/src/util/virtypedparam.h +++ b/src/util/virtypedparam.h @@ -19,7 +19,6 @@ * */ - #ifndef __VIR_TYPED_PARAM_H_ # define __VIR_TYPED_PARAM_H_ @@ -135,4 +134,4 @@ VIR_ENUM_DECL(virTypedParameter) } \ } while (0) -#endif /* __VIR_TYPED_PARAM_H */ +#endif /* __VIR_TYPED_PARAM_H_ */ diff --git a/src/util/virvhba.h b/src/util/virvhba.h index 67b1fa5376..32792918ae 100644 --- a/src/util/virvhba.h +++ b/src/util/virvhba.h @@ -59,4 +59,4 @@ virVHBAGetHostByFabricWWN(const char *sysfs_prefix, const char *fabric_wwn) ATTRIBUTE_NONNULL(2); -#endif /* __VIR_VBHA_H__ */ +#endif /* __VIR_VHBA_H__ */ diff --git a/src/util/virxml.h b/src/util/virxml.h index 127560d9d1..43ce031082 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -221,4 +221,4 @@ virXMLFormatElement(virBufferPtr buf, virBufferPtr attrBuf, virBufferPtr childBuf); -#endif /* __VIR_XML_H__ */ +#endif /* __VIR_XML_H__ */ diff --git a/src/vbox/vbox_driver.h b/src/vbox/vbox_driver.h index bf7db2bf87..38aaaf6e39 100644 --- a/src/vbox/vbox_driver.h +++ b/src/vbox/vbox_driver.h @@ -1,7 +1,3 @@ -/** @file vbox_driver.h - * Core driver methods for managing VirtualBox VM's - */ - /* * Copyright (C) 2008-2009 Sun Microsystems, Inc. * @@ -43,4 +39,4 @@ int vboxStorageRegister(void); int vboxRegister(void); # endif -#endif +#endif /* VBOX_DRIVER_H */ diff --git a/src/vbox/vbox_snapshot_conf.h b/src/vbox/vbox_snapshot_conf.h index 3864b30847..7ba3ca03ea 100644 --- a/src/vbox/vbox_snapshot_conf.h +++ b/src/vbox/vbox_snapshot_conf.h @@ -138,4 +138,4 @@ virVBoxSnapshotConfSnapshotPtr virVBoxSnapshotConfSnapshotByName(virVBoxSnapshotConfSnapshotPtr snapshot, const char *snapshotName); -#endif /*VBOX_SNAPSHOT_CONF_H*/ +#endif /* VBOX_SNAPSHOT_CONF_H */ diff --git a/src/vmware/vmware_conf.h b/src/vmware/vmware_conf.h index b3f8cdf253..e7ba403848 100644 --- a/src/vmware/vmware_conf.h +++ b/src/vmware/vmware_conf.h @@ -1,4 +1,3 @@ -/*---------------------------------------------------------------------------*/ /* * Copyright (C) 2014 Red Hat, Inc. * Copyright 2010, diateam (www.diateam.net) @@ -18,7 +17,6 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ -/*---------------------------------------------------------------------------*/ #ifndef VMWARE_CONF_H # define VMWARE_CONF_H @@ -87,4 +85,4 @@ int vmwareExtractPid(const char * vmxPath); char *vmwareCopyVMXFileName(const char *datastorePath, void *opaque); -#endif +#endif /* VMWARE_CONF_H */ diff --git a/src/vmware/vmware_driver.h b/src/vmware/vmware_driver.h index e7427bb250..94ed04d023 100644 --- a/src/vmware/vmware_driver.h +++ b/src/vmware/vmware_driver.h @@ -1,5 +1,5 @@ -/*---------------------------------------------------------------------------*/ -/* Copyright 2010, diateam (www.diateam.net) +/* + * Copyright 2010, diateam (www.diateam.net) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -15,11 +15,10 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ -/*---------------------------------------------------------------------------*/ #ifndef VMWARE_DRIVER_H # define VMWARE_DRIVER_H int vmwareRegister(void); -#endif +#endif /* VMWARE_DRIVER_H */ diff --git a/src/vz/vz_driver.h b/src/vz/vz_driver.h index 3c7610637f..82c77fd0ec 100644 --- a/src/vz/vz_driver.h +++ b/src/vz/vz_driver.h @@ -25,4 +25,4 @@ int vzRegister(void); -#endif +#endif /* PARALLELS_DRIVER_H */ diff --git a/src/vz/vz_sdk.h b/src/vz/vz_sdk.h index 0a77431db5..d201d6a10d 100644 --- a/src/vz/vz_sdk.h +++ b/src/vz/vz_sdk.h @@ -20,9 +20,12 @@ * */ -#include <Parallels.h> +#ifndef __VZ_SDK_H__ +# define __VZ_SDK_H__ -#include "vz_utils.h" +# include <Parallels.h> + +# include "vz_utils.h" int prlsdkInit(void); void prlsdkDeinit(void); @@ -91,3 +94,5 @@ PRL_HANDLE prlsdkSdkDomainLookupByName(vzDriverPtr driver, const char *name); int prlsdkCancelJob(virDomainObjPtr dom); int prlsdkResizeImage(virDomainObjPtr dom, virDomainDiskDefPtr disk, unsigned long long newsize); + +#endif /* __VZ_SDK_H__ */ diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index 7137a2a8b6..93db255f95 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -151,11 +151,11 @@ int vzCheckUnsupportedGraphics(virDomainGraphicsDefPtr gr); OP(wr_req, VIR_DOMAIN_BLOCK_STATS_WRITE_REQ, "write_requests") \ OP(wr_bytes, VIR_DOMAIN_BLOCK_STATS_WRITE_BYTES, "write_total") -#endif - int vzDomainObjBeginJob(virDomainObjPtr dom); void vzDomainObjEndJob(virDomainObjPtr dom); int vzDomainJobUpdateTime(vzDomainJobObjPtr job); + +#endif /* PARALLELS_UTILS_H */ diff --git a/src/xenapi/xenapi_driver.h b/src/xenapi/xenapi_driver.h index 7a59c87587..df469aff34 100644 --- a/src/xenapi/xenapi_driver.h +++ b/src/xenapi/xenapi_driver.h @@ -17,7 +17,6 @@ * <http://www.gnu.org/licenses/>. */ - #ifndef __VIR_XENAPI_PRIV_H__ # define __VIR_XENAPI_PRIV_H__ diff --git a/src/xenapi/xenapi_driver_private.h b/src/xenapi/xenapi_driver_private.h index fb6d1a40be..7d8d8c66d2 100644 --- a/src/xenapi/xenapi_driver_private.h +++ b/src/xenapi/xenapi_driver_private.h @@ -17,7 +17,6 @@ * <http://www.gnu.org/licenses/>. */ - #ifndef __VIR_XENAPI_H__ # define __VIR_XENAPI_H__ diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 5b1e0db104..bf334c75ee 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -22,6 +22,7 @@ #include "qemu/qemu_alias.h" #include "qemu/qemu_conf.h" #include "qemu/qemu_hotplug.h" +#define __QEMU_HOTPLUGPRIV_H_ALLOW__ #include "qemu/qemu_hotplugpriv.h" #include "qemumonitortestutils.h" #include "testutils.h" diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c index 0532053722..e0117d0261 100644 --- a/tests/qemumigparamstest.c +++ b/tests/qemumigparamstest.c @@ -26,6 +26,7 @@ #include "testutilsqemu.h" #include "qemumonitortestutils.h" #include "qemu/qemu_migration_params.h" +#define __QEMU_MIGRATION_PARAMSPRIV_H_ALLOW__ #include "qemu/qemu_migration_paramspriv.h" #include "qemu/qemu_monitor.h" diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 5c77db337f..0e7d27a610 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -33,6 +33,7 @@ #include "cpu/cpu.h" #include "qemu/qemu_monitor.h" #include "qemu/qemu_migration_params.h" +#define __QEMU_MIGRATION_PARAMSPRIV_H_ALLOW__ #include "qemu/qemu_migration_paramspriv.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 9cee0082fa..cc9e0bd0f4 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -26,6 +26,7 @@ #include "qemumonitortestutils.h" #include "virthread.h" +#define __QEMU_PROCESS_PRIV_H_ALLOW__ #include "qemu/qemu_processpriv.h" #include "qemu/qemu_monitor.h" #include "qemu/qemu_agent.h" diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c index a0bbad3990..88c125236b 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -27,6 +27,7 @@ #include "internal.h" #include "testutils.h" +#define __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_ALLOW_H__ #include "storage/storage_backend_sheepdog_priv.h" #include "virstring.h" diff --git a/tests/testutilshostcpus.h b/tests/testutilshostcpus.h index f0ab23b962..07e7302d7f 100644 --- a/tests/testutilshostcpus.h +++ b/tests/testutilshostcpus.h @@ -1,6 +1,25 @@ -#include "conf/cpu_conf.h" -#include "internal.h" -#include "util/virarch.h" +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#ifndef TESTUTILSHOSTCPUS_H +# define TESTUTILSHOSTCPUS_H + +# include "conf/cpu_conf.h" +# include "internal.h" +# include "util/virarch.h" static virCPUFeatureDef cpuDefaultFeatures[] = { { (char *) "ds", -1 }, @@ -146,3 +165,5 @@ testUtilsHostCpusGetDefForArch(virArch arch) return NULL; } + +#endif /* TESTUTILSHOSTCPUS_H */ diff --git a/tests/testutilslxc.h b/tests/testutilslxc.h index 3f9a67b7f4..0bc69a903f 100644 --- a/tests/testutilslxc.h +++ b/tests/testutilslxc.h @@ -1,6 +1,27 @@ -#include "capabilities.h" +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ -#define FAKEDEVDIR0 "/fakedevdir0/bla/fasl" -#define FAKEDEVDIR1 "/fakedevdir1/bla/fasl" +#ifndef TESTUTILSLXC_H +# define TESTUTILSLXC_H + +# include "capabilities.h" + +# define FAKEDEVDIR0 "/fakedevdir0/bla/fasl" +# define FAKEDEVDIR1 "/fakedevdir1/bla/fasl" virCapsPtr testLXCCapsInit(void); + +#endif /* TESTUTILSLXC_H */ diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index efb1baeadd..1aa0034bb9 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -1,10 +1,29 @@ -#ifdef WITH_QEMU +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ -# include "capabilities.h" -# include "virfilecache.h" -# include "domain_conf.h" -# include "qemu/qemu_capabilities.h" -# include "qemu/qemu_conf.h" +#ifndef TESTUTILSQEMU_H +# define TESTUTILSQEMU_H + +# ifdef WITH_QEMU + +# include "capabilities.h" +# include "virfilecache.h" +# include "domain_conf.h" +# include "qemu/qemu_capabilities.h" +# include "qemu/qemu_conf.h" enum { GIC_NONE = 0, @@ -44,4 +63,6 @@ char *testQemuGetLatestCapsForArch(const char *dirname, const char *arch, const char *suffix); -#endif +# endif + +#endif /* TESTUTILSQEMU_H */ diff --git a/tests/testutilsqemuschema.h b/tests/testutilsqemuschema.h index c69435f420..081d12ea63 100644 --- a/tests/testutilsqemuschema.h +++ b/tests/testutilsqemuschema.h @@ -16,9 +16,12 @@ * <http://www.gnu.org/licenses/>. */ -#include "virhash.h" -#include "virjson.h" -#include "virbuffer.h" +#ifndef __TESTUTILSQEMUSCHEMA_H__ +# define __TESTUTILSQEMUSCHEMA_H__ + +# include "virhash.h" +# include "virjson.h" +# include "virbuffer.h" int testQEMUSchemaValidate(virJSONValuePtr obj, @@ -31,3 +34,5 @@ testQEMUSchemaGetLatest(void); virHashTablePtr testQEMUSchemaLoad(void); + +#endif /* __TESTUTILSQEMUSCHEMA_H__ */ diff --git a/tests/testutilsxen.h b/tests/testutilsxen.h index c5ccb6d471..0fceb93ae8 100644 --- a/tests/testutilsxen.h +++ b/tests/testutilsxen.h @@ -1,3 +1,19 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + #ifndef _TESTUTILSXEN_H_ # define _TESTUTILSXEN_H_ diff --git a/tests/virdbustest.c b/tests/virdbustest.c index 3afea6c248..b62a42eca7 100644 --- a/tests/virdbustest.c +++ b/tests/virdbustest.c @@ -18,7 +18,7 @@ #include <config.h> - +#define __VIR_DBUS_PRIV_H_ALLOW__ #include "virdbuspriv.h" #include "virlog.h" #include "testutils.h" diff --git a/tests/virfilewrapper.h b/tests/virfilewrapper.h index 612322c1d0..441013cec3 100644 --- a/tests/virfilewrapper.h +++ b/tests/virfilewrapper.h @@ -17,6 +17,7 @@ */ #ifndef __VIR_FILE_MOCK_H__ +# define __VIR_FILE_MOCK_H__ int virFileWrapperAddPrefix(const char *prefix, diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index 39aaa3bda7..7193576102 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -20,6 +20,7 @@ #define __VIR_FIREWALL_PRIV_H_ALLOW__ #define __VIR_COMMAND_PRIV_H_ALLOW__ +#define __VIR_DBUS_PRIV_H_ALLOW__ #include "testutils.h" diff --git a/tests/virhashdata.h b/tests/virhashdata.h index 332e09c3b3..557ed8e923 100644 --- a/tests/virhashdata.h +++ b/tests/virhashdata.h @@ -1,3 +1,22 @@ +/* + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#ifndef VIRHASHDATA_H +# define VIRHASHDATA_H + const char *uuids[] = { /* [ 2] */ "a9b02f96-e430-4f7c-a7ff-a647d080447a", /* [ 4] */ "202e32ca-f82c-4f13-9266-28dc8d002074", @@ -264,3 +283,5 @@ const char *uuids_new[] = { "5920cc9d-62a3-4772-9e73-eb97f0bc483c", "53c215dd-bdba-4fdc-887a-86ab6f860df4", }; + +#endif /* VIRHASHDATA_H */ diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c index 1df4bb8ee6..219de942b7 100644 --- a/tests/virhostcputest.c +++ b/tests/virhostcputest.c @@ -4,6 +4,7 @@ #include "testutils.h" #include "internal.h" +#define __VIR_HOSTCPU_PRIV_H_ALLOW__ #include "virhostcpupriv.h" #include "virfile.h" #include "virstring.h" diff --git a/tests/virnettlshelpers.h b/tests/virnettlshelpers.h index ad72cd6ab8..2ca4b52c3c 100644 --- a/tests/virnettlshelpers.h +++ b/tests/virnettlshelpers.h @@ -16,14 +16,17 @@ * <http://www.gnu.org/licenses/>. */ -#include <gnutls/gnutls.h> -#include <gnutls/x509.h> +#ifndef VIRNETTLSHELPERS_H +# define VIRNETTLSHELPERS_H -#if !defined WIN32 && HAVE_LIBTASN1_H && LIBGNUTLS_VERSION_NUMBER >= 0x020600 +# include <gnutls/gnutls.h> +# include <gnutls/x509.h> -# include <libtasn1.h> +# if !defined WIN32 && HAVE_LIBTASN1_H && LIBGNUTLS_VERSION_NUMBER >= 0x020600 -# include "rpc/virnettlscontext.h" +# include <libtasn1.h> + +# include "rpc/virnettlscontext.h" /* * This contains parameter about how to generate @@ -74,4 +77,6 @@ void testTLSDiscardCert(struct testTLSCertReq *req); void testTLSInit(const char *keyfile); void testTLSCleanup(const char *keyfile); -#endif +# endif + +#endif /* VIRNETTLSHELPERS_H */ diff --git a/tests/virresctrltest.c b/tests/virresctrltest.c index d2a290035f..d75c73f49e 100644 --- a/tests/virresctrltest.c +++ b/tests/virresctrltest.c @@ -2,6 +2,7 @@ #include "testutils.h" #include "virfilewrapper.h" +#define __VIR_RESCTRL_PRIV_H_ALLOW__ #include "virresctrlpriv.h" diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h index b4fd2a86c6..343b2b9d6c 100644 --- a/tools/virsh-completer.h +++ b/tools/virsh-completer.h @@ -109,4 +109,4 @@ char ** virshDomainDeviceAliasCompleter(vshControl *ctl, char ** virshCellnoCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); -#endif +#endif /* VIRSH_COMPLETER */ diff --git a/tools/virt-admin-completer.h b/tools/virt-admin-completer.h index 7507b95c1a..311f47fcf6 100644 --- a/tools/virt-admin-completer.h +++ b/tools/virt-admin-completer.h @@ -30,4 +30,4 @@ char ** vshAdmServerCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); -#endif +#endif /* VIRT_ADMIN_COMPLETER */ diff --git a/tools/wireshark/src/packet-libvirt.h b/tools/wireshark/src/packet-libvirt.h index 53197eb2eb..896b33fb6c 100644 --- a/tools/wireshark/src/packet-libvirt.h +++ b/tools/wireshark/src/packet-libvirt.h @@ -16,6 +16,7 @@ * License along with this library. If not, see * <http://www.gnu.org/licenses/>. */ + #ifndef _PACKET_LIBVIRT_H_ # define _PACKET_LIBVIRT_H_ -- 2.19.2
Require that all headers are guarded by a symbol named LIBVIRT_$FILENAME where $FILENAME is the uppercased filename, with all characters outside a-z changed into '_'. Note we do not use a leading __ because that is technically a namespace reserved for the toolchain. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- build-aux/header-ifdef.pl | 19 +++++++++++++------ 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 | 6 +++--- src/conf/domain_nwfilter.h | 6 +++--- 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 | 6 +++--- src/conf/networkcommon_conf.h | 6 +++--- src/conf/node_device_conf.h | 6 +++--- src/conf/node_device_event.h | 6 +++--- src/conf/node_device_util.h | 6 +++--- src/conf/numa_conf.h | 6 +++--- src/conf/nwfilter_conf.h | 6 +++--- src/conf/nwfilter_ipaddrmap.h | 6 +++--- src/conf/nwfilter_params.h | 6 +++--- src/conf/object_event.h | 6 +++--- src/conf/object_event_private.h | 6 +++--- src/conf/secret_conf.h | 6 +++--- src/conf/secret_event.h | 6 +++--- src/conf/snapshot_conf.h | 6 +++--- src/conf/storage_adapter_conf.h | 6 +++--- src/conf/storage_conf.h | 6 +++--- src/conf/storage_event.h | 6 +++--- src/conf/virchrdev.h | 6 +++--- src/conf/virdomainobjlist.h | 6 +++--- src/conf/virinterfaceobj.h | 6 +++--- src/conf/virnetworkobj.h | 6 +++--- src/conf/virnodedeviceobj.h | 6 +++--- src/conf/virnwfilterbindingdef.h | 6 +++--- src/conf/virnwfilterbindingobj.h | 6 +++--- src/conf/virnwfilterbindingobjlist.h | 6 +++--- src/conf/virnwfilterobj.h | 6 +++--- src/conf/virsavecookie.h | 6 +++--- 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 | 6 +++--- 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 | 6 +++--- src/lxc/lxc_cgroup.h | 6 +++--- src/lxc/lxc_conf.h | 6 +++--- src/lxc/lxc_container.h | 6 +++--- src/lxc/lxc_domain.h | 6 +++--- 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 | 6 +++--- 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 | 6 +++--- src/nwfilter/nwfilter_dhcpsnoop.h | 6 +++--- src/nwfilter/nwfilter_driver.h | 6 +++--- src/nwfilter/nwfilter_ebiptables_driver.h | 6 +++--- src/nwfilter/nwfilter_gentech_driver.h | 6 +++--- src/nwfilter/nwfilter_learnipaddr.h | 6 +++--- src/nwfilter/nwfilter_tech_driver.h | 6 +++--- src/openvz/openvz_conf.h | 6 +++--- src/openvz/openvz_driver.h | 6 +++--- src/openvz/openvz_util.h | 6 +++--- src/phyp/phyp_driver.h | 6 +++--- src/qemu/qemu_agent.h | 6 +++--- 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 | 10 +++++----- 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 | 6 +++--- src/qemu/qemu_driver.h | 6 +++--- src/qemu/qemu_extdevice.h | 6 +++--- src/qemu/qemu_hostdev.h | 6 +++--- src/qemu/qemu_hotplug.c | 2 +- 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 | 2 +- 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 | 6 +++--- src/qemu/qemu_monitor_json.h | 6 +++--- src/qemu/qemu_monitor_priv.h | 10 +++++----- src/qemu/qemu_monitor_text.h | 6 +++--- src/qemu/qemu_parse_command.h | 6 +++--- src/qemu/qemu_process.c | 2 +- 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 | 6 +++--- src/remote/remote_daemon.h | 6 +++--- src/remote/remote_daemon_config.h | 6 +++--- src/remote/remote_daemon_dispatch.h | 6 +++--- src/remote/remote_daemon_stream.h | 6 +++--- 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 | 6 +++--- 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 | 6 +++--- src/rpc/virnettlscontext.h | 6 +++--- src/secret/secret_driver.h | 6 +++--- src/secret/secret_util.h | 6 +++--- src/security/security_apparmor.h | 6 +++--- src/security/security_dac.h | 6 +++--- src/security/security_driver.h | 6 +++--- src/security/security_manager.h | 6 +++--- src/security/security_nop.h | 6 +++--- src/security/security_selinux.h | 6 +++--- src/security/security_stack.h | 6 +++--- 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 | 6 +++--- 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 | 2 +- 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 | 6 +++--- src/util/viralloc.h | 6 +++--- src/util/virarch.h | 6 +++--- src/util/virarptable.h | 6 +++--- src/util/viratomic.h | 6 +++--- src/util/viraudit.h | 6 +++--- 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 | 2 +- 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 | 6 +++--- src/util/virfile.h | 6 +++--- 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 | 6 +++--- src/util/virgic.h | 6 +++--- src/util/virhash.h | 6 +++--- src/util/virhashcode.h | 6 +++--- src/util/virhook.h | 6 +++--- src/util/virhostcpu.c | 2 +- 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 | 6 +++--- src/util/virjson.h | 6 +++--- src/util/virkeycode.h | 6 +++--- src/util/virkeyfile.h | 6 +++--- src/util/virkmod.h | 6 +++--- src/util/virlease.h | 6 +++--- src/util/virlockspace.h | 6 +++--- src/util/virlog.h | 6 +++--- src/util/virmacaddr.h | 6 +++--- src/util/virmacmap.h | 6 +++--- 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 | 6 +++--- src/util/virnetdevvportprofile.h | 6 +++--- src/util/virnetlink.h | 6 +++--- src/util/virnodesuspend.h | 6 +++--- 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 | 6 +++--- src/util/virrandom.h | 6 +++--- src/util/virresctrl.c | 2 +- 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 | 6 +++--- src/util/virtypedparam.h | 6 +++--- 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 | 6 +++--- 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 | 6 +++--- src/vmware/vmware_driver.h | 6 +++--- src/vmx/vmx.h | 6 +++--- src/vz/vz_driver.h | 6 +++--- src/vz/vz_sdk.h | 6 +++--- src/vz/vz_utils.h | 6 +++--- src/xenapi/xenapi_driver.h | 6 +++--- src/xenapi/xenapi_driver_private.h | 6 +++--- 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 | 2 +- tests/qemumigparamstest.c | 2 +- tests/qemumonitorjsontest.c | 2 +- tests/qemumonitortestutils.c | 2 +- tests/qemumonitortestutils.h | 6 +++--- tests/qemuxml2argvtest.c | 3 +-- tests/storagebackendsheepdogtest.c | 2 +- tests/sysinfotest.c | 2 +- tests/testutils.h | 6 +++--- tests/testutilshostcpus.h | 6 +++--- tests/testutilslxc.h | 6 +++--- tests/testutilsqemu.c | 2 +- tests/testutilsqemu.h | 6 +++--- tests/testutilsqemuschema.h | 6 +++--- tests/testutilsxen.h | 6 +++--- tests/vircgrouptest.c | 2 +- tests/virdbustest.c | 2 +- tests/virfilewrapper.h | 6 +++--- tests/virfirewalltest.c | 7 +++---- tests/virhashdata.h | 6 +++--- tests/virhostcputest.c | 2 +- tests/viriscsitest.c | 3 +-- tests/virkmodtest.c | 2 +- tests/virmock.h | 6 +++--- tests/virnetdevbandwidthtest.c | 2 +- tests/virnettlshelpers.h | 6 +++--- tests/virresctrltest.c | 2 +- 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 | 6 +++--- 458 files changed, 1335 insertions(+), 1335 deletions(-) diff --git a/build-aux/header-ifdef.pl b/build-aux/header-ifdef.pl index 48a2bd4e31..74b4c0246b 100644 --- a/build-aux/header-ifdef.pl +++ b/build-aux/header-ifdef.pl @@ -70,6 +70,15 @@ while (<>) { &mistake("$file: missing '#endif /* $ifdef */'"); } + $ifdef = uc $ARGV; + $ifdef =~ s,.*/,,; + $ifdef =~ s,[^A-Z0-9],_,g; + $ifdef =~ s,__+,_,g; + unless ($ifdef =~ /^LIBVIRT_/ && $ARGV !~ /libvirt_internal.h/) { + $ifdef = "LIBVIRT_" . $ifdef; + } + $ifdefpriv = $ifdef . "_ALLOW"; + $file = $ARGV; $state = $STATE_COPYRIGHT_COMMENT; $mistake = 0; @@ -98,11 +107,10 @@ while (<>) { } elsif ($state == $STATE_PRIV_START) { if (/^$/) { &mistake("$file: too many blank lines after coyright header"); - } elsif (/#ifndef\s(.*ALLOW.*)/) { - $ifdefpriv = $1; + } elsif (/#ifndef $ifdefpriv$/) { $state = $STATE_PRIV_ERROR; } else { - &mistake("$file: missing '#ifndef SYMBOL_ALLOW'"); + &mistake("$file: missing '#ifndef $ifdefpriv'"); } } elsif ($state == $STATE_PRIV_ERROR) { if (/# error ".*"$/) { @@ -124,11 +132,10 @@ while (<>) { } elsif ($state == $STATE_GUARD_START) { if (/^$/) { &mistake("$file: too many blank lines after coyright header"); - } elsif (/#ifndef\s(.*)$/) { - $ifdef = $1; + } elsif (/#ifndef $ifdef$/) { $state = $STATE_GUARD_DEFINE; } else { - &mistake("$file: missing '#ifndef SYMBOL'"); + &mistake("$file: missing '#ifndef $ifdef'"); } } elsif ($state == $STATE_GUARD_DEFINE) { if (/# define $ifdef$/) { diff --git a/docs/apibuild.py b/docs/apibuild.py index b1b5881943..3ef5d0f554 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -1003,6 +1003,8 @@ class CParser: # skip hidden macros if name in hidden_macros: return token + if name[-2:] == "_H" or name[-8:] == "_H_ALLOW": + return token strValue = None if len(lst) == 1 and lst[0][0] == '"' and lst[0][-1] == '"': diff --git a/include/libvirt/libvirt-admin.h b/include/libvirt/libvirt-admin.h index 190bda7567..abf2792926 100644 --- a/include/libvirt/libvirt-admin.h +++ b/include/libvirt/libvirt-admin.h @@ -21,8 +21,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_ADMIN_H__ -# define __VIR_ADMIN_H__ +#ifndef LIBVIRT_ADMIN_H +# define LIBVIRT_ADMIN_H # ifdef __cplusplus extern "C" { @@ -422,4 +422,4 @@ int virAdmConnectSetLoggingFilters(virAdmConnectPtr conn, } # endif -#endif /* __VIR_ADMIN_H__ */ +#endif /* LIBVIRT_ADMIN_H */ diff --git a/include/libvirt/libvirt-domain-snapshot.h b/include/libvirt/libvirt-domain-snapshot.h index 139fe35986..0c9985f7f4 100644 --- a/include/libvirt/libvirt-domain-snapshot.h +++ b/include/libvirt/libvirt-domain-snapshot.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LIBVIRT_DOMAIN_SNAPSHOT_H__ -# define __VIR_LIBVIRT_DOMAIN_SNAPSHOT_H__ +#ifndef LIBVIRT_DOMAIN_SNAPSHOT_H +# define LIBVIRT_DOMAIN_SNAPSHOT_H # ifndef __VIR_LIBVIRT_H_INCLUDES__ # error "Don't include this file directly, only use libvirt/libvirt.h" @@ -210,4 +210,4 @@ int virDomainSnapshotDelete(virDomainSnapshotPtr snapshot, int virDomainSnapshotRef(virDomainSnapshotPtr snapshot); int virDomainSnapshotFree(virDomainSnapshotPtr snapshot); -#endif /* __VIR_LIBVIRT_DOMAIN_SNAPSHOT_H__ */ +#endif /* LIBVIRT_DOMAIN_SNAPSHOT_H */ diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h index 9f56a40d9c..6a7494198f 100644 --- a/include/libvirt/libvirt-domain.h +++ b/include/libvirt/libvirt-domain.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LIBVIRT_DOMAIN_H__ -# define __VIR_LIBVIRT_DOMAIN_H__ +#ifndef LIBVIRT_DOMAIN_H +# define LIBVIRT_DOMAIN_H # ifndef __VIR_LIBVIRT_H_INCLUDES__ # error "Don't include this file directly, only use libvirt/libvirt.h" @@ -4839,4 +4839,4 @@ int virDomainGetLaunchSecurityInfo(virDomainPtr domain, int *nparams, unsigned int flags); -#endif /* __VIR_LIBVIRT_DOMAIN_H__ */ +#endif /* LIBVIRT_DOMAIN_H */ diff --git a/include/libvirt/libvirt-event.h b/include/libvirt/libvirt-event.h index f818712cea..734dbdcbc1 100644 --- a/include/libvirt/libvirt-event.h +++ b/include/libvirt/libvirt-event.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LIBVIRT_EVENT_H__ -# define __VIR_LIBVIRT_EVENT_H__ +#ifndef LIBVIRT_EVENT_H +# define LIBVIRT_EVENT_H # ifndef __VIR_LIBVIRT_H_INCLUDES__ # error "Don't include this file directly, only use libvirt/libvirt.h" @@ -186,4 +186,4 @@ void virEventUpdateTimeout(int timer, int frequency); int virEventRemoveTimeout(int timer); -#endif /* __VIR_LIBVIRT_EVENT_H__ */ +#endif /* LIBVIRT_EVENT_H */ diff --git a/include/libvirt/libvirt-host.h b/include/libvirt/libvirt-host.h index 5ce5d6ea2b..7debb5f829 100644 --- a/include/libvirt/libvirt-host.h +++ b/include/libvirt/libvirt-host.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LIBVIRT_HOST_H__ -# define __VIR_LIBVIRT_HOST_H__ +#ifndef LIBVIRT_HOST_H +# define LIBVIRT_HOST_H # ifndef __VIR_LIBVIRT_H_INCLUDES__ # error "Don't include this file directly, only use libvirt/libvirt.h" @@ -743,4 +743,4 @@ int virNodeAllocPages(virConnectPtr conn, unsigned int flags); -#endif /* __VIR_LIBVIRT_HOST_H__ */ +#endif /* LIBVIRT_HOST_H */ diff --git a/include/libvirt/libvirt-interface.h b/include/libvirt/libvirt-interface.h index 7dc7622085..7591c6c7fb 100644 --- a/include/libvirt/libvirt-interface.h +++ b/include/libvirt/libvirt-interface.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LIBVIRT_INTERFACE_H__ -# define __VIR_LIBVIRT_INTERFACE_H__ +#ifndef LIBVIRT_INTERFACE_H +# define LIBVIRT_INTERFACE_H # ifndef __VIR_LIBVIRT_H_INCLUDES__ # error "Don't include this file directly, only use libvirt/libvirt.h" @@ -106,4 +106,4 @@ int virInterfaceChangeRollback(virConnectPtr conn, int virInterfaceIsActive(virInterfacePtr iface); -#endif /* __VIR_LIBVIRT_INTERFACE_H__ */ +#endif /* LIBVIRT_INTERFACE_H */ diff --git a/include/libvirt/libvirt-lxc.h b/include/libvirt/libvirt-lxc.h index 64697d8f6c..898a4a8167 100644 --- a/include/libvirt/libvirt-lxc.h +++ b/include/libvirt/libvirt-lxc.h @@ -21,8 +21,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LXC_H__ -# define __VIR_LXC_H__ +#ifndef LIBVIRT_LXC_H +# define LIBVIRT_LXC_H # include <libvirt/libvirt.h> @@ -51,4 +51,4 @@ int virDomainLxcEnterCGroup(virDomainPtr domain, } # endif -#endif /* __VIR_LXC_H__ */ +#endif /* LIBVIRT_LXC_H */ diff --git a/include/libvirt/libvirt-network.h b/include/libvirt/libvirt-network.h index 87d2235956..5115251fbe 100644 --- a/include/libvirt/libvirt-network.h +++ b/include/libvirt/libvirt-network.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LIBVIRT_NETWORK_H__ -# define __VIR_LIBVIRT_NETWORK_H__ +#ifndef LIBVIRT_NETWORK_H +# define LIBVIRT_NETWORK_H # ifndef __VIR_LIBVIRT_H_INCLUDES__ # error "Don't include this file directly, only use libvirt/libvirt.h" @@ -333,4 +333,4 @@ int virConnectNetworkEventRegisterAny(virConnectPtr conn, int virConnectNetworkEventDeregisterAny(virConnectPtr conn, int callbackID); -#endif /* __VIR_LIBVIRT_NETWORK_H__ */ +#endif /* LIBVIRT_NETWORK_H */ diff --git a/include/libvirt/libvirt-nodedev.h b/include/libvirt/libvirt-nodedev.h index 9dc58b8ac2..a2ad61ac6d 100644 --- a/include/libvirt/libvirt-nodedev.h +++ b/include/libvirt/libvirt-nodedev.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LIBVIRT_NODEDEV_H__ -# define __VIR_LIBVIRT_NODEDEV_H__ +#ifndef LIBVIRT_NODEDEV_H +# define LIBVIRT_NODEDEV_H # ifndef __VIR_LIBVIRT_H_INCLUDES__ # error "Don't include this file directly, only use libvirt/libvirt.h" @@ -216,4 +216,4 @@ typedef void (*virConnectNodeDeviceEventLifecycleCallback)(virConnectPtr conn, int detail, void *opaque); -#endif /* __VIR_LIBVIRT_NODEDEV_H__ */ +#endif /* LIBVIRT_NODEDEV_H */ diff --git a/include/libvirt/libvirt-nwfilter.h b/include/libvirt/libvirt-nwfilter.h index 8501b847a7..44ca1b3fae 100644 --- a/include/libvirt/libvirt-nwfilter.h +++ b/include/libvirt/libvirt-nwfilter.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LIBVIRT_NWFILTER_H__ -# define __VIR_LIBVIRT_NWFILTER_H__ +#ifndef LIBVIRT_NWFILTER_H +# define LIBVIRT_NWFILTER_H # ifndef __VIR_LIBVIRT_H_INCLUDES__ # error "Don't include this file directly, only use libvirt/libvirt.h" @@ -130,4 +130,4 @@ int virNWFilterBindingDelete(virNWFilterBindingPtr binding); int virNWFilterBindingRef(virNWFilterBindingPtr binding); int virNWFilterBindingFree(virNWFilterBindingPtr binding); -#endif /* __VIR_LIBVIRT_NWFILTER_H__ */ +#endif /* LIBVIRT_NWFILTER_H */ diff --git a/include/libvirt/libvirt-qemu.h b/include/libvirt/libvirt-qemu.h index a97df8dda9..891617443f 100644 --- a/include/libvirt/libvirt-qemu.h +++ b/include/libvirt/libvirt-qemu.h @@ -21,8 +21,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_QEMU_H__ -# define __VIR_QEMU_H__ +#ifndef LIBVIRT_QEMU_H +# define LIBVIRT_QEMU_H # include <libvirt/libvirt.h> @@ -101,4 +101,4 @@ int virConnectDomainQemuMonitorEventDeregister(virConnectPtr conn, } # endif -#endif /* __VIR_QEMU_H__ */ +#endif /* LIBVIRT_QEMU_H */ diff --git a/include/libvirt/libvirt-secret.h b/include/libvirt/libvirt-secret.h index e46162da28..9a1065f0f3 100644 --- a/include/libvirt/libvirt-secret.h +++ b/include/libvirt/libvirt-secret.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LIBVIRT_SECRET_H__ -# define __VIR_LIBVIRT_SECRET_H__ +#ifndef LIBVIRT_SECRET_H +# define LIBVIRT_SECRET_H # ifndef __VIR_LIBVIRT_H_INCLUDES__ # error "Don't include this file directly, only use libvirt/libvirt.h" @@ -202,4 +202,4 @@ typedef void (*virConnectSecretEventLifecycleCallback)(virConnectPtr conn, void *opaque); -#endif /* __VIR_LIBVIRT_SECRET_H__ */ +#endif /* LIBVIRT_SECRET_H */ diff --git a/include/libvirt/libvirt-storage.h b/include/libvirt/libvirt-storage.h index 17906da890..4bf2b5f1dd 100644 --- a/include/libvirt/libvirt-storage.h +++ b/include/libvirt/libvirt-storage.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LIBVIRT_STORAGE_H__ -# define __VIR_LIBVIRT_STORAGE_H__ +#ifndef LIBVIRT_STORAGE_H +# define LIBVIRT_STORAGE_H # ifndef __VIR_LIBVIRT_H_INCLUDES__ # error "Don't include this file directly, only use libvirt/libvirt.h" @@ -495,4 +495,4 @@ typedef void (*virConnectStoragePoolEventLifecycleCallback)(virConnectPtr conn, int detail, void *opaque); -#endif /* __VIR_LIBVIRT_STORAGE_H__ */ +#endif /* LIBVIRT_STORAGE_H */ diff --git a/include/libvirt/libvirt-stream.h b/include/libvirt/libvirt-stream.h index 7d3a3d98e1..076f9ee8b8 100644 --- a/include/libvirt/libvirt-stream.h +++ b/include/libvirt/libvirt-stream.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LIBVIRT_STREAM_H__ -# define __VIR_LIBVIRT_STREAM_H__ +#ifndef LIBVIRT_STREAM_H +# define LIBVIRT_STREAM_H # ifndef __VIR_LIBVIRT_H_INCLUDES__ # error "Don't include this file directly, only use libvirt/libvirt.h" @@ -266,4 +266,4 @@ int virStreamAbort(virStreamPtr st); int virStreamFree(virStreamPtr st); -#endif /* __VIR_LIBVIRT_STREAM_H__ */ +#endif /* LIBVIRT_STREAM_H */ diff --git a/include/libvirt/libvirt.h b/include/libvirt/libvirt.h index d555ac798f..20e5d276a7 100644 --- a/include/libvirt/libvirt.h +++ b/include/libvirt/libvirt.h @@ -21,8 +21,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_VIRLIB_H__ -# define __VIR_VIRLIB_H__ +#ifndef LIBVIRT_H +# define LIBVIRT_H # include <sys/types.h> @@ -49,4 +49,4 @@ extern "C" { } # endif -#endif /* __VIR_VIRLIB_H__ */ +#endif /* LIBVIRT_H */ diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index 095c6cb1e4..44292c7021 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -21,8 +21,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_VIRERR_H__ -# define __VIR_VIRERR_H__ +#ifndef LIBVIRT_VIRTERROR_H +# define LIBVIRT_VIRTERROR_H # include <libvirt/libvirt.h> @@ -364,4 +364,4 @@ int virConnCopyLastError (virConnectPtr conn, } # endif -#endif /* __VIR_VIRERR_H__ */ +#endif /* LIBVIRT_VIRTERROR_H */ diff --git a/src/access/viraccessdriver.h b/src/access/viraccessdriver.h index 3b25f36cab..2cc3950f60 100644 --- a/src/access/viraccessdriver.h +++ b/src/access/viraccessdriver.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_ACCESS_DRIVER_H__ -# define __VIR_ACCESS_DRIVER_H__ +#ifndef LIBVIRT_VIRACCESSDRIVER_H +# define LIBVIRT_VIRACCESSDRIVER_H # include "conf/domain_conf.h" # include "access/viraccessmanager.h" @@ -91,4 +91,4 @@ struct _virAccessDriver { }; -#endif /* __VIR_ACCESS_DRIVER_H__ */ +#endif /* LIBVIRT_VIRACCESSDRIVER_H */ diff --git a/src/access/viraccessdrivernop.h b/src/access/viraccessdrivernop.h index 0b5d413418..d383c6f3ef 100644 --- a/src/access/viraccessdrivernop.h +++ b/src/access/viraccessdrivernop.h @@ -18,11 +18,11 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_ACCESS_DRIVER_NOP_H__ -# define __VIR_ACCESS_DRIVER_NOP_H__ +#ifndef LIBVIRT_VIRACCESSDRIVERNOP_H +# define LIBVIRT_VIRACCESSDRIVERNOP_H # include "access/viraccessdriver.h" extern virAccessDriver accessDriverNop; -#endif /* __VIR_ACCESS_DRIVER_NOP_H__ */ +#endif /* LIBVIRT_VIRACCESSDRIVERNOP_H */ diff --git a/src/access/viraccessdriverpolkit.h b/src/access/viraccessdriverpolkit.h index 00b044f458..4c71889824 100644 --- a/src/access/viraccessdriverpolkit.h +++ b/src/access/viraccessdriverpolkit.h @@ -18,11 +18,11 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_ACCESS_DRIVER_POLKIT_H__ -# define __VIR_ACCESS_DRIVER_POLKIT_H__ +#ifndef LIBVIRT_VIRACCESSDRIVERPOLKIT_H +# define LIBVIRT_VIRACCESSDRIVERPOLKIT_H # include "viraccessdriver.h" extern virAccessDriver accessDriverPolkit; -#endif /* __VIR_ACCESS_DRIVER_POLKIT_H__ */ +#endif /* LIBVIRT_VIRACCESSDRIVERPOLKIT_H */ diff --git a/src/access/viraccessdriverstack.h b/src/access/viraccessdriverstack.h index 4e34d5faca..0984b21914 100644 --- a/src/access/viraccessdriverstack.h +++ b/src/access/viraccessdriverstack.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_ACCESS_DRIVER_STACK_H__ -# define __VIR_ACCESS_DRIVER_STACK_H__ +#ifndef LIBVIRT_VIRACCESSDRIVERSTACK_H +# define LIBVIRT_VIRACCESSDRIVERSTACK_H # include "access/viraccessdriver.h" @@ -29,4 +29,4 @@ int virAccessDriverStackAppend(virAccessManagerPtr manager, extern virAccessDriver accessDriverStack; -#endif /* __VIR_ACCESS_DRIVER_STACK_H__ */ +#endif /* LIBVIRT_VIRACCESSDRIVERSTACK_H */ diff --git a/src/access/viraccessmanager.h b/src/access/viraccessmanager.h index 4fc86a1ff2..ab5ef87585 100644 --- a/src/access/viraccessmanager.h +++ b/src/access/viraccessmanager.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_ACCESS_MANAGER_H__ -# define __VIR_ACCESS_MANAGER_H__ +#ifndef LIBVIRT_VIRACCESSMANAGER_H +# define LIBVIRT_VIRACCESSMANAGER_H # include "viridentity.h" # include "conf/domain_conf.h" @@ -93,4 +93,4 @@ int virAccessManagerCheckStorageVol(virAccessManagerPtr manager, virAccessPermStorageVol perm); -#endif /* __VIR_ACCESS_MANAGER_H__ */ +#endif /* LIBVIRT_VIRACCESSMANAGER_H */ diff --git a/src/access/viraccessperm.h b/src/access/viraccessperm.h index 10ce2dc139..ce3865b359 100644 --- a/src/access/viraccessperm.h +++ b/src/access/viraccessperm.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_ACCESS_PERM_H__ -# define __VIR_ACCESS_PERM_H__ +#ifndef LIBVIRT_VIRACCESSPERM_H +# define LIBVIRT_VIRACCESSPERM_H # include "internal.h" # include "virutil.h" @@ -699,4 +699,4 @@ VIR_ENUM_DECL(virAccessPermSecret); VIR_ENUM_DECL(virAccessPermStoragePool); VIR_ENUM_DECL(virAccessPermStorageVol); -#endif /* __VIR_ACCESS_PERM_H__ */ +#endif /* LIBVIRT_VIRACCESSPERM_H */ diff --git a/src/admin/admin_server.h b/src/admin/admin_server.h index dc0f31e54b..43f2b85fc1 100644 --- a/src/admin/admin_server.h +++ b/src/admin/admin_server.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __ADMIN_SERVER_H__ -# define __ADMIN_SERVER_H__ +#ifndef LIBVIRT_ADMIN_SERVER_H +# define LIBVIRT_ADMIN_SERVER_H # include "rpc/virnetdaemon.h" # include "rpc/virnetserver.h" @@ -69,4 +69,4 @@ int adminServerSetClientLimits(virNetServerPtr srv, int nparams, unsigned int flags); -#endif /* __ADMIN_SERVER_H__ */ +#endif /* LIBVIRT_ADMIN_SERVER_H */ diff --git a/src/admin/admin_server_dispatch.h b/src/admin/admin_server_dispatch.h index 322bba7dd8..5316b89313 100644 --- a/src/admin/admin_server_dispatch.h +++ b/src/admin/admin_server_dispatch.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __ADMIN_SERVER_DISPATCH_H__ -# define __ADMIN_SERVER_DISPATCH_H__ +#ifndef LIBVIRT_ADMIN_SERVER_DISPATCH_H +# define LIBVIRT_ADMIN_SERVER_DISPATCH_H # include "rpc/virnetserverprogram.h" # include "rpc/virnetserverclient.h" @@ -37,4 +37,4 @@ void *remoteAdmClientNewPostExecRestart(virNetServerClientPtr client, virJSONValuePtr remoteAdmClientPreExecRestart(virNetServerClientPtr client, void *data); -#endif /* __ADMIN_SERVER_DISPATCH_H__ */ +#endif /* LIBVIRT_ADMIN_SERVER_DISPATCH_H */ diff --git a/src/bhyve/bhyve_capabilities.h b/src/bhyve/bhyve_capabilities.h index 9d3218127e..db4aff4775 100644 --- a/src/bhyve/bhyve_capabilities.h +++ b/src/bhyve/bhyve_capabilities.h @@ -19,8 +19,8 @@ * */ -#ifndef _BHYVE_CAPABILITIES -# define _BHYVE_CAPABILITIES +#ifndef LIBVIRT_BHYVE_CAPABILITIES_H +# define LIBVIRT_BHYVE_CAPABILITIES_H # include "capabilities.h" # include "conf/domain_capabilities.h" @@ -55,4 +55,4 @@ typedef enum { int virBhyveProbeGrubCaps(virBhyveGrubCapsFlags *caps); int virBhyveProbeCaps(unsigned int *caps); -#endif /* _BHYVE_CAPABILITIES */ +#endif /* LIBVIRT_BHYVE_CAPABILITIES_H */ diff --git a/src/bhyve/bhyve_command.h b/src/bhyve/bhyve_command.h index 22a959dfb2..ae0f770ac2 100644 --- a/src/bhyve/bhyve_command.h +++ b/src/bhyve/bhyve_command.h @@ -19,8 +19,8 @@ * */ -#ifndef __BHYVE_COMMAND_H__ -# define __BHYVE_COMMAND_H__ +#ifndef LIBVIRT_BHYVE_COMMAND_H +# define LIBVIRT_BHYVE_COMMAND_H # include "bhyve_domain.h" # include "bhyve_utils.h" @@ -42,4 +42,4 @@ virCommandPtr virBhyveProcessBuildLoadCmd(virConnectPtr conn, virDomainDefPtr def, const char *devmap_file, char **devicesmap_out); -#endif /* __BHYVE_COMMAND_H__ */ +#endif /* LIBVIRT_BHYVE_COMMAND_H */ diff --git a/src/bhyve/bhyve_conf.h b/src/bhyve/bhyve_conf.h index 3f105ace1c..8da39fde7a 100644 --- a/src/bhyve/bhyve_conf.h +++ b/src/bhyve/bhyve_conf.h @@ -19,8 +19,8 @@ * */ -#ifndef BHYVE_CONF_H -# define BHYVE_CONF_H +#ifndef LIBVIRT_BHYVE_CONF_H +# define LIBVIRT_BHYVE_CONF_H # include "bhyve_utils.h" @@ -29,4 +29,4 @@ virBhyveDriverConfigPtr virBhyveDriverGetConfig(bhyveConnPtr driver); int virBhyveLoadDriverConfig(virBhyveDriverConfigPtr cfg, const char *filename); -#endif /* BHYVE_CONF_H */ +#endif /* LIBVIRT_BHYVE_CONF_H */ diff --git a/src/bhyve/bhyve_device.h b/src/bhyve/bhyve_device.h index 48e7db438e..23b32e0e3e 100644 --- a/src/bhyve/bhyve_device.h +++ b/src/bhyve/bhyve_device.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __BHYVE_DEVICE_H__ -# define __BHYVE_DEVICE_H__ +#ifndef LIBVIRT_BHYVE_DEVICE_H +# define LIBVIRT_BHYVE_DEVICE_H # include "domain_conf.h" # include "virpci.h" @@ -33,4 +33,4 @@ virDomainPCIAddressSetPtr bhyveDomainPCIAddressSetCreate(virDomainDefPtr def, int bhyveDomainAssignAddresses(virDomainDefPtr def, virDomainObjPtr obj) ATTRIBUTE_NONNULL(1); -#endif /* __BHYVE_DEVICE_H__ */ +#endif /* LIBVIRT_BHYVE_DEVICE_H */ diff --git a/src/bhyve/bhyve_domain.h b/src/bhyve/bhyve_domain.h index 82b0b9b346..f34e5fe967 100644 --- a/src/bhyve/bhyve_domain.h +++ b/src/bhyve/bhyve_domain.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __BHYVE_DOMAIN_H__ -# define __BHYVE_DOMAIN_H__ +#ifndef LIBVIRT_BHYVE_DOMAIN_H +# define LIBVIRT_BHYVE_DOMAIN_H # include "domain_addr.h" # include "domain_conf.h" @@ -40,4 +40,4 @@ virDomainXMLOptionPtr virBhyveDriverCreateXMLConf(bhyveConnPtr); extern virDomainXMLPrivateDataCallbacks virBhyveDriverPrivateDataCallbacks; extern virDomainDefParserConfig virBhyveDriverDomainDefParserConfig; -#endif /* __BHYVE_DOMAIN_H__ */ +#endif /* LIBVIRT_BHYVE_DOMAIN_H */ diff --git a/src/bhyve/bhyve_driver.h b/src/bhyve/bhyve_driver.h index c9bcbb9418..36d1f8be85 100644 --- a/src/bhyve/bhyve_driver.h +++ b/src/bhyve/bhyve_driver.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __BHYVE_DRIVER_H__ -# define __BHYVE_DRIVER_H__ +#ifndef LIBVIRT_BHYVE_DRIVER_H +# define LIBVIRT_BHYVE_DRIVER_H # include "capabilities.h" # include "bhyve_utils.h" @@ -32,4 +32,4 @@ unsigned bhyveDriverGetGrubCaps(virConnectPtr conn); virCapsPtr bhyveDriverGetCapabilities(bhyveConnPtr driver); -#endif /* __BHYVE_DRIVER_H__ */ +#endif /* LIBVIRT_BHYVE_DRIVER_H */ diff --git a/src/bhyve/bhyve_monitor.h b/src/bhyve/bhyve_monitor.h index f376941bc6..54c9e70040 100644 --- a/src/bhyve/bhyve_monitor.h +++ b/src/bhyve/bhyve_monitor.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef BHYVE_MONITOR_H -# define BHYVE_MONITOR_H +#ifndef LIBVIRT_BHYVE_MONITOR_H +# define LIBVIRT_BHYVE_MONITOR_H # include "internal.h" # include "domain_conf.h" @@ -31,4 +31,4 @@ typedef bhyveMonitor *bhyveMonitorPtr; bhyveMonitorPtr bhyveMonitorOpen(virDomainObjPtr vm, bhyveConnPtr driver); void bhyveMonitorClose(bhyveMonitorPtr mon); -#endif /* BHYVE_MONITOR_H */ +#endif /* LIBVIRT_BHYVE_MONITOR_H */ diff --git a/src/bhyve/bhyve_parse_command.h b/src/bhyve/bhyve_parse_command.h index 236444e777..3609107711 100644 --- a/src/bhyve/bhyve_parse_command.h +++ b/src/bhyve/bhyve_parse_command.h @@ -18,11 +18,11 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __BHYVE_PARSE_COMMAND_H__ -# define __BHYVE_PARSE_COMMAND_H__ +#ifndef LIBVIRT_BHYVE_PARSE_COMMAND_H +# define LIBVIRT_BHYVE_PARSE_COMMAND_H virDomainDefPtr bhyveParseCommandLineString(const char* nativeConfig, unsigned caps, virDomainXMLOptionPtr xmlopt); -#endif /* __BHYVE_PARSE_COMMAND_H__ */ +#endif /* LIBVIRT_BHYVE_PARSE_COMMAND_H */ diff --git a/src/bhyve/bhyve_process.h b/src/bhyve/bhyve_process.h index ebabe17d87..f9ad5b6b5a 100644 --- a/src/bhyve/bhyve_process.h +++ b/src/bhyve/bhyve_process.h @@ -19,8 +19,8 @@ * */ -#ifndef __BHYVE_PROCESS_H__ -# define __BHYVE_PROCESS_H__ +#ifndef LIBVIRT_BHYVE_PROCESS_H +# define LIBVIRT_BHYVE_PROCESS_H # include "bhyve_utils.h" @@ -45,4 +45,4 @@ typedef enum { VIR_BHYVE_PROCESS_START_AUTODESTROY = 1 << 0, } bhyveProcessStartFlags; -#endif /* __BHYVE_PROCESS_H__ */ +#endif /* LIBVIRT_BHYVE_PROCESS_H */ diff --git a/src/bhyve/bhyve_utils.h b/src/bhyve/bhyve_utils.h index d6fb676898..e915bedd87 100644 --- a/src/bhyve/bhyve_utils.h +++ b/src/bhyve/bhyve_utils.h @@ -19,8 +19,8 @@ * */ -#ifndef __BHYVE_UTILS_H__ -# define __BHYVE_UTILS_H__ +#ifndef LIBVIRT_BHYVE_UTILS_H +# define LIBVIRT_BHYVE_UTILS_H # include "driver.h" # include "domain_event.h" @@ -76,4 +76,4 @@ struct bhyveAutostartData { void bhyveDriverLock(bhyveConnPtr driver); void bhyveDriverUnlock(bhyveConnPtr driver); -#endif /* __BHYVE_UTILS_H__ */ +#endif /* LIBVIRT_BHYVE_UTILS_H */ diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index c861ad5536..31c2a07a9b 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_CAPABILITIES_H -# define __VIR_CAPABILITIES_H +#ifndef LIBVIRT_CAPABILITIES_H +# define LIBVIRT_CAPABILITIES_H # include "internal.h" # include "virbuffer.h" @@ -355,4 +355,4 @@ int virCapabilitiesInitCaches(virCapsPtr caps); void virCapabilitiesHostInitIOMMU(virCapsPtr caps); -#endif /* __VIR_CAPABILITIES_H */ +#endif /* LIBVIRT_CAPABILITIES_H */ diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index 7792a4b449..0b2b63f5e4 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_CPU_CONF_H__ -# define __VIR_CPU_CONF_H__ +#ifndef LIBVIRT_CPU_CONF_H +# define LIBVIRT_CPU_CONF_H # include "virutil.h" # include "virbuffer.h" @@ -224,4 +224,4 @@ virCPUDefListParse(const char **xmlCPUs, void virCPUDefListFree(virCPUDefPtr *cpus); -#endif /* __VIR_CPU_CONF_H__ */ +#endif /* LIBVIRT_CPU_CONF_H */ diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index 320c6b55a1..56745707d9 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __DEVICE_CONF_H__ -# define __DEVICE_CONF_H__ +#ifndef LIBVIRT_DEVICE_CONF_H +# define LIBVIRT_DEVICE_CONF_H # include <libxml/parser.h> # include <libxml/tree.h> @@ -231,4 +231,4 @@ int virInterfaceLinkParseXML(xmlNodePtr node, int virInterfaceLinkFormat(virBufferPtr buf, const virNetDevIfLink *lnk); -#endif /* __DEVICE_CONF_H__ */ +#endif /* LIBVIRT_DEVICE_CONF_H */ diff --git a/src/conf/domain_addr.h b/src/conf/domain_addr.h index a0c853b7af..803d07d415 100644 --- a/src/conf/domain_addr.h +++ b/src/conf/domain_addr.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __DOMAIN_ADDR_H__ -# define __DOMAIN_ADDR_H__ +#ifndef LIBVIRT_DOMAIN_ADDR_H +# define LIBVIRT_DOMAIN_ADDR_H # include "domain_conf.h" @@ -312,4 +312,4 @@ int virDomainUSBAddressRelease(virDomainUSBAddressSetPtr addrs, virDomainDeviceInfoPtr info) ATTRIBUTE_NONNULL(2); -#endif /* __DOMAIN_ADDR_H__ */ +#endif /* LIBVIRT_DOMAIN_ADDR_H */ diff --git a/src/conf/domain_audit.h b/src/conf/domain_audit.h index 17e43b8cea..ee8a4aa70e 100644 --- a/src/conf/domain_audit.h +++ b/src/conf/domain_audit.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_DOMAIN_AUDIT_H__ -# define __VIR_DOMAIN_AUDIT_H__ +#ifndef LIBVIRT_DOMAIN_AUDIT_H +# define LIBVIRT_DOMAIN_AUDIT_H # include "domain_conf.h" # include "vircgroup.h" @@ -138,4 +138,4 @@ void virDomainAuditInput(virDomainObjPtr vm, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); -#endif /* __VIR_DOMAIN_AUDIT_H__ */ +#endif /* LIBVIRT_DOMAIN_AUDIT_H */ diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h index 16b9677124..15e065359b 100644 --- a/src/conf/domain_capabilities.h +++ b/src/conf/domain_capabilities.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __DOMAIN_CAPABILITIES_H__ -# define __DOMAIN_CAPABILITIES_H__ +#ifndef LIBVIRT_DOMAIN_CAPABILITIES_H +# define LIBVIRT_DOMAIN_CAPABILITIES_H # include "internal.h" # include "domain_conf.h" @@ -217,4 +217,4 @@ virSEVCapabilitiesFree(virSEVCapability *capabilities); VIR_DEFINE_AUTOPTR_FUNC(virSEVCapability, virSEVCapabilitiesFree); -#endif /* __DOMAIN_CAPABILITIES_H__ */ +#endif /* LIBVIRT_DOMAIN_CAPABILITIES_H */ diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 26b07d6804..5814997bdb 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __DOMAIN_CONF_H -# define __DOMAIN_CONF_H +#ifndef LIBVIRT_DOMAIN_CONF_H +# define LIBVIRT_DOMAIN_CONF_H # include <libxml/parser.h> # include <libxml/tree.h> @@ -3678,4 +3678,4 @@ virDomainGraphicsGetRenderNode(const virDomainGraphicsDef *graphics); bool virDomainGraphicsNeedsAutoRenderNode(const virDomainGraphicsDef *graphics); -#endif /* __DOMAIN_CONF_H */ +#endif /* LIBVIRT_DOMAIN_CONF_H */ diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index c70117526a..637f1daf68 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __DOMAIN_EVENT_H__ -# define __DOMAIN_EVENT_H__ +#ifndef LIBVIRT_DOMAIN_EVENT_H +# define LIBVIRT_DOMAIN_EVENT_H # include "internal.h" # include "object_event.h" @@ -324,4 +324,4 @@ virDomainQemuMonitorEventNew(int id, const char *details) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); -#endif /* __DOMAIN_EVENT_H__ */ +#endif /* LIBVIRT_DOMAIN_EVENT_H */ diff --git a/src/conf/domain_nwfilter.h b/src/conf/domain_nwfilter.h index 4ab9fbbfa7..9429ee6493 100644 --- a/src/conf/domain_nwfilter.h +++ b/src/conf/domain_nwfilter.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef DOMAIN_NWFILTER_H -# define DOMAIN_NWFILTER_H +#ifndef LIBVIRT_DOMAIN_NWFILTER_H +# define LIBVIRT_DOMAIN_NWFILTER_H int virDomainConfNWFilterInstantiate(const char *vmname, const unsigned char *vmuuid, @@ -29,4 +29,4 @@ int virDomainConfNWFilterInstantiate(const char *vmname, void virDomainConfNWFilterTeardown(virDomainNetDefPtr net); void virDomainConfVMNWFilterTeardown(virDomainObjPtr vm); -#endif /* DOMAIN_NWFILTER_H */ +#endif /* LIBVIRT_DOMAIN_NWFILTER_H */ diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h index af19f0d53b..24d0acd323 100644 --- a/src/conf/interface_conf.h +++ b/src/conf/interface_conf.h @@ -19,8 +19,8 @@ * Laine Stump <laine@redhat.com> */ -#ifndef __INTERFACE_CONF_H__ -# define __INTERFACE_CONF_H__ +#ifndef LIBVIRT_INTERFACE_CONF_H +# define LIBVIRT_INTERFACE_CONF_H # include <libxml/parser.h> # include <libxml/tree.h> @@ -179,4 +179,4 @@ virInterfaceDefFormat(const virInterfaceDef *def); (VIR_CONNECT_LIST_INTERFACES_ACTIVE | \ VIR_CONNECT_LIST_INTERFACES_INACTIVE) -#endif /* __INTERFACE_CONF_H__ */ +#endif /* LIBVIRT_INTERFACE_CONF_H */ diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_conf.h index 37049cc69a..cb1ffd29e0 100644 --- a/src/conf/netdev_bandwidth_conf.h +++ b/src/conf/netdev_bandwidth_conf.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NETDEV_BANDWIDTH_CONF_H__ -# define __VIR_NETDEV_BANDWIDTH_CONF_H__ +#ifndef LIBVIRT_NETDEV_BANDWIDTH_CONF_H +# define LIBVIRT_NETDEV_BANDWIDTH_CONF_H # include "internal.h" # include "virnetdevbandwidth.h" @@ -57,4 +57,4 @@ static inline bool virNetDevSupportBandwidth(virDomainNetType type) return false; } -#endif /* __VIR_NETDEV_BANDWIDTH_CONF_H__ */ +#endif /* LIBVIRT_NETDEV_BANDWIDTH_CONF_H */ diff --git a/src/conf/netdev_vlan_conf.h b/src/conf/netdev_vlan_conf.h index 88667d47fa..e3a99790eb 100644 --- a/src/conf/netdev_vlan_conf.h +++ b/src/conf/netdev_vlan_conf.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NETDEV_VLAN_CONF_H__ -# define __VIR_NETDEV_VLAN_CONF_H__ +#ifndef LIBVIRT_NETDEV_VLAN_CONF_H +# define LIBVIRT_NETDEV_VLAN_CONF_H # include "internal.h" # include "virnetdevvlan.h" @@ -27,4 +27,4 @@ int virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr def); int virNetDevVlanFormat(const virNetDevVlan *def, virBufferPtr buf); -#endif /* __VIR_NETDEV_VLAN_CONF_H__ */ +#endif /* LIBVIRT_NETDEV_VLAN_CONF_H */ diff --git a/src/conf/netdev_vport_profile_conf.h b/src/conf/netdev_vport_profile_conf.h index 29f627367f..9044217fb0 100644 --- a/src/conf/netdev_vport_profile_conf.h +++ b/src/conf/netdev_vport_profile_conf.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NETDEV_VPORT_PROFILE_CONF_H__ -# define __VIR_NETDEV_VPORT_PROFILE_CONF_H__ +#ifndef LIBVIRT_NETDEV_VPORT_PROFILE_CONF_H +# define LIBVIRT_NETDEV_VPORT_PROFILE_CONF_H # include "internal.h" # include "virnetdevvportprofile.h" @@ -45,4 +45,4 @@ virNetDevVPortProfileFormat(virNetDevVPortProfilePtr virtPort, virBufferPtr buf); -#endif /* __VIR_NETDEV_VPORT_PROFILE_CONF_H__ */ +#endif /* LIBVIRT_NETDEV_VPORT_PROFILE_CONF_H */ diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 6ae39dbeaf..c630674300 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __NETWORK_CONF_H__ -# define __NETWORK_CONF_H__ +#ifndef LIBVIRT_NETWORK_CONF_H +# define LIBVIRT_NETWORK_CONF_H # define DNS_RECORD_LENGTH_SRV (512 - 30) /* Limit minus overhead as mentioned in RFC-2782 */ @@ -383,4 +383,4 @@ virNetworkDefUpdateSection(virNetworkDefPtr def, unsigned int flags); /* virNetworkUpdateFlags */ VIR_ENUM_DECL(virNetworkTaint) -#endif /* __NETWORK_CONF_H__ */ +#endif /* LIBVIRT_NETWORK_CONF_H */ diff --git a/src/conf/network_event.h b/src/conf/network_event.h index fb43a27359..d3d17dd168 100644 --- a/src/conf/network_event.h +++ b/src/conf/network_event.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __NETWORK_EVENT_H__ -# define __NETWORK_EVENT_H__ +#ifndef LIBVIRT_NETWORK_EVENT_H +# define LIBVIRT_NETWORK_EVENT_H # include "internal.h" # include "object_event.h" @@ -56,4 +56,4 @@ virNetworkEventLifecycleNew(const char *name, int type, int detail); -#endif /* __NETWORK_EVENT_H__ */ +#endif /* LIBVIRT_NETWORK_EVENT_H */ diff --git a/src/conf/networkcommon_conf.h b/src/conf/networkcommon_conf.h index 636a647e94..b6c37a5a28 100644 --- a/src/conf/networkcommon_conf.h +++ b/src/conf/networkcommon_conf.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __NETWORKCOMMON_CONF_H__ -# define __NETWORKCOMMON_CONF_H__ +#ifndef LIBVIRT_NETWORKCOMMON_CONF_H +# define LIBVIRT_NETWORKCOMMON_CONF_H # include <libxml/tree.h> # include <libxml/xpath.h> @@ -50,4 +50,4 @@ int virNetDevIPRouteFormat(virBufferPtr buf, const virNetDevIPRoute *def); -#endif /* __NETWORKCOMMON_CONF_H__ */ +#endif /* LIBVIRT_NETWORKCOMMON_CONF_H */ diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index 24355f86ab..6412ac6472 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NODE_DEVICE_CONF_H__ -# define __VIR_NODE_DEVICE_CONF_H__ +#ifndef LIBVIRT_NODE_DEVICE_CONF_H +# define LIBVIRT_NODE_DEVICE_CONF_H # include "internal.h" # include "virbitmap.h" @@ -383,4 +383,4 @@ int virNodeDeviceCapsListExport(virNodeDeviceDefPtr def, virNodeDevCapType **list); -#endif /* __VIR_NODE_DEVICE_CONF_H__ */ +#endif /* LIBVIRT_NODE_DEVICE_CONF_H */ diff --git a/src/conf/node_device_event.h b/src/conf/node_device_event.h index 6c4fc50ef8..b30177a901 100644 --- a/src/conf/node_device_event.h +++ b/src/conf/node_device_event.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __NODE_DEVICE_EVENT_H__ -# define __NODE_DEVICE_EVENT_H__ +#ifndef LIBVIRT_NODE_DEVICE_EVENT_H +# define LIBVIRT_NODE_DEVICE_EVENT_H # include "internal.h" # include "object_event.h" @@ -59,4 +59,4 @@ virNodeDeviceEventLifecycleNew(const char *name, virObjectEventPtr virNodeDeviceEventUpdateNew(const char *name); -#endif /* __NODE_DEVICE_EVENT_H__ */ +#endif /* LIBVIRT_NODE_DEVICE_EVENT_H */ diff --git a/src/conf/node_device_util.h b/src/conf/node_device_util.h index 5cb225d03e..e040bf62a9 100644 --- a/src/conf/node_device_util.h +++ b/src/conf/node_device_util.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NODE_DEVICE_UTIL_H__ -# define __VIR_NODE_DEVICE_UTIL_H__ +#ifndef LIBVIRT_NODE_DEVICE_UTIL_H +# define LIBVIRT_NODE_DEVICE_UTIL_H # include "conf/storage_adapter_conf.h" @@ -32,4 +32,4 @@ int virNodeDeviceDeleteVport(virConnectPtr conn, virStorageAdapterFCHostPtr fchost); -#endif /* __VIR_NODE_DEVICE_UTIL_H__ */ +#endif /* LIBVIRT_NODE_DEVICE_UTIL_H */ diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h index 0b8d388347..5bb149bc12 100644 --- a/src/conf/numa_conf.h +++ b/src/conf/numa_conf.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __NUMA_CONF_H__ -# define __NUMA_CONF_H__ +#ifndef LIBVIRT_NUMA_CONF_H +# define LIBVIRT_NUMA_CONF_H # include <libxml/xpath.h> @@ -186,4 +186,4 @@ int virDomainNumaDefCPUFormatXML(virBufferPtr buf, virDomainNumaPtr def); unsigned int virDomainNumaGetCPUCountTotal(virDomainNumaPtr numa); -#endif /* __NUMA_CONF_H__ */ +#endif /* LIBVIRT_NUMA_CONF_H */ diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index da70f0d80b..de4c3b1d40 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -22,8 +22,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef NWFILTER_CONF_H -# define NWFILTER_CONF_H +#ifndef LIBVIRT_NWFILTER_CONF_H +# define LIBVIRT_NWFILTER_CONF_H # include "internal.h" @@ -615,4 +615,4 @@ VIR_ENUM_DECL(virNWFilterChainPolicy); VIR_ENUM_DECL(virNWFilterEbtablesTable); VIR_ENUM_DECL(virNWFilterChainSuffix); -#endif /* NWFILTER_CONF_H */ +#endif /* LIBVIRT_NWFILTER_CONF_H */ diff --git a/src/conf/nwfilter_ipaddrmap.h b/src/conf/nwfilter_ipaddrmap.h index 272440966b..13e763ae7e 100644 --- a/src/conf/nwfilter_ipaddrmap.h +++ b/src/conf/nwfilter_ipaddrmap.h @@ -20,8 +20,8 @@ * */ -#ifndef __VIR_NWFILTER_IPADDRMAP_H -# define __VIR_NWFILTER_IPADDRMAP_H +#ifndef LIBVIRT_NWFILTER_IPADDRMAP_H +# define LIBVIRT_NWFILTER_IPADDRMAP_H int virNWFilterIPAddrMapInit(void); void virNWFilterIPAddrMapShutdown(void); @@ -31,4 +31,4 @@ int virNWFilterIPAddrMapDelIPAddr(const char *ifname, const char *ipaddr); virNWFilterVarValuePtr virNWFilterIPAddrMapGetIPAddr(const char *ifname); -#endif /* __VIR_NWFILTER_IPADDRMAP_H */ +#endif /* LIBVIRT_NWFILTER_IPADDRMAP_H */ diff --git a/src/conf/nwfilter_params.h b/src/conf/nwfilter_params.h index 762e94ed0f..9abeeba43a 100644 --- a/src/conf/nwfilter_params.h +++ b/src/conf/nwfilter_params.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef NWFILTER_PARAMS_H -# define NWFILTER_PARAMS_H +#ifndef LIBVIRT_NWFILTER_PARAMS_H +# define LIBVIRT_NWFILTER_PARAMS_H # include "virhash.h" # include "virbuffer.h" @@ -152,4 +152,4 @@ const char *virNWFilterVarCombIterGetVarValue(virNWFilterVarCombIterPtr ci, const virNWFilterVarAccess *); -#endif /* NWFILTER_PARAMS_H */ +#endif /* LIBVIRT_NWFILTER_PARAMS_H */ diff --git a/src/conf/object_event.h b/src/conf/object_event.h index ebded5ab7a..bbeaa3aae7 100644 --- a/src/conf/object_event.h +++ b/src/conf/object_event.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __OBJECT_EVENT_H__ -# define __OBJECT_EVENT_H__ +#ifndef LIBVIRT_OBJECT_EVENT_H +# define LIBVIRT_OBJECT_EVENT_H # include "internal.h" @@ -89,4 +89,4 @@ virObjectEventStateSetRemote(virConnectPtr conn, int remoteID) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -#endif /* __OBJECT_EVENT_H__ */ +#endif /* LIBVIRT_OBJECT_EVENT_H */ diff --git a/src/conf/object_event_private.h b/src/conf/object_event_private.h index 6f15290670..5000b99504 100644 --- a/src/conf/object_event_private.h +++ b/src/conf/object_event_private.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __OBJECT_EVENT_PRIVATE_H__ -# define __OBJECT_EVENT_PRIVATE_H__ +#ifndef LIBVIRT_OBJECT_EVENT_PRIVATE_H +# define LIBVIRT_OBJECT_EVENT_PRIVATE_H # include "datatypes.h" @@ -106,4 +106,4 @@ virObjectEventNew(virClassPtr klass, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(5) ATTRIBUTE_NONNULL(7); -#endif /* __OBJECT_EVENT_PRIVATE_H__ */ +#endif /* LIBVIRT_OBJECT_EVENT_PRIVATE_H */ diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h index d871ad7e93..1a48f12dd9 100644 --- a/src/conf/secret_conf.h +++ b/src/conf/secret_conf.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_SECRET_CONF_H__ -# define __VIR_SECRET_CONF_H__ +#ifndef LIBVIRT_SECRET_CONF_H +# define LIBVIRT_SECRET_CONF_H # include "internal.h" # include "virutil.h" @@ -52,4 +52,4 @@ char *virSecretDefFormat(const virSecretDef *def); (VIR_CONNECT_LIST_SECRETS_FILTERS_EPHEMERAL | \ VIR_CONNECT_LIST_SECRETS_FILTERS_PRIVATE) -#endif /* __VIR_SECRET_CONF_H__ */ +#endif /* LIBVIRT_SECRET_CONF_H */ diff --git a/src/conf/secret_event.h b/src/conf/secret_event.h index 3aa651c533..83a432d5a6 100644 --- a/src/conf/secret_event.h +++ b/src/conf/secret_event.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __SECRET_EVENT_H__ -# define __SECRET_EVENT_H__ +#ifndef LIBVIRT_SECRET_EVENT_H +# define LIBVIRT_SECRET_EVENT_H # include "internal.h" # include "object_event.h" @@ -62,4 +62,4 @@ virSecretEventValueChangedNew(const unsigned char *uuid, int usage_type, const char *usage_id); -#endif /* __SECRET_EVENT_H__ */ +#endif /* LIBVIRT_SECRET_EVENT_H */ diff --git a/src/conf/snapshot_conf.h b/src/conf/snapshot_conf.h index 531bf0b759..5ac1ba74a2 100644 --- a/src/conf/snapshot_conf.h +++ b/src/conf/snapshot_conf.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __SNAPSHOT_CONF_H -# define __SNAPSHOT_CONF_H +#ifndef LIBVIRT_SNAPSHOT_CONF_H +# define LIBVIRT_SNAPSHOT_CONF_H # include "internal.h" # include "domain_conf.h" @@ -189,4 +189,4 @@ int virDomainSnapshotRedefinePrep(virDomainPtr domain, VIR_ENUM_DECL(virDomainSnapshotLocation) VIR_ENUM_DECL(virDomainSnapshotState) -#endif /* __SNAPSHOT_CONF_H */ +#endif /* LIBVIRT_SNAPSHOT_CONF_H */ diff --git a/src/conf/storage_adapter_conf.h b/src/conf/storage_adapter_conf.h index 8ef2236c85..139674e8b4 100644 --- a/src/conf/storage_adapter_conf.h +++ b/src/conf/storage_adapter_conf.h @@ -17,8 +17,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_STORAGE_ADAPTER_CONF_H__ -# define __VIR_STORAGE_ADAPTER_CONF_H__ +#ifndef LIBVIRT_STORAGE_ADAPTER_CONF_H +# define LIBVIRT_STORAGE_ADAPTER_CONF_H # include "virpci.h" # include "virxml.h" @@ -81,4 +81,4 @@ void virStorageAdapterFormat(virBufferPtr buf, virStorageAdapterPtr adapter); -#endif /* __VIR_STORAGE_ADAPTER_CONF_H__ */ +#endif /* LIBVIRT_STORAGE_ADAPTER_CONF_H */ diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 37cb3096fa..dc0aa2ab29 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_STORAGE_CONF_H__ -# define __VIR_STORAGE_CONF_H__ +#ifndef LIBVIRT_STORAGE_CONF_H +# define LIBVIRT_STORAGE_CONF_H # include "internal.h" # include "virstorageencryption.h" @@ -433,4 +433,4 @@ VIR_ENUM_DECL(virStoragePartedFs) VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_AUTOSTART | \ VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_POOL_TYPE) -#endif /* __VIR_STORAGE_CONF_H__ */ +#endif /* LIBVIRT_STORAGE_CONF_H */ diff --git a/src/conf/storage_event.h b/src/conf/storage_event.h index 936023584d..fd6c10969c 100644 --- a/src/conf/storage_event.h +++ b/src/conf/storage_event.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __STORAGE_EVENT_H__ -# define __STORAGE_EVENT_H__ +#ifndef LIBVIRT_STORAGE_EVENT_H +# define LIBVIRT_STORAGE_EVENT_H # include "internal.h" # include "object_event.h" @@ -61,4 +61,4 @@ virObjectEventPtr virStoragePoolEventRefreshNew(const char *name, const unsigned char *uuid); -#endif /* __STORAGE_EVENT_H__ */ +#endif /* LIBVIRT_STORAGE_EVENT_H */ diff --git a/src/conf/virchrdev.h b/src/conf/virchrdev.h index b9dac9b31d..42306ff933 100644 --- a/src/conf/virchrdev.h +++ b/src/conf/virchrdev.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_CHRDEV_H__ -# define __VIR_CHRDEV_H__ +#ifndef LIBVIRT_VIRCHRDEV_H +# define LIBVIRT_VIRCHRDEV_H # include "internal.h" # include "domain_conf.h" @@ -34,4 +34,4 @@ void virChrdevFree(virChrdevsPtr devs); int virChrdevOpen(virChrdevsPtr devs, virDomainChrSourceDefPtr source, virStreamPtr st, bool force); -#endif /* __VIR_CHRDEV_H__ */ +#endif /* LIBVIRT_VIRCHRDEV_H */ diff --git a/src/conf/virdomainobjlist.h b/src/conf/virdomainobjlist.h index 6e09133b32..c1ffee76ad 100644 --- a/src/conf/virdomainobjlist.h +++ b/src/conf/virdomainobjlist.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIRDOMAINOBJLIST_H__ -# define __VIRDOMAINOBJLIST_H__ +#ifndef LIBVIRT_VIRDOMAINOBJLIST_H +# define LIBVIRT_VIRDOMAINOBJLIST_H # include "domain_conf.h" @@ -150,4 +150,4 @@ int virDomainObjListConvert(virDomainObjListPtr domlist, unsigned int flags, bool skip_missing); -#endif /* __VIRDOMAINOBJLIST_H__ */ +#endif /* LIBVIRT_VIRDOMAINOBJLIST_H */ diff --git a/src/conf/virinterfaceobj.h b/src/conf/virinterfaceobj.h index 33d2dda05d..6ad331af4f 100644 --- a/src/conf/virinterfaceobj.h +++ b/src/conf/virinterfaceobj.h @@ -17,8 +17,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIRINTERFACEOBJ_H__ -# define __VIRINTERFACEOBJ_H__ +#ifndef LIBVIRT_VIRINTERFACEOBJ_H +# define LIBVIRT_VIRINTERFACEOBJ_H # include "internal.h" @@ -89,4 +89,4 @@ virInterfaceObjListExport(virConnectPtr conn, virInterfaceObjListFilter filter, unsigned int flags); -#endif /* __VIRINTERFACEOBJ_H__ */ +#endif /* LIBVIRT_VIRINTERFACEOBJ_H */ diff --git a/src/conf/virnetworkobj.h b/src/conf/virnetworkobj.h index 627277b552..9c8f141cd9 100644 --- a/src/conf/virnetworkobj.h +++ b/src/conf/virnetworkobj.h @@ -17,8 +17,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIRNETWORKOBJ_H__ -# define __VIRNETWORKOBJ_H__ +#ifndef LIBVIRT_VIRNETWORKOBJ_H +# define LIBVIRT_VIRNETWORKOBJ_H # include "internal.h" @@ -221,4 +221,4 @@ void virNetworkObjListPrune(virNetworkObjListPtr nets, unsigned int flags); -#endif /* __VIRNETWORKOBJ_H__ */ +#endif /* LIBVIRT_VIRNETWORKOBJ_H */ diff --git a/src/conf/virnodedeviceobj.h b/src/conf/virnodedeviceobj.h index ffbe4e32e5..a560852c27 100644 --- a/src/conf/virnodedeviceobj.h +++ b/src/conf/virnodedeviceobj.h @@ -17,8 +17,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIRNODEDEVICEOBJ_H__ -# define __VIRNODEDEVICEOBJ_H__ +#ifndef LIBVIRT_VIRNODEDEVICEOBJ_H +# define LIBVIRT_VIRNODEDEVICEOBJ_H # include "internal.h" # include "virthread.h" @@ -113,4 +113,4 @@ void virNodeDeviceObjSetSkipUpdateCaps(virNodeDeviceObjPtr obj, bool skipUpdateCaps); -#endif /* __VIRNODEDEVICEOBJ_H__ */ +#endif /* LIBVIRT_VIRNODEDEVICEOBJ_H */ diff --git a/src/conf/virnwfilterbindingdef.h b/src/conf/virnwfilterbindingdef.h index 8a78278bee..7cd2890b15 100644 --- a/src/conf/virnwfilterbindingdef.h +++ b/src/conf/virnwfilterbindingdef.h @@ -19,8 +19,8 @@ * */ -#ifndef VIR_NWFILTER_BINDING_DEF_H -# define VIR_NWFILTER_BINDING_DEF_H +#ifndef LIBVIRT_VIRNWFILTERBINDINGDEF_H +# define LIBVIRT_VIRNWFILTERBINDINGDEF_H # include "internal.h" # include "virmacaddr.h" @@ -63,4 +63,4 @@ int virNWFilterBindingDefFormatBuf(virBufferPtr buf, const virNWFilterBindingDef *def); -#endif /* VIR_NWFILTER_BINDING_DEF_H */ +#endif /* LIBVIRT_VIRNWFILTERBINDINGDEF_H */ diff --git a/src/conf/virnwfilterbindingobj.h b/src/conf/virnwfilterbindingobj.h index 2455a44dd8..8e5fbee35f 100644 --- a/src/conf/virnwfilterbindingobj.h +++ b/src/conf/virnwfilterbindingobj.h @@ -19,8 +19,8 @@ * */ -#ifndef VIR_NWFILTER_BINDING_OBJ_H -# define VIR_NWFILTER_BINDING_OBJ_H +#ifndef LIBVIRT_VIRNWFILTERBINDINGOBJ_H +# define LIBVIRT_VIRNWFILTERBINDINGOBJ_H # include "internal.h" # include "virnwfilterbindingdef.h" @@ -67,4 +67,4 @@ virNWFilterBindingObjParseFile(const char *filename); char * virNWFilterBindingObjFormat(const virNWFilterBindingObj *obj); -#endif /* VIR_NWFILTER_BINDING_OBJ_H */ +#endif /* LIBVIRT_VIRNWFILTERBINDINGOBJ_H */ diff --git a/src/conf/virnwfilterbindingobjlist.h b/src/conf/virnwfilterbindingobjlist.h index 7cdae901f2..b0fb90f667 100644 --- a/src/conf/virnwfilterbindingobjlist.h +++ b/src/conf/virnwfilterbindingobjlist.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NWFILTER_BINDING_OBJ_LIST_H__ -# define __VIR_NWFILTER_BINDING_OBJ_LIST_H__ +#ifndef LIBVIRT_VIRNWFILTERBINDINGOBJLIST_H +# define LIBVIRT_VIRNWFILTERBINDINGOBJLIST_H # include "virnwfilterbindingobj.h" @@ -64,4 +64,4 @@ virNWFilterBindingObjListExport(virNWFilterBindingObjListPtr bindings, virNWFilterBindingObjListACLFilter filter); -#endif /* __VIR_NWFILTER_BINDING_OBJ_LIST_H__ */ +#endif /* LIBVIRT_VIRNWFILTERBINDINGOBJLIST_H */ diff --git a/src/conf/virnwfilterobj.h b/src/conf/virnwfilterobj.h index b047a7c88d..2369c20313 100644 --- a/src/conf/virnwfilterobj.h +++ b/src/conf/virnwfilterobj.h @@ -17,8 +17,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef VIRNWFILTEROBJ_H -# define VIRNWFILTEROBJ_H +#ifndef LIBVIRT_VIRNWFILTEROBJ_H +# define LIBVIRT_VIRNWFILTEROBJ_H # include "internal.h" @@ -115,4 +115,4 @@ virNWFilterObjLock(virNWFilterObjPtr obj); void virNWFilterObjUnlock(virNWFilterObjPtr obj); -#endif /* VIRNWFILTEROBJ_H */ +#endif /* LIBVIRT_VIRNWFILTEROBJ_H */ diff --git a/src/conf/virsavecookie.h b/src/conf/virsavecookie.h index c225c8d0bc..a5e41e7acb 100644 --- a/src/conf/virsavecookie.h +++ b/src/conf/virsavecookie.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_SAVE_COOKIE_H__ -# define __VIR_SAVE_COOKIE_H__ +#ifndef LIBVIRT_VIRSAVECOOKIE_H +# define LIBVIRT_VIRSAVECOOKIE_H # include <libxml/xpath.h> @@ -60,4 +60,4 @@ char * virSaveCookieFormat(virObjectPtr obj, virSaveCookieCallbacksPtr saveCookie); -#endif /* __VIR_SAVE_COOKIE_H__ */ +#endif /* LIBVIRT_VIRSAVECOOKIE_H */ diff --git a/src/conf/virsecretobj.h b/src/conf/virsecretobj.h index d412ee6a76..1563fa8ca7 100644 --- a/src/conf/virsecretobj.h +++ b/src/conf/virsecretobj.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIRSECRETOBJ_H__ -# define __VIRSECRETOBJ_H__ +#ifndef LIBVIRT_VIRSECRETOBJ_H +# define LIBVIRT_VIRSECRETOBJ_H # include "internal.h" @@ -118,4 +118,4 @@ int virSecretLoadAllConfigs(virSecretObjListPtr secrets, const char *configDir); -#endif /* __VIRSECRETOBJ_H__ */ +#endif /* LIBVIRT_VIRSECRETOBJ_H */ diff --git a/src/conf/virstorageobj.h b/src/conf/virstorageobj.h index abd6166d88..1106aa71bd 100644 --- a/src/conf/virstorageobj.h +++ b/src/conf/virstorageobj.h @@ -17,8 +17,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIRSTORAGEOBJ_H__ -# define __VIRSTORAGEOBJ_H__ +#ifndef LIBVIRT_VIRSTORAGEOBJ_H +# define LIBVIRT_VIRSTORAGEOBJ_H # include "internal.h" @@ -252,4 +252,4 @@ virStoragePoolObjListExport(virConnectPtr conn, virStoragePoolObjListFilter filter, unsigned int flags); -#endif /* __VIRSTORAGEOBJ_H__ */ +#endif /* LIBVIRT_VIRSTORAGEOBJ_H */ diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 592586d913..3446627e18 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_CPU_H__ -# define __VIR_CPU_H__ +#ifndef LIBVIRT_CPU_H +# define LIBVIRT_CPU_H # include "virerror.h" # include "datatypes.h" @@ -265,4 +265,4 @@ char *virCPUDataFormat(const virCPUData *data) virCPUDataPtr virCPUDataParse(const char *xmlStr) ATTRIBUTE_NONNULL(1); -#endif /* __VIR_CPU_H__ */ +#endif /* LIBVIRT_CPU_H */ diff --git a/src/cpu/cpu_arm.h b/src/cpu/cpu_arm.h index c77d102847..c1a8939a61 100644 --- a/src/cpu/cpu_arm.h +++ b/src/cpu/cpu_arm.h @@ -18,11 +18,11 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_CPU_ARM_H__ -# define __VIR_CPU_ARM_H__ +#ifndef LIBVIRT_CPU_ARM_H +# define LIBVIRT_CPU_ARM_H # include "cpu.h" extern struct cpuArchDriver cpuDriverArm; -#endif /* __VIR_CPU_ARM_H__ */ +#endif /* LIBVIRT_CPU_ARM_H */ diff --git a/src/cpu/cpu_map.h b/src/cpu/cpu_map.h index 130738b1ab..a7a7509b7e 100644 --- a/src/cpu/cpu_map.h +++ b/src/cpu/cpu_map.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_CPU_MAP_H__ -# define __VIR_CPU_MAP_H__ +#ifndef LIBVIRT_CPU_MAP_H +# define LIBVIRT_CPU_MAP_H # include "virxml.h" @@ -35,4 +35,4 @@ cpuMapLoad(const char *arch, cpuMapLoadCallback modelCB, void *data); -#endif /* __VIR_CPU_MAP_H__ */ +#endif /* LIBVIRT_CPU_MAP_H */ diff --git a/src/cpu/cpu_ppc64.h b/src/cpu/cpu_ppc64.h index 752f603cf6..18b8376bb7 100644 --- a/src/cpu/cpu_ppc64.h +++ b/src/cpu/cpu_ppc64.h @@ -18,11 +18,11 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_CPU_PPC64_H__ -# define __VIR_CPU_PPC64_H__ +#ifndef LIBVIRT_CPU_PPC64_H +# define LIBVIRT_CPU_PPC64_H # include "cpu.h" extern struct cpuArchDriver cpuDriverPPC64; -#endif /* __VIR_CPU_PPC64_H__ */ +#endif /* LIBVIRT_CPU_PPC64_H */ diff --git a/src/cpu/cpu_ppc64_data.h b/src/cpu/cpu_ppc64_data.h index ef89a3610b..2018cbbb6f 100644 --- a/src/cpu/cpu_ppc64_data.h +++ b/src/cpu/cpu_ppc64_data.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_CPU_PPC64_DATA_H__ -# define __VIR_CPU_PPC64_DATA_H__ +#ifndef LIBVIRT_CPU_PPC64_DATA_H +# define LIBVIRT_CPU_PPC64_DATA_H typedef struct _virCPUppc64PVR virCPUppc64PVR; @@ -36,4 +36,4 @@ struct _virCPUppc64Data { virCPUppc64PVR *pvr; }; -#endif /* __VIR_CPU_PPC64_DATA_H__ */ +#endif /* LIBVIRT_CPU_PPC64_DATA_H */ diff --git a/src/cpu/cpu_s390.h b/src/cpu/cpu_s390.h index 8a6ad9692c..4c45e1b32c 100644 --- a/src/cpu/cpu_s390.h +++ b/src/cpu/cpu_s390.h @@ -18,11 +18,11 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_CPU_S390X_H__ -# define __VIR_CPU_S390X_H__ +#ifndef LIBVIRT_CPU_S390_H +# define LIBVIRT_CPU_S390_H # include "cpu.h" extern struct cpuArchDriver cpuDriverS390; -#endif /* __VIR_CPU_S390X_H__ */ +#endif /* LIBVIRT_CPU_S390_H */ diff --git a/src/cpu/cpu_x86.h b/src/cpu/cpu_x86.h index b6ad687f85..dedf8dedfe 100644 --- a/src/cpu/cpu_x86.h +++ b/src/cpu/cpu_x86.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_CPU_X86_H__ -# define __VIR_CPU_X86_H__ +#ifndef LIBVIRT_CPU_X86_H +# define LIBVIRT_CPU_X86_H # include "cpu.h" # include "cpu_x86_data.h" @@ -40,4 +40,4 @@ int virCPUx86DataSetVendor(virCPUDataPtr cpuData, int virCPUx86DataAddFeature(virCPUDataPtr cpuData, const char *name); -#endif /* __VIR_CPU_X86_H__ */ +#endif /* LIBVIRT_CPU_X86_H */ diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h index 32da772002..f3cc3952ed 100644 --- a/src/cpu/cpu_x86_data.h +++ b/src/cpu/cpu_x86_data.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_CPU_X86_DATA_H__ -# define __VIR_CPU_X86_DATA_H__ +#ifndef LIBVIRT_CPU_X86_DATA_H +# define LIBVIRT_CPU_X86_DATA_H typedef struct _virCPUx86CPUID virCPUx86CPUID; @@ -74,4 +74,4 @@ struct _virCPUx86Data { virCPUx86CPUID *data; }; -#endif /* __VIR_CPU_X86_DATA_H__ */ +#endif /* LIBVIRT_CPU_X86_DATA_H */ diff --git a/src/datatypes.h b/src/datatypes.h index 08f1e033bb..529b340587 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_DATATYPES_H_ -# define __VIR_DATATYPES_H_ +#ifndef LIBVIRT_DATATYPES_H +# define LIBVIRT_DATATYPES_H # include "internal.h" @@ -777,4 +777,4 @@ int virAdmConnectCloseCallbackDataRegister(virAdmConnectCloseCallbackDataPtr cbd int virAdmConnectCloseCallbackDataUnregister(virAdmConnectCloseCallbackDataPtr cbdata, virAdmConnectCloseFunc cb); -#endif /* __VIR_DATATYPES_H_ */ +#endif /* LIBVIRT_DATATYPES_H */ diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h index 6be3e175ce..5315e33dde 100644 --- a/src/driver-hypervisor.h +++ b/src/driver-hypervisor.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_DRIVER_HYPERVISOR_H__ -# define __VIR_DRIVER_HYPERVISOR_H__ +#ifndef LIBVIRT_DRIVER_HYPERVISOR_H +# define LIBVIRT_DRIVER_HYPERVISOR_H # ifndef __VIR_DRIVER_H_INCLUDES___ # error "Don't include this file directly, only use driver.h" @@ -1583,4 +1583,4 @@ struct _virHypervisorDriver { }; -#endif /* __VIR_DRIVER_HYPERVISOR_H__ */ +#endif /* LIBVIRT_DRIVER_HYPERVISOR_H */ diff --git a/src/driver-interface.h b/src/driver-interface.h index 3f05a93325..5373f5e66a 100644 --- a/src/driver-interface.h +++ b/src/driver-interface.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_DRIVER_INTERFACE_H__ -# define __VIR_DRIVER_INTERFACE_H__ +#ifndef LIBVIRT_DRIVER_INTERFACE_H +# define LIBVIRT_DRIVER_INTERFACE_H # ifndef __VIR_DRIVER_H_INCLUDES___ # error "Don't include this file directly, only use driver.h" @@ -119,4 +119,4 @@ struct _virInterfaceDriver { }; -#endif /* __VIR_DRIVER_INTERFACE_H__ */ +#endif /* LIBVIRT_DRIVER_INTERFACE_H */ diff --git a/src/driver-network.h b/src/driver-network.h index e65117c49a..2715c7bfec 100644 --- a/src/driver-network.h +++ b/src/driver-network.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_DRIVER_NETWORK_H__ -# define __VIR_DRIVER_NETWORK_H__ +#ifndef LIBVIRT_DRIVER_NETWORK_H +# define LIBVIRT_DRIVER_NETWORK_H # ifndef __VIR_DRIVER_H_INCLUDES___ # error "Don't include this file directly, only use driver.h" @@ -154,4 +154,4 @@ struct _virNetworkDriver { }; -#endif /* __VIR_DRIVER_NETWORK_H__ */ +#endif /* LIBVIRT_DRIVER_NETWORK_H */ diff --git a/src/driver-nodedev.h b/src/driver-nodedev.h index 5eae2391c7..c506e846f6 100644 --- a/src/driver-nodedev.h +++ b/src/driver-nodedev.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_DRIVER_NODEDEV_H__ -# define __VIR_DRIVER_NODEDEV_H__ +#ifndef LIBVIRT_DRIVER_NODEDEV_H +# define LIBVIRT_DRIVER_NODEDEV_H # ifndef __VIR_DRIVER_H_INCLUDES___ # error "Don't include this file directly, only use driver.h" @@ -117,4 +117,4 @@ struct _virNodeDeviceDriver { }; -#endif /* __VIR_DRIVER_NODEDEV_H__ */ +#endif /* LIBVIRT_DRIVER_NODEDEV_H */ diff --git a/src/driver-nwfilter.h b/src/driver-nwfilter.h index 2c3e480a32..7bcb823f0a 100644 --- a/src/driver-nwfilter.h +++ b/src/driver-nwfilter.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_DRIVER_NWFILTER_H__ -# define __VIR_DRIVER_NWFILTER_H__ +#ifndef LIBVIRT_DRIVER_NWFILTER_H +# define LIBVIRT_DRIVER_NWFILTER_H # ifndef __VIR_DRIVER_H_INCLUDES___ # error "Don't include this file directly, only use driver.h" @@ -110,4 +110,4 @@ struct _virNWFilterDriver { }; -#endif /* __VIR_DRIVER_NWFILTER_H__ */ +#endif /* LIBVIRT_DRIVER_NWFILTER_H */ diff --git a/src/driver-secret.h b/src/driver-secret.h index 3cd9034b43..1dcae63880 100644 --- a/src/driver-secret.h +++ b/src/driver-secret.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_DRIVER_SECRET_H__ -# define __VIR_DRIVER_SECRET_H__ +#ifndef LIBVIRT_DRIVER_SECRET_H +# define LIBVIRT_DRIVER_SECRET_H # ifndef __VIR_DRIVER_H_INCLUDES___ # error "Don't include this file directly, only use driver.h" @@ -115,4 +115,4 @@ struct _virSecretDriver { }; -#endif /* __VIR_DRIVER_SECRET_H__ */ +#endif /* LIBVIRT_DRIVER_SECRET_H */ diff --git a/src/driver-state.h b/src/driver-state.h index 1cb3e4faf3..54ca17b260 100644 --- a/src/driver-state.h +++ b/src/driver-state.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_DRIVER_STATE_H__ -# define __VIR_DRIVER_STATE_H__ +#ifndef LIBVIRT_DRIVER_STATE_H +# define LIBVIRT_DRIVER_STATE_H # ifndef __VIR_DRIVER_H_INCLUDES___ # error "Don't include this file directly, only use driver.h" @@ -55,4 +55,4 @@ struct _virStateDriver { }; -#endif /* __VIR_DRIVER_STATE_H__ */ +#endif /* LIBVIRT_DRIVER_STATE_H */ diff --git a/src/driver-storage.h b/src/driver-storage.h index 146eb88b2c..35bd99a20c 100644 --- a/src/driver-storage.h +++ b/src/driver-storage.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_DRIVER_STORAGE_H__ -# define __VIR_DRIVER_STORAGE_H__ +#ifndef LIBVIRT_DRIVER_STORAGE_H +# define LIBVIRT_DRIVER_STORAGE_H # ifndef __VIR_DRIVER_H_INCLUDES___ # error "Don't include this file directly, only use driver.h" @@ -276,4 +276,4 @@ struct _virStorageDriver { }; -#endif /* __VIR_DRIVER_STORAGE_H__ */ +#endif /* LIBVIRT_DRIVER_STORAGE_H */ diff --git a/src/driver-stream.h b/src/driver-stream.h index f207bf0ebd..4978f90d2d 100644 --- a/src/driver-stream.h +++ b/src/driver-stream.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_DRIVER_STREAM_H__ -# define __VIR_DRIVER_STREAM_H__ +#ifndef LIBVIRT_DRIVER_STREAM_H +# define LIBVIRT_DRIVER_STREAM_H # ifndef __VIR_DRIVER_H_INCLUDES___ # error "Don't include this file directly, only use driver.h" @@ -94,4 +94,4 @@ struct _virStreamDriver { }; -#endif /* __VIR_DRIVER_STREAM_H__ */ +#endif /* LIBVIRT_DRIVER_STREAM_H */ diff --git a/src/driver.h b/src/driver.h index 83888921c0..6472bd9367 100644 --- a/src/driver.h +++ b/src/driver.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_DRIVER_H__ -# define __VIR_DRIVER_H__ +#ifndef LIBVIRT_DRIVER_H +# define LIBVIRT_DRIVER_H # include <unistd.h> @@ -127,4 +127,4 @@ int virSetConnectNodeDev(virConnectPtr conn); int virSetConnectSecret(virConnectPtr conn); int virSetConnectStorage(virConnectPtr conn); -#endif /* __VIR_DRIVER_H__ */ +#endif /* LIBVIRT_DRIVER_H */ diff --git a/src/esx/esx_driver.h b/src/esx/esx_driver.h index 0de6a648c2..6c8f32c9d6 100644 --- a/src/esx/esx_driver.h +++ b/src/esx/esx_driver.h @@ -20,9 +20,9 @@ * */ -#ifndef __ESX_DRIVER_H__ -# define __ESX_DRIVER_H__ +#ifndef LIBVIRT_ESX_DRIVER_H +# define LIBVIRT_ESX_DRIVER_H int esxRegister(void); -#endif /* __ESX_DRIVER_H__ */ +#endif /* LIBVIRT_ESX_DRIVER_H */ diff --git a/src/esx/esx_interface_driver.h b/src/esx/esx_interface_driver.h index dfe245bb89..20e4fe60d0 100644 --- a/src/esx/esx_interface_driver.h +++ b/src/esx/esx_interface_driver.h @@ -20,11 +20,11 @@ * */ -#ifndef __ESX_INTERFACE_DRIVER_H__ -# define __ESX_INTERFACE_DRIVER_H__ +#ifndef LIBVIRT_ESX_INTERFACE_DRIVER_H +# define LIBVIRT_ESX_INTERFACE_DRIVER_H # include "driver.h" extern virInterfaceDriver esxInterfaceDriver; -#endif /* __ESX_INTERFACE_DRIVER_H__ */ +#endif /* LIBVIRT_ESX_INTERFACE_DRIVER_H */ diff --git a/src/esx/esx_network_driver.h b/src/esx/esx_network_driver.h index d5bf0dd952..c977a1abcf 100644 --- a/src/esx/esx_network_driver.h +++ b/src/esx/esx_network_driver.h @@ -20,11 +20,11 @@ * */ -#ifndef __ESX_NETWORK_DRIVER_H__ -# define __ESX_NETWORK_DRIVER_H__ +#ifndef LIBVIRT_ESX_NETWORK_DRIVER_H +# define LIBVIRT_ESX_NETWORK_DRIVER_H # include "driver.h" extern virNetworkDriver esxNetworkDriver; -#endif /* __ESX_NETWORK_DRIVER_H__ */ +#endif /* LIBVIRT_ESX_NETWORK_DRIVER_H */ diff --git a/src/esx/esx_private.h b/src/esx/esx_private.h index f2766eb0a6..abb4567e8f 100644 --- a/src/esx/esx_private.h +++ b/src/esx/esx_private.h @@ -19,8 +19,8 @@ * */ -#ifndef __ESX_PRIVATE_H__ -# define __ESX_PRIVATE_H__ +#ifndef LIBVIRT_ESX_PRIVATE_H +# define LIBVIRT_ESX_PRIVATE_H # include "internal.h" # include "virerror.h" @@ -42,4 +42,4 @@ typedef struct _esxPrivate { int32_t usedCpuTimeCounterId; } esxPrivate; -#endif /* __ESX_PRIVATE_H__ */ +#endif /* LIBVIRT_ESX_PRIVATE_H */ diff --git a/src/esx/esx_storage_backend_iscsi.h b/src/esx/esx_storage_backend_iscsi.h index da461c1cd0..09ca4ac813 100644 --- a/src/esx/esx_storage_backend_iscsi.h +++ b/src/esx/esx_storage_backend_iscsi.h @@ -19,11 +19,11 @@ * */ -#ifndef __ESX_STORAGE_BACKEND_ISCSI_H__ -# define __ESX_STORAGE_BACKEND_ISCSI_H__ +#ifndef LIBVIRT_ESX_STORAGE_BACKEND_ISCSI_H +# define LIBVIRT_ESX_STORAGE_BACKEND_ISCSI_H # include "driver.h" extern virStorageDriver esxStorageBackendISCSI; -#endif /* __ESX_STORAGE_BACKEND_ISCSI_H__ */ +#endif /* LIBVIRT_ESX_STORAGE_BACKEND_ISCSI_H */ diff --git a/src/esx/esx_storage_backend_vmfs.h b/src/esx/esx_storage_backend_vmfs.h index 4dad9bcd9a..67b8af38cc 100644 --- a/src/esx/esx_storage_backend_vmfs.h +++ b/src/esx/esx_storage_backend_vmfs.h @@ -20,11 +20,11 @@ * */ -#ifndef __ESX_STORAGE_BACKEND_VMFS_H__ -# define __ESX_STORAGE_BACKEND_VMFS_H__ +#ifndef LIBVIRT_ESX_STORAGE_BACKEND_VMFS_H +# define LIBVIRT_ESX_STORAGE_BACKEND_VMFS_H # include "driver.h" extern virStorageDriver esxStorageBackendVMFS; -#endif /* __ESX_STORAGE_BACKEND_VMFS_H__ */ +#endif /* LIBVIRT_ESX_STORAGE_BACKEND_VMFS_H */ diff --git a/src/esx/esx_storage_driver.h b/src/esx/esx_storage_driver.h index eee3c5c51e..73110cf8e6 100644 --- a/src/esx/esx_storage_driver.h +++ b/src/esx/esx_storage_driver.h @@ -20,11 +20,11 @@ * */ -#ifndef __ESX_STORAGE_DRIVER_H__ -# define __ESX_STORAGE_DRIVER_H__ +#ifndef LIBVIRT_ESX_STORAGE_DRIVER_H +# define LIBVIRT_ESX_STORAGE_DRIVER_H # include "driver.h" extern virStorageDriver esxStorageDriver; -#endif /* __ESX_STORAGE_DRIVER_H__ */ +#endif /* LIBVIRT_ESX_STORAGE_DRIVER_H */ diff --git a/src/esx/esx_stream.h b/src/esx/esx_stream.h index 542a75ef67..f00b4443aa 100644 --- a/src/esx/esx_stream.h +++ b/src/esx/esx_stream.h @@ -19,8 +19,8 @@ * */ -#ifndef __ESX_STREAM_H__ -# define __ESX_STREAM_H__ +#ifndef LIBVIRT_ESX_STREAM_H +# define LIBVIRT_ESX_STREAM_H # include "internal.h" # include "esx_private.h" @@ -29,4 +29,4 @@ int esxStreamOpenUpload(virStreamPtr stream, esxPrivate *priv, const char *url); int esxStreamOpenDownload(virStreamPtr stream, esxPrivate *priv, const char *url, unsigned long long offset, unsigned long long length); -#endif /* __ESX_STREAM_H__ */ +#endif /* LIBVIRT_ESX_STREAM_H */ diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h index df246445d2..163626688e 100644 --- a/src/esx/esx_util.h +++ b/src/esx/esx_util.h @@ -19,8 +19,8 @@ * */ -#ifndef __ESX_UTIL_H__ -# define __ESX_UTIL_H__ +#ifndef LIBVIRT_ESX_UTIL_H +# define LIBVIRT_ESX_UTIL_H # include <netdb.h> # include "internal.h" @@ -70,4 +70,4 @@ char *esxUtil_EscapeDatastoreItem(const char *string); char *esxUtil_EscapeForXml(const char *string); -#endif /* __ESX_UTIL_H__ */ +#endif /* LIBVIRT_ESX_UTIL_H */ diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 515024bb75..ff2abfb034 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -20,8 +20,8 @@ * */ -#ifndef __ESX_VI_H__ -# define __ESX_VI_H__ +#ifndef LIBVIRT_ESX_VI_H +# define LIBVIRT_ESX_VI_H # include <libxml/tree.h> # include <libxml/xpath.h> @@ -532,4 +532,4 @@ int esxVI_LookupStoragePoolNameByScsiLunKey(esxVI_Context *ctx, const char *key, # include "esx_vi.generated.h" -#endif /* __ESX_VI_H__ */ +#endif /* LIBVIRT_ESX_VI_H */ diff --git a/src/esx/esx_vi_methods.h b/src/esx/esx_vi_methods.h index a68ff1bb8d..b09f64ba48 100644 --- a/src/esx/esx_vi_methods.h +++ b/src/esx/esx_vi_methods.h @@ -19,8 +19,8 @@ * */ -#ifndef __ESX_VI_METHODS_H__ -# define __ESX_VI_METHODS_H__ +#ifndef LIBVIRT_ESX_VI_METHODS_H +# define LIBVIRT_ESX_VI_METHODS_H # include "esx_vi.h" # include "esx_vi_types.h" @@ -46,4 +46,4 @@ int esxVI_ValidateMigration # include "esx_vi_methods.generated.h" -#endif /* __ESX_VI_METHODS_H__ */ +#endif /* LIBVIRT_ESX_VI_METHODS_H */ diff --git a/src/esx/esx_vi_types.h b/src/esx/esx_vi_types.h index 66a5705c87..d43e825a48 100644 --- a/src/esx/esx_vi_types.h +++ b/src/esx/esx_vi_types.h @@ -19,8 +19,8 @@ * */ -#ifndef __ESX_VI_TYPES_H__ -# define __ESX_VI_TYPES_H__ +#ifndef LIBVIRT_ESX_VI_TYPES_H +# define LIBVIRT_ESX_VI_TYPES_H # include "virbuffer.h" @@ -420,4 +420,4 @@ int esxVI_Event_DeserializeList(xmlNodePtr node, esxVI_Event **list); int esxVI_VirtualMachinePowerState_ConvertToLibvirt (esxVI_VirtualMachinePowerState powerState); -#endif /* __ESX_VI_TYPES_H__ */ +#endif /* LIBVIRT_ESX_VI_TYPES_H */ diff --git a/src/hyperv/hyperv_driver.h b/src/hyperv/hyperv_driver.h index e7c249a328..f333fba3e1 100644 --- a/src/hyperv/hyperv_driver.h +++ b/src/hyperv/hyperv_driver.h @@ -20,9 +20,9 @@ * */ -#ifndef __HYPERV_DRIVER_H__ -# define __HYPERV_DRIVER_H__ +#ifndef LIBVIRT_HYPERV_DRIVER_H +# define LIBVIRT_HYPERV_DRIVER_H int hypervRegister(void); -#endif /* __HYPERV_DRIVER_H__ */ +#endif /* LIBVIRT_HYPERV_DRIVER_H */ diff --git a/src/hyperv/hyperv_private.h b/src/hyperv/hyperv_private.h index 4e7069971f..f8d8f7deff 100644 --- a/src/hyperv/hyperv_private.h +++ b/src/hyperv/hyperv_private.h @@ -20,8 +20,8 @@ * */ -#ifndef __HYPERV_PRIVATE_H__ -# define __HYPERV_PRIVATE_H__ +#ifndef LIBVIRT_HYPERV_PRIVATE_H +# define LIBVIRT_HYPERV_PRIVATE_H # include "internal.h" # include "virerror.h" @@ -41,4 +41,4 @@ struct _hypervPrivate { hypervWmiVersion wmiVersion; }; -#endif /* __HYPERV_PRIVATE_H__ */ +#endif /* LIBVIRT_HYPERV_PRIVATE_H */ diff --git a/src/hyperv/hyperv_util.h b/src/hyperv/hyperv_util.h index ededa3166f..c72a308da9 100644 --- a/src/hyperv/hyperv_util.h +++ b/src/hyperv/hyperv_util.h @@ -19,8 +19,8 @@ * */ -#ifndef __HYPERV_UTIL_H__ -# define __HYPERV_UTIL_H__ +#ifndef LIBVIRT_HYPERV_UTIL_H +# define LIBVIRT_HYPERV_UTIL_H # include "internal.h" # include "viruri.h" @@ -35,4 +35,4 @@ int hypervParseUri(hypervParsedUri **parsedUri, virURIPtr uri); void hypervFreeParsedUri(hypervParsedUri **parsedUri); -#endif /* __HYPERV_UTIL_H__ */ +#endif /* LIBVIRT_HYPERV_UTIL_H */ diff --git a/src/hyperv/hyperv_wmi.h b/src/hyperv/hyperv_wmi.h index cc5307829c..e3ace01131 100644 --- a/src/hyperv/hyperv_wmi.h +++ b/src/hyperv/hyperv_wmi.h @@ -21,8 +21,8 @@ * */ -#ifndef __HYPERV_WMI_H__ -# define __HYPERV_WMI_H__ +#ifndef LIBVIRT_HYPERV_WMI_H +# define LIBVIRT_HYPERV_WMI_H # include "virbuffer.h" # include "hyperv_private.h" @@ -253,4 +253,4 @@ int hypervMsvmComputerSystemToDomain(virConnectPtr conn, int hypervMsvmComputerSystemFromDomain(virDomainPtr domain, Msvm_ComputerSystem **computerSystem); -#endif /* __HYPERV_WMI_H__ */ +#endif /* LIBVIRT_HYPERV_WMI_H */ diff --git a/src/hyperv/hyperv_wmi_classes.h b/src/hyperv/hyperv_wmi_classes.h index ce4643e9d3..cf2ae75447 100644 --- a/src/hyperv/hyperv_wmi_classes.h +++ b/src/hyperv/hyperv_wmi_classes.h @@ -21,8 +21,8 @@ * */ -#ifndef __HYPERV_WMI_CLASSES_H__ -# define __HYPERV_WMI_CLASSES_H__ +#ifndef LIBVIRT_HYPERV_WMI_CLASSES_H +# define LIBVIRT_HYPERV_WMI_CLASSES_H # include "internal.h" # include "openwsman.h" @@ -140,4 +140,4 @@ struct _hypervWmiClassInfoList { # include "hyperv_wmi_classes.generated.h" -#endif /* __HYPERV_WMI_CLASSES_H__ */ +#endif /* LIBVIRT_HYPERV_WMI_CLASSES_H */ diff --git a/src/hyperv/openwsman.h b/src/hyperv/openwsman.h index fc2958f539..3f19a8f890 100644 --- a/src/hyperv/openwsman.h +++ b/src/hyperv/openwsman.h @@ -19,8 +19,8 @@ * */ -#ifndef __OPENWSMAN_H__ -# define __OPENWSMAN_H__ +#ifndef LIBVIRT_OPENWSMAN_H +# define LIBVIRT_OPENWSMAN_H /* Workaround openwsman <= 2.2.6 unconditionally defining optarg. Just pretend * that u/os.h was already included. Need to explicitly include time.h because @@ -47,4 +47,4 @@ WsXmlDocH ws_xml_create_doc(const char *rootNsUri, const char *rootName); WsXmlNodeH xml_parser_get_root(WsXmlDocH doc); -#endif /* __OPENWSMAN_H__ */ +#endif /* LIBVIRT_OPENWSMAN_H */ diff --git a/src/interface/interface_driver.h b/src/interface/interface_driver.h index 575f297953..242e00a824 100644 --- a/src/interface/interface_driver.h +++ b/src/interface/interface_driver.h @@ -18,12 +18,12 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_INTERFACE__DRIVER_H -# define __VIR_INTERFACE__DRIVER_H +#ifndef LIBVIRT_INTERFACE_DRIVER_H +# define LIBVIRT_INTERFACE_DRIVER_H int interfaceRegister(void); int netcfIfaceRegister(void); int udevIfaceRegister(void); -#endif /* __VIR_INTERFACE__DRIVER_H */ +#endif /* LIBVIRT_INTERFACE_DRIVER_H */ diff --git a/src/internal.h b/src/internal.h index fb2b56b662..3f3e567ac9 100644 --- a/src/internal.h +++ b/src/internal.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_INTERNAL_H__ -# define __VIR_INTERNAL_H__ +#ifndef LIBVIRT_INTERNAL_H +# define LIBVIRT_INTERNAL_H # include <errno.h> # include <limits.h> @@ -513,4 +513,4 @@ enum { # define ENODATA EIO # endif -#endif /* __VIR_INTERNAL_H__ */ +#endif /* LIBVIRT_INTERNAL_H */ diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index 5d60f2654d..8be1257814 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -22,8 +22,8 @@ * include/libvirt/libvirt.h apply. ie this file is *append* only */ -#ifndef __LIBVIRT_H_ -# define __LIBVIRT_H_ +#ifndef LIBVIRT_LIBVIRT_INTERNAL_H +# define LIBVIRT_LIBVIRT_INTERNAL_H # include "internal.h" @@ -298,4 +298,4 @@ int virStreamInData(virStreamPtr stream, int *data, long long *length); -#endif /* __LIBVIRT_H_ */ +#endif /* LIBVIRT_LIBVIRT_INTERNAL_H */ diff --git a/src/libxl/libxl_capabilities.h b/src/libxl/libxl_capabilities.h index 7d3fc3e183..be41682206 100644 --- a/src/libxl/libxl_capabilities.h +++ b/src/libxl/libxl_capabilities.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef LIBXL_CAPABILITIES_H -# define LIBXL_CAPABILITIES_H +#ifndef LIBVIRT_LIBXL_CAPABILITIES_H +# define LIBVIRT_LIBXL_CAPABILITIES_H # include <libxl.h> @@ -52,4 +52,4 @@ libxlMakeDomainCapabilities(virDomainCapsPtr domCaps, int libxlDomainGetEmulatorType(const virDomainDef *def); -#endif /* LIBXL_CAPABILITIES_H */ +#endif /* LIBVIRT_LIBXL_CAPABILITIES_H */ diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index f7364597ed..fee94241af 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef LIBXL_CONF_H -# define LIBXL_CONF_H +#ifndef LIBVIRT_LIBXL_CONF_H +# define LIBVIRT_LIBXL_CONF_H # include <libxl.h> @@ -228,4 +228,4 @@ libxlDriverUnlock(libxlDriverPrivatePtr driver) virMutexUnlock(&driver->lock); } -#endif /* LIBXL_CONF_H */ +#endif /* LIBVIRT_LIBXL_CONF_H */ diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 40c15f9d24..a3f7a3e04b 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef LIBXL_DOMAIN_H -# define LIBXL_DOMAIN_H +#ifndef LIBVIRT_LIBXL_DOMAIN_H +# define LIBVIRT_LIBXL_DOMAIN_H # include <libxl.h> @@ -156,4 +156,4 @@ libxlDomainDefCheckABIStability(libxlDriverPrivatePtr driver, virDomainDefPtr src, virDomainDefPtr dst); -#endif /* LIBXL_DOMAIN_H */ +#endif /* LIBVIRT_LIBXL_DOMAIN_H */ diff --git a/src/libxl/libxl_driver.h b/src/libxl/libxl_driver.h index db161760f5..23b3ed2910 100644 --- a/src/libxl/libxl_driver.h +++ b/src/libxl/libxl_driver.h @@ -18,9 +18,9 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef LIBXL_DRIVER_H -# define LIBXL_DRIVER_H +#ifndef LIBVIRT_LIBXL_DRIVER_H +# define LIBVIRT_LIBXL_DRIVER_H int libxlRegister(void); -#endif /* LIBXL_DRIVER_H */ +#endif /* LIBVIRT_LIBXL_DRIVER_H */ diff --git a/src/libxl/libxl_logger.h b/src/libxl/libxl_logger.h index 6b7adf816c..678009eba8 100644 --- a/src/libxl/libxl_logger.h +++ b/src/libxl/libxl_logger.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __LIBXL_LOGGER_H -# define __LIBXL_LOGGER_H +#ifndef LIBVIRT_LIBXL_LOGGER_H +# define LIBVIRT_LIBXL_LOGGER_H # include "util/virlog.h" @@ -34,4 +34,4 @@ void libxlLoggerOpenFile(libxlLoggerPtr logger, int id, const char *name, const char *domain_config); void libxlLoggerCloseFile(libxlLoggerPtr logger, int id); -#endif /* __LIBXL_LOGGER_H */ +#endif /* LIBVIRT_LIBXL_LOGGER_H */ diff --git a/src/libxl/libxl_migration.h b/src/libxl/libxl_migration.h index 954968deef..5aea16b741 100644 --- a/src/libxl/libxl_migration.h +++ b/src/libxl/libxl_migration.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef LIBXL_MIGRATION_H -# define LIBXL_MIGRATION_H +#ifndef LIBVIRT_LIBXL_MIGRATION_H +# define LIBVIRT_LIBXL_MIGRATION_H # include "libxl_conf.h" @@ -98,4 +98,4 @@ libxlDomainMigrationSrcConfirm(libxlDriverPrivatePtr driver, unsigned int flags, int cancelled); -#endif /* LIBXL_MIGRATION_H */ +#endif /* LIBVIRT_LIBXL_MIGRATION_H */ diff --git a/src/locking/domain_lock.h b/src/locking/domain_lock.h index fb4910230c..027e93271a 100644 --- a/src/locking/domain_lock.h +++ b/src/locking/domain_lock.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_DOMAIN_LOCK_H__ -# define __VIR_DOMAIN_LOCK_H__ +#ifndef LIBVIRT_DOMAIN_LOCK_H +# define LIBVIRT_DOMAIN_LOCK_H # include "internal.h" # include "domain_conf.h" @@ -66,4 +66,4 @@ int virDomainLockLeaseDetach(virLockManagerPluginPtr plugin, virDomainObjPtr dom, virDomainLeaseDefPtr lease); -#endif /* __VIR_DOMAIN_LOCK_H__ */ +#endif /* LIBVIRT_DOMAIN_LOCK_H */ diff --git a/src/locking/lock_daemon.h b/src/locking/lock_daemon.h index 7cdf79fb69..5c7f976ea4 100644 --- a/src/locking/lock_daemon.h +++ b/src/locking/lock_daemon.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LOCK_DAEMON_H__ -# define __VIR_LOCK_DAEMON_H__ +#ifndef LIBVIRT_LOCK_DAEMON_H +# define LIBVIRT_LOCK_DAEMON_H # include "virlockspace.h" # include "virthread.h" @@ -51,4 +51,4 @@ int virLockDaemonAddLockSpace(virLockDaemonPtr lockd, virLockSpacePtr virLockDaemonFindLockSpace(virLockDaemonPtr lockd, const char *path); -#endif /* __VIR_LOCK_DAEMON_H__ */ +#endif /* LIBVIRT_LOCK_DAEMON_H */ diff --git a/src/locking/lock_daemon_config.h b/src/locking/lock_daemon_config.h index cda71311f5..e820d60268 100644 --- a/src/locking/lock_daemon_config.h +++ b/src/locking/lock_daemon_config.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LOCK_DAEMON_CONFIG_H__ -# define __VIR_LOCK_DAEMON_CONFIG_H__ +#ifndef LIBVIRT_LOCK_DAEMON_CONFIG_H +# define LIBVIRT_LOCK_DAEMON_CONFIG_H # include "internal.h" @@ -43,4 +43,4 @@ int virLockDaemonConfigLoadFile(virLockDaemonConfigPtr data, const char *filename, bool allow_missing); -#endif /* __VIR_LOCK_DAEMON_CONFIG_H__ */ +#endif /* LIBVIRT_LOCK_DAEMON_CONFIG_H */ diff --git a/src/locking/lock_daemon_dispatch.h b/src/locking/lock_daemon_dispatch.h index 153f22b1ca..568a7e0160 100644 --- a/src/locking/lock_daemon_dispatch.h +++ b/src/locking/lock_daemon_dispatch.h @@ -18,12 +18,12 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LOCK_DAEMON_DISPATCH_H__ -# define __VIR_LOCK_DAEMON_DISPATCH_H__ +#ifndef LIBVIRT_LOCK_DAEMON_DISPATCH_H +# define LIBVIRT_LOCK_DAEMON_DISPATCH_H # include "rpc/virnetserverprogram.h" extern virNetServerProgramProc virLockSpaceProtocolProcs[]; extern size_t virLockSpaceProtocolNProcs; -#endif /* __VIR_LOCK_DAEMON_DISPATCH_H__ */ +#endif /* LIBVIRT_LOCK_DAEMON_DISPATCH_H */ diff --git a/src/locking/lock_driver.h b/src/locking/lock_driver.h index 8b7cccc521..f2d5266517 100644 --- a/src/locking/lock_driver.h +++ b/src/locking/lock_driver.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_PLUGINS_LOCK_DRIVER_H__ -# define __VIR_PLUGINS_LOCK_DRIVER_H__ +#ifndef LIBVIRT_LOCK_DRIVER_H +# define LIBVIRT_LOCK_DRIVER_H # include "internal.h" # include "domain_conf.h" @@ -316,4 +316,4 @@ struct _virLockDriver { }; -#endif /* __VIR_PLUGINS_LOCK_DRIVER_H__ */ +#endif /* LIBVIRT_LOCK_DRIVER_H */ diff --git a/src/locking/lock_driver_lockd.h b/src/locking/lock_driver_lockd.h index 6931fe7425..d79d5e738a 100644 --- a/src/locking/lock_driver_lockd.h +++ b/src/locking/lock_driver_lockd.h @@ -19,12 +19,12 @@ * */ -#ifndef __VIR_LOCK_DRIVER_LOCKD_H__ -# define __VIR_LOCK_DRIVER_LOCKD_H__ +#ifndef LIBVIRT_LOCK_DRIVER_LOCKD_H +# define LIBVIRT_LOCK_DRIVER_LOCKD_H enum virLockSpaceProtocolAcquireResourceFlags { VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_SHARED = (1 << 0), VIR_LOCK_SPACE_PROTOCOL_ACQUIRE_RESOURCE_AUTOCREATE = (1 << 1), }; -#endif /* __VIR_LOCK_DRIVER_LOCKD_H__ */ +#endif /* LIBVIRT_LOCK_DRIVER_LOCKD_H */ diff --git a/src/locking/lock_driver_nop.h b/src/locking/lock_driver_nop.h index 12996321fa..2443072e3d 100644 --- a/src/locking/lock_driver_nop.h +++ b/src/locking/lock_driver_nop.h @@ -19,12 +19,12 @@ * */ -#ifndef __VIR_LOCK_DRIVER_NOP_H__ -# define __VIR_LOCK_DRIVER_NOP_H__ +#ifndef LIBVIRT_LOCK_DRIVER_NOP_H +# define LIBVIRT_LOCK_DRIVER_NOP_H # include "lock_driver.h" extern virLockDriver virLockDriverNop; -#endif /* __VIR_LOCK_DRIVER_NOP_H__ */ +#endif /* LIBVIRT_LOCK_DRIVER_NOP_H */ diff --git a/src/locking/lock_manager.h b/src/locking/lock_manager.h index 418975976c..71d3909709 100644 --- a/src/locking/lock_manager.h +++ b/src/locking/lock_manager.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_LOCK_MANAGER_H__ -# define __VIR_LOCK_MANAGER_H__ +#ifndef LIBVIRT_LOCK_MANAGER_H +# define LIBVIRT_LOCK_MANAGER_H # include "internal.h" # include "lock_driver.h" @@ -67,4 +67,4 @@ int virLockManagerInquire(virLockManagerPtr manager, int virLockManagerFree(virLockManagerPtr manager); -#endif /* __VIR_LOCK_MANAGER_H__ */ +#endif /* LIBVIRT_LOCK_MANAGER_H */ diff --git a/src/logging/log_daemon.h b/src/logging/log_daemon.h index 7634f9e7fb..27f6af72cf 100644 --- a/src/logging/log_daemon.h +++ b/src/logging/log_daemon.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LOG_DAEMON_H__ -# define __VIR_LOG_DAEMON_H__ +#ifndef LIBVIRT_LOG_DAEMON_H +# define LIBVIRT_LOG_DAEMON_H # include "virthread.h" # include "log_handler.h" @@ -40,4 +40,4 @@ extern virLogDaemonPtr logDaemon; virLogHandlerPtr virLogDaemonGetHandler(virLogDaemonPtr dmn); -#endif /* __VIR_LOG_DAEMON_H__ */ +#endif /* LIBVIRT_LOG_DAEMON_H */ diff --git a/src/logging/log_daemon_config.h b/src/logging/log_daemon_config.h index 12610ba7ac..2508e4c918 100644 --- a/src/logging/log_daemon_config.h +++ b/src/logging/log_daemon_config.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LOG_DAEMON_CONFIG_H__ -# define __VIR_LOG_DAEMON_CONFIG_H__ +#ifndef LIBVIRT_LOG_DAEMON_CONFIG_H +# define LIBVIRT_LOG_DAEMON_CONFIG_H # include "internal.h" @@ -46,4 +46,4 @@ int virLogDaemonConfigLoadFile(virLogDaemonConfigPtr data, const char *filename, bool allow_missing); -#endif /* __VIR_LOG_DAEMON_CONFIG_H__ */ +#endif /* LIBVIRT_LOG_DAEMON_CONFIG_H */ diff --git a/src/logging/log_daemon_dispatch.h b/src/logging/log_daemon_dispatch.h index 13101c4fea..8471d6798f 100644 --- a/src/logging/log_daemon_dispatch.h +++ b/src/logging/log_daemon_dispatch.h @@ -18,12 +18,12 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LOG_DAEMON_DISPATCH_H__ -# define __VIR_LOG_DAEMON_DISPATCH_H__ +#ifndef LIBVIRT_LOG_DAEMON_DISPATCH_H +# define LIBVIRT_LOG_DAEMON_DISPATCH_H # include "rpc/virnetserverprogram.h" extern virNetServerProgramProc virLogManagerProtocolProcs[]; extern size_t virLogManagerProtocolNProcs; -#endif /* __VIR_LOG_DAEMON_DISPATCH_H__ */ +#endif /* LIBVIRT_LOG_DAEMON_DISPATCH_H */ diff --git a/src/logging/log_handler.h b/src/logging/log_handler.h index 670504bec4..db202f7091 100644 --- a/src/logging/log_handler.h +++ b/src/logging/log_handler.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LOG_HANDLER_H__ -# define __VIR_LOG_HANDLER_H__ +#ifndef LIBVIRT_LOG_HANDLER_H +# define LIBVIRT_LOG_HANDLER_H # include "internal.h" # include "virjson.h" @@ -77,4 +77,4 @@ int virLogHandlerDomainAppendLogFile(virLogHandlerPtr handler, virJSONValuePtr virLogHandlerPreExecRestart(virLogHandlerPtr handler); -#endif /* __VIR_LOG_HANDLER_H__ */ +#endif /* LIBVIRT_LOG_HANDLER_H */ diff --git a/src/logging/log_manager.h b/src/logging/log_manager.h index a16f3b1989..d796971ef8 100644 --- a/src/logging/log_manager.h +++ b/src/logging/log_manager.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LOG_MANAGER_H__ -# define __VIR_LOG_MANAGER_H__ +#ifndef LIBVIRT_LOG_MANAGER_H +# define LIBVIRT_LOG_MANAGER_H # include "internal.h" @@ -62,4 +62,4 @@ int virLogManagerDomainAppendMessage(virLogManagerPtr mgr, const char *message, unsigned int flags); -#endif /* __VIR_LOG_MANAGER_H__ */ +#endif /* LIBVIRT_LOG_MANAGER_H */ diff --git a/src/lxc/lxc_cgroup.h b/src/lxc/lxc_cgroup.h index e85f21c47d..8b32ca1ede 100644 --- a/src/lxc/lxc_cgroup.h +++ b/src/lxc/lxc_cgroup.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_LXC_CGROUP_H__ -# define __VIR_LXC_CGROUP_H__ +#ifndef LIBVIRT_LXC_CGROUP_H +# define LIBVIRT_LXC_CGROUP_H # include "vircgroup.h" # include "domain_conf.h" @@ -48,4 +48,4 @@ virLXCTeardownHostUSBDeviceCgroup(virUSBDevicePtr dev, const char *path, void *opaque); -#endif /* __VIR_LXC_CGROUP_H__ */ +#endif /* LIBVIRT_LXC_CGROUP_H */ diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h index eecc4c7c0b..d6a1f1ca10 100644 --- a/src/lxc/lxc_conf.h +++ b/src/lxc/lxc_conf.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef LXC_CONF_H -# define LXC_CONF_H +#ifndef LIBVIRT_LXC_CONF_H +# define LIBVIRT_LXC_CONF_H # include "internal.h" # include "libvirt_internal.h" @@ -121,4 +121,4 @@ static inline void lxcDriverUnlock(virLXCDriverPtr driver) virMutexUnlock(&driver->lock); } -#endif /* LXC_CONF_H */ +#endif /* LIBVIRT_LXC_CONF_H */ diff --git a/src/lxc/lxc_container.h b/src/lxc/lxc_container.h index d647a629fc..240c79d5ac 100644 --- a/src/lxc/lxc_container.h +++ b/src/lxc/lxc_container.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef LXC_CONTAINER_H -# define LXC_CONTAINER_H +#ifndef LIBVIRT_LXC_CONTAINER_H +# define LIBVIRT_LXC_CONTAINER_H # include "lxc_conf.h" # include "lxc_domain.h" @@ -65,4 +65,4 @@ int lxcContainerChown(virDomainDefPtr def, const char *path); bool lxcIsBasicMountLocation(const char *path); -#endif /* LXC_CONTAINER_H */ +#endif /* LIBVIRT_LXC_CONTAINER_H */ diff --git a/src/lxc/lxc_domain.h b/src/lxc/lxc_domain.h index 77ec523a63..364b8e5a44 100644 --- a/src/lxc/lxc_domain.h +++ b/src/lxc/lxc_domain.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __LXC_DOMAIN_H__ -# define __LXC_DOMAIN_H__ +#ifndef LIBVIRT_LXC_DOMAIN_H +# define LIBVIRT_LXC_DOMAIN_H # include "vircgroup.h" # include "lxc_conf.h" @@ -109,4 +109,4 @@ virLXCDomainObjEndJob(virLXCDriverPtr driver, char * virLXCDomainGetMachineName(virDomainDefPtr def, pid_t pid); -#endif /* __LXC_DOMAIN_H__ */ +#endif /* LIBVIRT_LXC_DOMAIN_H */ diff --git a/src/lxc/lxc_driver.h b/src/lxc/lxc_driver.h index 851fc2d85d..4af9bb966e 100644 --- a/src/lxc/lxc_driver.h +++ b/src/lxc/lxc_driver.h @@ -18,10 +18,10 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef LXC_DRIVER_H -# define LXC_DRIVER_H +#ifndef LIBVIRT_LXC_DRIVER_H +# define LIBVIRT_LXC_DRIVER_H /* Function declarations */ int lxcRegister(void); -#endif /* LXC_DRIVER_H */ +#endif /* LIBVIRT_LXC_DRIVER_H */ diff --git a/src/lxc/lxc_fuse.h b/src/lxc/lxc_fuse.h index bf22758c4a..f8230e64c5 100644 --- a/src/lxc/lxc_fuse.h +++ b/src/lxc/lxc_fuse.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef LXC_FUSE_H -# define LXC_FUSE_H +#ifndef LIBVIRT_LXC_FUSE_H +# define LIBVIRT_LXC_FUSE_H # define FUSE_USE_VERSION 26 @@ -58,4 +58,4 @@ int lxcSetupFuse(virLXCFusePtr *f, virDomainDefPtr def); int lxcStartFuse(virLXCFusePtr f); void lxcFreeFuse(virLXCFusePtr *f); -#endif /* LXC_FUSE_H */ +#endif /* LIBVIRT_LXC_FUSE_H */ diff --git a/src/lxc/lxc_hostdev.h b/src/lxc/lxc_hostdev.h index f48b1805aa..4fd8ce35d5 100644 --- a/src/lxc/lxc_hostdev.h +++ b/src/lxc/lxc_hostdev.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __LXC_HOSTDEV_H__ -# define __LXC_HOSTDEV_H__ +#ifndef LIBVIRT_LXC_HOSTDEV_H +# define LIBVIRT_LXC_HOSTDEV_H # include "lxc_conf.h" # include "domain_conf.h" @@ -38,4 +38,4 @@ int virLXCPrepareHostDevices(virLXCDriverPtr driver, void virLXCDomainReAttachHostDevices(virLXCDriverPtr driver, virDomainDefPtr def); -#endif /* __LXC_HOSTDEV_H__ */ +#endif /* LIBVIRT_LXC_HOSTDEV_H */ diff --git a/src/lxc/lxc_monitor.h b/src/lxc/lxc_monitor.h index a0d6f371ba..fa47db7254 100644 --- a/src/lxc/lxc_monitor.h +++ b/src/lxc/lxc_monitor.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __LXC_MONITOR_H__ -# define __LXC_MONITOR_H__ +#ifndef LIBVIRT_LXC_MONITOR_H +# define LIBVIRT_LXC_MONITOR_H # include "virobject.h" # include "domain_conf.h" @@ -60,4 +60,4 @@ void virLXCMonitorClose(virLXCMonitorPtr mon); void virLXCMonitorLock(virLXCMonitorPtr mon); void virLXCMonitorUnlock(virLXCMonitorPtr mon); -#endif /* __LXC_MONITOR_H__ */ +#endif /* LIBVIRT_LXC_MONITOR_H */ diff --git a/src/lxc/lxc_native.h b/src/lxc/lxc_native.h index 2c13c00658..86f5163e12 100644 --- a/src/lxc/lxc_native.h +++ b/src/lxc/lxc_native.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __LXC_NATIVE_H__ -# define __LXC_NATIVE_H__ +#ifndef LIBVIRT_LXC_NATIVE_H +# define LIBVIRT_LXC_NATIVE_H # include "domain_conf.h" @@ -29,4 +29,4 @@ virDomainDefPtr lxcParseConfigString(const char *config, virCapsPtr caps, virDomainXMLOptionPtr xmlopt); -#endif /* __LXC_NATIVE_H__ */ +#endif /* LIBVIRT_LXC_NATIVE_H */ diff --git a/src/lxc/lxc_process.h b/src/lxc/lxc_process.h index d78cddef4b..7489a3a420 100644 --- a/src/lxc/lxc_process.h +++ b/src/lxc/lxc_process.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __LXC_PROCESS_H__ -# define __LXC_PROCESS_H__ +#ifndef LIBVIRT_LXC_PROCESS_H +# define LIBVIRT_LXC_PROCESS_H # include "lxc_conf.h" @@ -55,4 +55,4 @@ char *virLXCProcessSetupInterfaceDirect(virConnectPtr conn, virDomainDefPtr def, virDomainNetDefPtr net); -#endif /* __LXC_PROCESS_H__ */ +#endif /* LIBVIRT_LXC_PROCESS_H */ diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h index 5d621521cb..44c79f555e 100644 --- a/src/network/bridge_driver.h +++ b/src/network/bridge_driver.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NETWORK__DRIVER_H -# define __VIR_NETWORK__DRIVER_H +#ifndef LIBVIRT_BRIDGE_DRIVER_H +# define LIBVIRT_BRIDGE_DRIVER_H # include "internal.h" # include "domain_conf.h" @@ -38,4 +38,4 @@ networkDnsmasqConfContents(virNetworkObjPtr obj, dnsmasqContext *dctx, dnsmasqCapsPtr caps); -#endif /* __VIR_NETWORK__DRIVER_H */ +#endif /* LIBVIRT_BRIDGE_DRIVER_H */ diff --git a/src/network/bridge_driver_platform.h b/src/network/bridge_driver_platform.h index 8507ec4b97..8f05ea2b47 100644 --- a/src/network/bridge_driver_platform.h +++ b/src/network/bridge_driver_platform.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_BRIDGE_DRIVER_PLATFORM_H__ -# define __VIR_BRIDGE_DRIVER_PLATFORM_H__ +#ifndef LIBVIRT_BRIDGE_DRIVER_PLATFORM_H +# define LIBVIRT_BRIDGE_DRIVER_PLATFORM_H # include "internal.h" # include "virthread.h" @@ -64,4 +64,4 @@ int networkAddFirewallRules(virNetworkDefPtr def); void networkRemoveFirewallRules(virNetworkDefPtr def); -#endif /* __VIR_BRIDGE_DRIVER_PLATFORM_H__ */ +#endif /* LIBVIRT_BRIDGE_DRIVER_PLATFORM_H */ diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h index 037fc72bce..5876671c03 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NODE_DEVICE_H__ -# define __VIR_NODE_DEVICE_H__ +#ifndef LIBVIRT_NODE_DEVICE_DRIVER_H +# define LIBVIRT_NODE_DEVICE_DRIVER_H # include "internal.h" # include "driver.h" @@ -118,4 +118,4 @@ int nodeConnectNodeDeviceEventDeregisterAny(virConnectPtr conn, int callbackID); -#endif /* __VIR_NODE_DEVICE_H__ */ +#endif /* LIBVIRT_NODE_DEVICE_DRIVER_H */ diff --git a/src/node_device/node_device_hal.h b/src/node_device/node_device_hal.h index 72266729fc..ffcf0c84e6 100644 --- a/src/node_device/node_device_hal.h +++ b/src/node_device/node_device_hal.h @@ -19,7 +19,7 @@ * */ -#ifndef __VIR_NODE_DEVICE_HAL_H__ -# define __VIR_NODE_DEVICE_HAL_H__ +#ifndef LIBVIRT_NODE_DEVICE_HAL_H +# define LIBVIRT_NODE_DEVICE_HAL_H -#endif /* __VIR_NODE_DEVICE_HAL_H__ */ +#endif /* LIBVIRT_NODE_DEVICE_HAL_H */ diff --git a/src/node_device/node_device_udev.h b/src/node_device/node_device_udev.h index 79e7278cc6..8c1d8fec1d 100644 --- a/src/node_device/node_device_udev.h +++ b/src/node_device/node_device_udev.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __NODE_DEVICE_UDEV_H__ -# define __NODE_DEVICE_UDEV_H__ +#ifndef LIBVIRT_NODE_DEVICE_UDEV_H +# define LIBVIRT_NODE_DEVICE_UDEV_H # include <libudev.h> @@ -27,4 +27,4 @@ # define DMI_DEVPATH "/sys/devices/virtual/dmi/id" # define DMI_DEVPATH_FALLBACK "/sys/class/dmi/id" -#endif /* __NODE_DEVICE_UDEV_H__ */ +#endif /* LIBVIRT_NODE_DEVICE_UDEV_H */ diff --git a/src/nwfilter/nwfilter_dhcpsnoop.h b/src/nwfilter/nwfilter_dhcpsnoop.h index 028c236a96..38606bdd41 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.h +++ b/src/nwfilter/nwfilter_dhcpsnoop.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __NWFILTER_DHCPSNOOP_H -# define __NWFILTER_DHCPSNOOP_H +#ifndef LIBVIRT_NWFILTER_DHCPSNOOP_H +# define LIBVIRT_NWFILTER_DHCPSNOOP_H # include "nwfilter_tech_driver.h" @@ -31,4 +31,4 @@ int virNWFilterDHCPSnoopReq(virNWFilterTechDriverPtr techdriver, virNWFilterBindingDefPtr binding, virNWFilterDriverStatePtr driver); void virNWFilterDHCPSnoopEnd(const char *ifname); -#endif /* __NWFILTER_DHCPSNOOP_H */ +#endif /* LIBVIRT_NWFILTER_DHCPSNOOP_H */ diff --git a/src/nwfilter/nwfilter_driver.h b/src/nwfilter/nwfilter_driver.h index 1dfb9b31e6..c315a40649 100644 --- a/src/nwfilter/nwfilter_driver.h +++ b/src/nwfilter/nwfilter_driver.h @@ -22,12 +22,12 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NWFILTER_DRIVER_H__ -# define __VIR_NWFILTER_DRIVER_H__ +#ifndef LIBVIRT_NWFILTER_DRIVER_H +# define LIBVIRT_NWFILTER_DRIVER_H # include "nwfilter_params.h" # include "nwfilter_conf.h" int nwfilterRegister(void); -#endif /* __VIR_NWFILTER_DRIVER_H__ */ +#endif /* LIBVIRT_NWFILTER_DRIVER_H */ diff --git a/src/nwfilter/nwfilter_ebiptables_driver.h b/src/nwfilter/nwfilter_ebiptables_driver.h index a8e696aa37..f740856496 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.h +++ b/src/nwfilter/nwfilter_ebiptables_driver.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef VIR_NWFILTER_EBTABLES_DRIVER_H__ -# define VIR_NWFILTER_EBTABLES_DRIVER_H__ +#ifndef LIBVIRT_NWFILTER_EBIPTABLES_DRIVER_H +# define LIBVIRT_NWFILTER_EBIPTABLES_DRIVER_H # include "nwfilter_tech_driver.h" @@ -32,4 +32,4 @@ extern virNWFilterTechDriver ebiptables_driver; # define IPTABLES_MAX_COMMENT_LENGTH 256 -#endif /* VIR_NWFILTER_EBTABLES_DRIVER_H__ */ +#endif /* LIBVIRT_NWFILTER_EBIPTABLES_DRIVER_H */ diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h index 71a8cad938..945060cd22 100644 --- a/src/nwfilter/nwfilter_gentech_driver.h +++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __NWFILTER_GENTECH_DRIVER_H -# define __NWFILTER_GENTECH_DRIVER_H +#ifndef LIBVIRT_NWFILTER_GENTECH_DRIVER_H +# define LIBVIRT_NWFILTER_GENTECH_DRIVER_H # include "virnwfilterobj.h" # include "virnwfilterbindingdef.h" @@ -56,4 +56,4 @@ virHashTablePtr virNWFilterCreateVarHashmap(const char *macaddr, int virNWFilterBuildAll(virNWFilterDriverStatePtr driver, bool newFilters); -#endif /* __NWFILTER_GENTECH_DRIVER_H */ +#endif /* LIBVIRT_NWFILTER_GENTECH_DRIVER_H */ diff --git a/src/nwfilter/nwfilter_learnipaddr.h b/src/nwfilter/nwfilter_learnipaddr.h index 40d00ed68a..117d69f4d4 100644 --- a/src/nwfilter/nwfilter_learnipaddr.h +++ b/src/nwfilter/nwfilter_learnipaddr.h @@ -21,8 +21,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __NWFILTER_LEARNIPADDR_H -# define __NWFILTER_LEARNIPADDR_H +#ifndef LIBVIRT_NWFILTER_LEARNIPADDR_H +# define LIBVIRT_NWFILTER_LEARNIPADDR_H # include "conf/nwfilter_params.h" # include "nwfilter_tech_driver.h" @@ -50,4 +50,4 @@ int virNWFilterLearnInit(void); void virNWFilterLearnShutdown(void); void virNWFilterLearnThreadsTerminate(bool allowNewThreads); -#endif /* __NWFILTER_LEARNIPADDR_H */ +#endif /* LIBVIRT_NWFILTER_LEARNIPADDR_H */ diff --git a/src/nwfilter/nwfilter_tech_driver.h b/src/nwfilter/nwfilter_tech_driver.h index 64fa5bcbb5..f37a0e7d5c 100644 --- a/src/nwfilter/nwfilter_tech_driver.h +++ b/src/nwfilter/nwfilter_tech_driver.h @@ -21,8 +21,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __NWFILTER_TECH_DRIVER_H__ -# define __NWFILTER_TECH_DRIVER_H__ +#ifndef LIBVIRT_NWFILTER_TECH_DRIVER_H +# define LIBVIRT_NWFILTER_TECH_DRIVER_H # include "virnwfilterobj.h" @@ -91,4 +91,4 @@ struct _virNWFilterTechDriver { virNWFilterRemoveBasicRules removeBasicRules; }; -#endif /* __NWFILTER_TECH_DRIVER_H__ */ +#endif /* LIBVIRT_NWFILTER_TECH_DRIVER_H */ diff --git a/src/openvz/openvz_conf.h b/src/openvz/openvz_conf.h index e1e0066df6..05ccd6f927 100644 --- a/src/openvz/openvz_conf.h +++ b/src/openvz/openvz_conf.h @@ -21,8 +21,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef OPENVZ_CONF_H -# define OPENVZ_CONF_H +#ifndef LIBVIRT_OPENVZ_CONF_H +# define LIBVIRT_OPENVZ_CONF_H # include "internal.h" # include "virdomainobjlist.h" @@ -65,4 +65,4 @@ int openvzSetDefinedUUID(int vpsid, unsigned char *uuid); int openvzGetVEID(const char *name); int openvzReadNetworkConf(virDomainDefPtr def, int veid); -#endif /* OPENVZ_CONF_H */ +#endif /* LIBVIRT_OPENVZ_CONF_H */ diff --git a/src/openvz/openvz_driver.h b/src/openvz/openvz_driver.h index 68d2c1f03c..dd2cfd900e 100644 --- a/src/openvz/openvz_driver.h +++ b/src/openvz/openvz_driver.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef OPENVZ_DRIVER_H -# define OPENVZ_DRIVER_H +#ifndef LIBVIRT_OPENVZ_DRIVER_H +# define LIBVIRT_OPENVZ_DRIVER_H # include "internal.h" @@ -37,4 +37,4 @@ int openvzRegister(void); -#endif /* OPENVZ_DRIVER_H */ +#endif /* LIBVIRT_OPENVZ_DRIVER_H */ diff --git a/src/openvz/openvz_util.h b/src/openvz/openvz_util.h index 98d13ae336..bc3247119a 100644 --- a/src/openvz/openvz_util.h +++ b/src/openvz/openvz_util.h @@ -19,10 +19,10 @@ * */ -#ifndef OPENVZ_UTIL_H -# define OPENVZ_UTIL_H +#ifndef LIBVIRT_OPENVZ_UTIL_H +# define LIBVIRT_OPENVZ_UTIL_H long openvzKBPerPages(void); char *openvzVEGetStringParam(virDomainPtr dom, const char *param); -#endif /* OPENVZ_UTIL_H */ +#endif /* LIBVIRT_OPENVZ_UTIL_H */ diff --git a/src/phyp/phyp_driver.h b/src/phyp/phyp_driver.h index c6410bcc41..52a5d2bd17 100644 --- a/src/phyp/phyp_driver.h +++ b/src/phyp/phyp_driver.h @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef PHYP_DRIVER_H -# define PHYP_DRIVER_H +#ifndef LIBVIRT_PHYP_DRIVER_H +# define LIBVIRT_PHYP_DRIVER_H int phypRegister(void); -#endif /* PHYP_DRIVER_H */ +#endif /* LIBVIRT_PHYP_DRIVER_H */ diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index 698b2e0639..24457f84d7 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_AGENT_H__ -# define __QEMU_AGENT_H__ +#ifndef LIBVIRT_QEMU_AGENT_H +# define LIBVIRT_QEMU_AGENT_H # include "internal.h" # include "domain_conf.h" @@ -121,4 +121,4 @@ int qemuAgentSetUserPassword(qemuAgentPtr mon, const char *user, const char *password, bool crypted); -#endif /* __QEMU_AGENT_H__ */ +#endif /* LIBVIRT_QEMU_AGENT_H */ diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h index 4afa6f1256..aaf81e89ad 100644 --- a/src/qemu/qemu_alias.h +++ b/src/qemu/qemu_alias.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_ALIAS_H__ -# define __QEMU_ALIAS_H__ +#ifndef LIBVIRT_QEMU_ALIAS_H +# define LIBVIRT_QEMU_ALIAS_H # include "domain_conf.h" @@ -97,4 +97,4 @@ const char *qemuDomainGetManagedPRAlias(void); char *qemuDomainGetUnmanagedPRAlias(const char *parentalias); -#endif /* __QEMU_ALIAS_H__ */ +#endif /* LIBVIRT_QEMU_ALIAS_H */ diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h index 62ed5027cb..9401ab4e12 100644 --- a/src/qemu/qemu_block.h +++ b/src/qemu/qemu_block.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_BLOCK_H__ -# define __QEMU_BLOCK_H__ +#ifndef LIBVIRT_QEMU_BLOCK_H +# define LIBVIRT_QEMU_BLOCK_H # include "internal.h" @@ -125,4 +125,4 @@ qemuBlockSnapshotAddLegacy(virJSONValuePtr actions, virStorageSourcePtr newsrc, bool reuse); -#endif /* __QEMU_BLOCK_H__ */ +#endif /* LIBVIRT_QEMU_BLOCK_H */ diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h index cee3ee21c4..445799ff76 100644 --- a/src/qemu/qemu_blockjob.h +++ b/src/qemu/qemu_blockjob.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_BLOCKJOB_H__ -# define __QEMU_BLOCKJOB_H__ +#ifndef LIBVIRT_QEMU_BLOCKJOB_H +# define LIBVIRT_QEMU_BLOCKJOB_H # include "internal.h" # include "qemu_conf.h" @@ -42,4 +42,4 @@ void qemuBlockJobSyncEnd(virDomainObjPtr vm, qemuDomainAsyncJob asyncJob, virDomainDiskDefPtr disk); -#endif /* __QEMU_BLOCKJOB_H__ */ +#endif /* LIBVIRT_QEMU_BLOCKJOB_H */ diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 9f09997166..bf98ff7fcd 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -42,7 +42,7 @@ #include "virstring.h" #include "qemu_hostdev.h" #include "qemu_domain.h" -#define __QEMU_CAPSPRIV_H_ALLOW__ +#define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW #include "qemu_capspriv.h" #include "qemu_qapi.h" diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index e19b9d070f..1ed7639513 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_CAPABILITIES_H__ -# define __QEMU_CAPABILITIES_H__ +#ifndef LIBVIRT_QEMU_CAPABILITIES_H +# define LIBVIRT_QEMU_CAPABILITIES_H # include "virobject.h" # include "capabilities.h" @@ -636,4 +636,4 @@ bool virQEMUCapsCPUFilterFeatures(const char *name, virSEVCapabilityPtr virQEMUCapsGetSEVCapabilities(virQEMUCapsPtr qemuCaps); -#endif /* __QEMU_CAPABILITIES_H__ */ +#endif /* LIBVIRT_QEMU_CAPABILITIES_H */ diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h index b4183b5e66..b995e4d5d3 100644 --- a/src/qemu/qemu_capspriv.h +++ b/src/qemu/qemu_capspriv.h @@ -19,12 +19,12 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_CAPSPRIV_H_ALLOW__ +#ifndef LIBVIRT_QEMU_CAPSPRIV_H_ALLOW # error "qemu_capspriv.h may only be included by qemu_capabilities.c or test suites" -#endif /* __QEMU_CAPSPRIV_H_ALLOW__ */ +#endif /* LIBVIRT_QEMU_CAPSPRIV_H_ALLOW */ -#ifndef __QEMU_CAPSPRIV_H__ -# define __QEMU_CAPSPRIV_H__ +#ifndef LIBVIRT_QEMU_CAPSPRIV_H +# define LIBVIRT_QEMU_CAPSPRIV_H virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps); @@ -99,4 +99,4 @@ virQEMUCapsSetMicrocodeVersion(virQEMUCapsPtr qemuCaps, void virQEMUCapsStripMachineAliases(virQEMUCapsPtr qemuCaps); -#endif /* __QEMU_CAPSPRIV_H__ */ +#endif /* LIBVIRT_QEMU_CAPSPRIV_H */ diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h index 4541c644ee..17a565244f 100644 --- a/src/qemu/qemu_cgroup.h +++ b/src/qemu/qemu_cgroup.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_CGROUP_H__ -# define __QEMU_CGROUP_H__ +#ifndef LIBVIRT_QEMU_CGROUP_H +# define LIBVIRT_QEMU_CGROUP_H # include "virusb.h" # include "vircgroup.h" @@ -83,4 +83,4 @@ int qemuCgroupEmulatorAllNodesAllow(virCgroupPtr cgroup, void qemuCgroupEmulatorAllNodesRestore(qemuCgroupEmulatorAllNodesDataPtr data); extern const char *const defaultDeviceACL[]; -#endif /* __QEMU_CGROUP_H__ */ +#endif /* LIBVIRT_QEMU_CGROUP_H */ diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index c5bca612c1..464726061a 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_COMMAND_H__ -# define __QEMU_COMMAND_H__ +#ifndef LIBVIRT_QEMU_COMMAND_H +# define LIBVIRT_QEMU_COMMAND_H # include "domain_addr.h" # include "domain_conf.h" @@ -227,4 +227,4 @@ qemuBuildTPMOpenBackendFDs(const char *tpmdev, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); -#endif /* __QEMU_COMMAND_H__ */ +#endif /* LIBVIRT_QEMU_COMMAND_H */ diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index b70a0cda7c..1013cfcaed 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMUD_CONF_H -# define __QEMUD_CONF_H +#ifndef LIBVIRT_QEMU_CONF_H +# define LIBVIRT_QEMU_CONF_H # include <unistd.h> @@ -385,4 +385,4 @@ int qemuGetMemoryBackingPath(const virDomainDef *def, virQEMUDriverConfigPtr cfg, const char *alias, char **memPath); -#endif /* __QEMUD_CONF_H */ +#endif /* LIBVIRT_QEMU_CONF_H */ diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index cc17d622a2..4414a50c81 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_DOMAIN_H__ -# define __QEMU_DOMAIN_H__ +#ifndef LIBVIRT_QEMU_DOMAIN_H +# define LIBVIRT_QEMU_DOMAIN_H # include "virthread.h" # include "vircgroup.h" @@ -1095,4 +1095,4 @@ qemuDomainRunningReasonToResumeEvent(virDomainRunningReason reason); bool qemuDomainIsUsingNoShutdown(qemuDomainObjPrivatePtr priv); -#endif /* __QEMU_DOMAIN_H__ */ +#endif /* LIBVIRT_QEMU_DOMAIN_H */ diff --git a/src/qemu/qemu_domain_address.h b/src/qemu/qemu_domain_address.h index 0f360fcc49..875112bf8d 100644 --- a/src/qemu/qemu_domain_address.h +++ b/src/qemu/qemu_domain_address.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_DOMAIN_ADDRESS_H__ -# define __QEMU_DOMAIN_ADDRESS_H__ +#ifndef LIBVIRT_QEMU_DOMAIN_ADDRESS_H +# define LIBVIRT_QEMU_DOMAIN_ADDRESS_H # include "domain_addr.h" # include "domain_conf.h" @@ -66,4 +66,4 @@ int qemuDomainEnsureVirtioAddress(bool *releaseAddr, virDomainDeviceDefPtr dev, const char *devicename); -#endif /* __QEMU_DOMAIN_ADDRESS_H__ */ +#endif /* LIBVIRT_QEMU_DOMAIN_ADDRESS_H */ diff --git a/src/qemu/qemu_driver.h b/src/qemu/qemu_driver.h index 2e7ed9331e..e2efad6e52 100644 --- a/src/qemu/qemu_driver.h +++ b/src/qemu/qemu_driver.h @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_DRIVER_H__ -# define __QEMU_DRIVER_H__ +#ifndef LIBVIRT_QEMU_DRIVER_H +# define LIBVIRT_QEMU_DRIVER_H int qemuRegister(void); -#endif /* __QEMU_DRIVER_H__ */ +#endif /* LIBVIRT_QEMU_DRIVER_H */ diff --git a/src/qemu/qemu_extdevice.h b/src/qemu/qemu_extdevice.h index ad48dbba67..af03c045ff 100644 --- a/src/qemu/qemu_extdevice.h +++ b/src/qemu/qemu_extdevice.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_EXTDEVICE_H__ -# define __QEMU_EXTDEVICE_H__ +#ifndef LIBVIRT_QEMU_EXTDEVICE_H +# define LIBVIRT_QEMU_EXTDEVICE_H # include "qemu_conf.h" # include "qemu_domain.h" @@ -55,4 +55,4 @@ int qemuExtDevicesSetupCgroup(virQEMUDriverPtr driver, virDomainDefPtr def, virCgroupPtr cgroup); -#endif /* __QEMU_EXTDEVICE_H__ */ +#endif /* LIBVIRT_QEMU_EXTDEVICE_H */ diff --git a/src/qemu/qemu_hostdev.h b/src/qemu/qemu_hostdev.h index 1f5542b129..41f254ab81 100644 --- a/src/qemu/qemu_hostdev.h +++ b/src/qemu/qemu_hostdev.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_HOSTDEV_H__ -# define __QEMU_HOSTDEV_H__ +#ifndef LIBVIRT_QEMU_HOSTDEV_H +# define LIBVIRT_QEMU_HOSTDEV_H # include "qemu_conf.h" # include "domain_conf.h" @@ -91,4 +91,4 @@ void qemuHostdevReAttachMediatedDevices(virQEMUDriverPtr driver, void qemuHostdevReAttachDomainDevices(virQEMUDriverPtr driver, virDomainDefPtr def); -#endif /* __QEMU_HOSTDEV_H__ */ +#endif /* LIBVIRT_QEMU_HOSTDEV_H */ diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index aede7b2c7d..97b262fd70 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -23,7 +23,7 @@ #include <config.h> #include "qemu_hotplug.h" -#define __QEMU_HOTPLUGPRIV_H_ALLOW__ +#define LIBVIRT_QEMU_HOTPLUGPRIV_H_ALLOW #include "qemu_hotplugpriv.h" #include "qemu_alias.h" #include "qemu_capabilities.h" diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index bccf112206..7ac03b7810 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_HOTPLUG_H__ -# define __QEMU_HOTPLUG_H__ +#ifndef LIBVIRT_QEMU_HOTPLUG_H +# define LIBVIRT_QEMU_HOTPLUG_H # include "qemu_conf.h" # include "qemu_domain.h" @@ -198,4 +198,4 @@ int qemuDomainDetachInputDevice(virDomainObjPtr vm, int qemuDomainDetachVsockDevice(virDomainObjPtr vm, virDomainVsockDefPtr dev, bool async); -#endif /* __QEMU_HOTPLUG_H__ */ +#endif /* LIBVIRT_QEMU_HOTPLUG_H */ diff --git a/src/qemu/qemu_hotplugpriv.h b/src/qemu/qemu_hotplugpriv.h index 2239013701..e4b37d78c0 100644 --- a/src/qemu/qemu_hotplugpriv.h +++ b/src/qemu/qemu_hotplugpriv.h @@ -19,12 +19,12 @@ * */ -#ifndef __QEMU_HOTPLUGPRIV_H_ALLOW__ +#ifndef LIBVIRT_QEMU_HOTPLUGPRIV_H_ALLOW # error "qemu_hotplugpriv.h may only be included by qemu_hotplug.c or test suites" -#endif /* __QEMU_HOTPLUGPRIV_H_ALLOW__ */ +#endif /* LIBVIRT_QEMU_HOTPLUGPRIV_H_ALLOW */ -#ifndef __QEMU_HOTPLUGPRIV_H__ -# define __QEMU_HOTPLUGPRIV_H__ +#ifndef LIBVIRT_QEMU_HOTPLUGPRIV_H +# define LIBVIRT_QEMU_HOTPLUGPRIV_H /* * This header file should never be used outside unit tests. @@ -32,4 +32,4 @@ extern unsigned long long qemuDomainRemoveDeviceWaitTime; -#endif /* __QEMU_HOTPLUGPRIV_H__ */ +#endif /* LIBVIRT_QEMU_HOTPLUGPRIV_H */ diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h index 08df5619ea..f3ec540eda 100644 --- a/src/qemu/qemu_interface.h +++ b/src/qemu/qemu_interface.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_INTERFACE_H__ -# define __QEMU_INTERFACE_H__ +#ifndef LIBVIRT_QEMU_INTERFACE_H +# define LIBVIRT_QEMU_INTERFACE_H # include "domain_conf.h" # include "qemu_conf.h" @@ -55,4 +55,4 @@ int qemuInterfaceOpenVhostNet(virDomainDefPtr def, virDomainNetDefPtr net, int *vhostfd, size_t *vhostfdSize); -#endif /* __QEMU_INTERFACE_H__ */ +#endif /* LIBVIRT_QEMU_INTERFACE_H */ diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index e12b6972db..7d0ff8362e 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -19,8 +19,8 @@ * */ -#ifndef __QEMU_MIGRATION_H__ -# define __QEMU_MIGRATION_H__ +#ifndef LIBVIRT_QEMU_MIGRATION_H +# define LIBVIRT_QEMU_MIGRATION_H # include "qemu_conf.h" # include "qemu_domain.h" @@ -254,4 +254,4 @@ qemuMigrationSrcFetchMirrorStats(virQEMUDriverPtr driver, qemuDomainAsyncJob asyncJob, qemuDomainJobInfoPtr jobInfo); -#endif /* __QEMU_MIGRATION_H__ */ +#endif /* LIBVIRT_QEMU_MIGRATION_H */ diff --git a/src/qemu/qemu_migration_cookie.h b/src/qemu/qemu_migration_cookie.h index b399787074..56678b008a 100644 --- a/src/qemu/qemu_migration_cookie.h +++ b/src/qemu/qemu_migration_cookie.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_MIGRATION_COOKIE_H__ -# define __QEMU_MIGRATION_COOKIE_H__ +#ifndef LIBVIRT_QEMU_MIGRATION_COOKIE_H +# define LIBVIRT_QEMU_MIGRATION_COOKIE_H # include "qemu_migration_params.h" @@ -177,4 +177,4 @@ qemuMigrationCookieAddPersistent(qemuMigrationCookiePtr mig, virDomainDefPtr qemuMigrationCookieGetPersistent(qemuMigrationCookiePtr mig); -#endif /* __QEMU_MIGRATION_COOKIE_H__ */ +#endif /* LIBVIRT_QEMU_MIGRATION_COOKIE_H */ diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c index f34c3f6c06..e62b6ed461 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -30,7 +30,7 @@ #include "qemu_hotplug.h" #include "qemu_migration.h" #include "qemu_migration_params.h" -#define __QEMU_MIGRATION_PARAMSPRIV_H_ALLOW__ +#define LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H_ALLOW #include "qemu_migration_paramspriv.h" #include "qemu_monitor.h" diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h index 57c3b8dc13..12bb9200da 100644 --- a/src/qemu/qemu_migration_params.h +++ b/src/qemu/qemu_migration_params.h @@ -19,8 +19,8 @@ * */ -#ifndef __QEMU_MIGRATION_PARAMS_H__ -# define __QEMU_MIGRATION_PARAMS_H__ +#ifndef LIBVIRT_QEMU_MIGRATION_PARAMS_H +# define LIBVIRT_QEMU_MIGRATION_PARAMS_H # include "internal.h" @@ -148,4 +148,4 @@ bool qemuMigrationCapsGet(virDomainObjPtr vm, qemuMigrationCapability cap); -#endif /* __QEMU_MIGRATION_PARAMS_H__ */ +#endif /* LIBVIRT_QEMU_MIGRATION_PARAMS_H */ diff --git a/src/qemu/qemu_migration_paramspriv.h b/src/qemu/qemu_migration_paramspriv.h index 52f1591251..b1e017e786 100644 --- a/src/qemu/qemu_migration_paramspriv.h +++ b/src/qemu/qemu_migration_paramspriv.h @@ -19,12 +19,12 @@ * */ -#ifndef __QEMU_MIGRATION_PARAMSPRIV_H_ALLOW__ +#ifndef LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H_ALLOW # error "qemu_migration_paramspriv.h may only be included by qemu_migration_params.c or test suites" -#endif /* __QEMU_MIGRATION_PARAMSPRIV_H_ALLOW__ */ +#endif /* LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H_ALLOW */ -#ifndef __QEMU_MIGRATION_PARAMSPRIV_H__ -# define __QEMU_MIGRATION_PARAMSPRIV_H__ +#ifndef LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H +# define LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H virJSONValuePtr qemuMigrationParamsToJSON(qemuMigrationParamsPtr migParams); @@ -36,4 +36,4 @@ virJSONValuePtr qemuMigrationCapsToJSON(virBitmapPtr caps, virBitmapPtr states); -#endif /* __QEMU_MIGRATION_PARAMSPRIV_H__ */ +#endif /* LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H */ diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 713fe2fab4..5232cefd75 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -46,7 +46,7 @@ # include "libvirt_qemu_probes.h" #endif -#define __QEMU_MONITOR_PRIV_H_ALLOW__ +#define LIBVIRT_QEMU_MONITOR_PRIV_H_ALLOW #include "qemu_monitor_priv.h" #define VIR_FROM_THIS VIR_FROM_QEMU diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 95a21fde05..fef537c90e 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef QEMU_MONITOR_H -# define QEMU_MONITOR_H +#ifndef LIBVIRT_QEMU_MONITOR_H +# define LIBVIRT_QEMU_MONITOR_H # include "internal.h" @@ -1194,4 +1194,4 @@ struct _qemuMonitorPRManagerInfo { int qemuMonitorGetPRManagerInfo(qemuMonitorPtr mon, virHashTablePtr *retinfo); -#endif /* QEMU_MONITOR_H */ +#endif /* LIBVIRT_QEMU_MONITOR_H */ diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 331419890b..62772228fe 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef QEMU_MONITOR_JSON_H -# define QEMU_MONITOR_JSON_H +#ifndef LIBVIRT_QEMU_MONITOR_JSON_H +# define LIBVIRT_QEMU_MONITOR_JSON_H # include "internal.h" @@ -578,4 +578,4 @@ int qemuMonitorJSONGetPRManagerInfo(qemuMonitorPtr mon, virHashTablePtr info) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -#endif /* QEMU_MONITOR_JSON_H */ +#endif /* LIBVIRT_QEMU_MONITOR_JSON_H */ diff --git a/src/qemu/qemu_monitor_priv.h b/src/qemu/qemu_monitor_priv.h index 6db3e3769f..2e3ca72ec9 100644 --- a/src/qemu/qemu_monitor_priv.h +++ b/src/qemu/qemu_monitor_priv.h @@ -16,16 +16,16 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_MONITOR_PRIV_H_ALLOW__ +#ifndef LIBVIRT_QEMU_MONITOR_PRIV_H_ALLOW # error "qemu_monitor_priv.h may only be included by qemu_monitor.c or test suites" -#endif /* __QEMU_MONITOR_PRIV_H_ALLOW__ */ +#endif /* LIBVIRT_QEMU_MONITOR_PRIV_H_ALLOW */ -#ifndef __QEMU_MONITOR_PRIV_H__ -# define __QEMU_MONITOR_PRIV_H__ +#ifndef LIBVIRT_QEMU_MONITOR_PRIV_H +# define LIBVIRT_QEMU_MONITOR_PRIV_H # include "qemu_monitor.h" void qemuMonitorResetCommandID(qemuMonitorPtr mon); -#endif /* __QEMU_MONITOR_PRIV_H__ */ +#endif /* LIBVIRT_QEMU_MONITOR_PRIV_H */ diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h index 8ebdef67b6..b1ad2dab52 100644 --- a/src/qemu/qemu_monitor_text.h +++ b/src/qemu/qemu_monitor_text.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef QEMU_MONITOR_TEXT_H -# define QEMU_MONITOR_TEXT_H +#ifndef LIBVIRT_QEMU_MONITOR_TEXT_H +# define LIBVIRT_QEMU_MONITOR_TEXT_H # include "internal.h" @@ -38,4 +38,4 @@ int qemuMonitorTextCreateSnapshot(qemuMonitorPtr mon, const char *name); int qemuMonitorTextLoadSnapshot(qemuMonitorPtr mon, const char *name); int qemuMonitorTextDeleteSnapshot(qemuMonitorPtr mon, const char *name); -#endif /* QEMU_MONITOR_TEXT_H */ +#endif /* LIBVIRT_QEMU_MONITOR_TEXT_H */ diff --git a/src/qemu/qemu_parse_command.h b/src/qemu/qemu_parse_command.h index 901b5b438f..5eeb344c60 100644 --- a/src/qemu/qemu_parse_command.h +++ b/src/qemu/qemu_parse_command.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_PARSE_COMMAND_H__ -# define __QEMU_PARSE_COMMAND_H__ +#ifndef LIBVIRT_QEMU_PARSE_COMMAND_H +# define LIBVIRT_QEMU_PARSE_COMMAND_H # include "virfilecache.h" @@ -57,4 +57,4 @@ qemuParseKeywords(const char *str, int *retnkeywords, int allowEmptyValue); -#endif /* __QEMU_PARSE_COMMAND_H__ */ +#endif /* LIBVIRT_QEMU_PARSE_COMMAND_H */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 6809522d36..685e7201e3 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -35,7 +35,7 @@ #include <sys/utsname.h> #include "qemu_process.h" -#define __QEMU_PROCESS_PRIV_H_ALLOW__ +#define LIBVIRT_QEMU_PROCESSPRIV_H_ALLOW #include "qemu_processpriv.h" #include "qemu_alias.h" #include "qemu_block.h" diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 2037467c94..67a4d7139f 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -19,8 +19,8 @@ * */ -#ifndef __QEMU_PROCESS_H__ -# define __QEMU_PROCESS_H__ +#ifndef LIBVIRT_QEMU_PROCESS_H +# define LIBVIRT_QEMU_PROCESS_H # include "qemu_conf.h" # include "qemu_domain.h" @@ -214,4 +214,4 @@ int qemuProcessStartManagedPRDaemon(virDomainObjPtr vm); void qemuProcessKillManagedPRDaemon(virDomainObjPtr vm); -#endif /* __QEMU_PROCESS_H__ */ +#endif /* LIBVIRT_QEMU_PROCESS_H */ diff --git a/src/qemu/qemu_processpriv.h b/src/qemu/qemu_processpriv.h index a7582558a9..17f981829b 100644 --- a/src/qemu/qemu_processpriv.h +++ b/src/qemu/qemu_processpriv.h @@ -19,12 +19,12 @@ * */ -#ifndef __QEMU_PROCESS_PRIV_H_ALLOW__ +#ifndef LIBVIRT_QEMU_PROCESSPRIV_H_ALLOW # error "qemu_process_priv.h may only be included by qemu_process.c or test suites" -#endif /* __QEMU_PROCESS_PRIV_H_ALLOW__ */ +#endif /* LIBVIRT_QEMU_PROCESSPRIV_H_ALLOW */ -#ifndef __QEMU_PROCESSPRIV_H__ -# define __QEMU_PROCESSPRIV_H__ +#ifndef LIBVIRT_QEMU_PROCESSPRIV_H +# define LIBVIRT_QEMU_PROCESSPRIV_H # include "domain_conf.h" # include "qemu_monitor.h" @@ -38,4 +38,4 @@ int qemuProcessHandleDeviceDeleted(qemuMonitorPtr mon, const char *devAlias, void *opaque); -#endif /* __QEMU_PROCESSPRIV_H__ */ +#endif /* LIBVIRT_QEMU_PROCESSPRIV_H */ diff --git a/src/qemu/qemu_qapi.h b/src/qemu/qemu_qapi.h index e074507dc8..c95978de91 100644 --- a/src/qemu/qemu_qapi.h +++ b/src/qemu/qemu_qapi.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_QAPI_H__ -# define __QEMU_QAPI_H__ +#ifndef LIBVIRT_QEMU_QAPI_H +# define LIBVIRT_QEMU_QAPI_H # include "internal.h" @@ -37,4 +37,4 @@ virHashTablePtr virQEMUQAPISchemaConvert(virJSONValuePtr schemareply); -#endif /* __QEMU_QAPI_H__ */ +#endif /* LIBVIRT_QEMU_QAPI_H */ diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h index 8bb50c9534..5b4fe6eb8f 100644 --- a/src/qemu/qemu_security.h +++ b/src/qemu/qemu_security.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_SECURITY_H__ -# define __QEMU_SECURITY_H__ +#ifndef LIBVIRT_QEMU_SECURITY_H +# define LIBVIRT_QEMU_SECURITY_H # include "qemu_conf.h" @@ -131,4 +131,4 @@ int qemuSecurityRestoreSavedStateLabel(virQEMUDriverPtr driver, # define qemuSecurityStackAddNested virSecurityManagerStackAddNested # define qemuSecurityVerify virSecurityManagerVerify -#endif /* __QEMU_SECURITY_H__ */ +#endif /* LIBVIRT_QEMU_SECURITY_H */ diff --git a/src/qemu/qemu_tpm.h b/src/qemu/qemu_tpm.h index acae9520aa..bffcad5db0 100644 --- a/src/qemu/qemu_tpm.h +++ b/src/qemu/qemu_tpm.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMU_TPM_H__ -# define __QEMU_TPM_H__ +#ifndef LIBVIRT_QEMU_TPM_H +# define LIBVIRT_QEMU_TPM_H # include "vircommand.h" @@ -52,4 +52,4 @@ int qemuExtTPMSetupCgroup(virQEMUDriverPtr driver, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; -#endif /* __QEMU_TPM_H__ */ +#endif /* LIBVIRT_QEMU_TPM_H */ diff --git a/src/remote/remote_daemon.h b/src/remote/remote_daemon.h index 2184f9bda3..50e912f828 100644 --- a/src/remote/remote_daemon.h +++ b/src/remote/remote_daemon.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __REMOTE_DAEMON_H__ -# define __REMOTE_DAEMON_H__ +#ifndef LIBVIRT_REMOTE_DAEMON_H +# define LIBVIRT_REMOTE_DAEMON_H # define VIR_ENUM_SENTINELS @@ -88,4 +88,4 @@ extern virNetSASLContextPtr saslCtxt; extern virNetServerProgramPtr remoteProgram; extern virNetServerProgramPtr qemuProgram; -#endif /* __REMOTE_DAEMON_H__ */ +#endif /* LIBVIRT_REMOTE_DAEMON_H */ diff --git a/src/remote/remote_daemon_config.h b/src/remote/remote_daemon_config.h index c5595fa878..56d130bdce 100644 --- a/src/remote/remote_daemon_config.h +++ b/src/remote/remote_daemon_config.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __REMOTE_DAEMON_CONFIG_H__ -# define __REMOTE_DAEMON_CONFIG_H__ +#ifndef LIBVIRT_REMOTE_DAEMON_CONFIG_H +# define LIBVIRT_REMOTE_DAEMON_CONFIG_H # include "internal.h" @@ -104,4 +104,4 @@ int daemonConfigLoadData(struct daemonConfig *data, const char *filename, const char *filedata); -#endif /* __REMOTE_DAEMON_CONFIG_H__ */ +#endif /* LIBVIRT_REMOTE_DAEMON_CONFIG_H */ diff --git a/src/remote/remote_daemon_dispatch.h b/src/remote/remote_daemon_dispatch.h index d3b8cf2346..cafe109a21 100644 --- a/src/remote/remote_daemon_dispatch.h +++ b/src/remote/remote_daemon_dispatch.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __REMOTE_DAEMON_DISPATCH_H__ -# define __REMOTE_DAEMON_DISPATCH_H__ +#ifndef LIBVIRT_REMOTE_DAEMON_DISPATCH_H +# define LIBVIRT_REMOTE_DAEMON_DISPATCH_H # include "remote_protocol.h" # include "rpc/virnetserverprogram.h" @@ -39,4 +39,4 @@ void remoteClientFree(void *data); void *remoteClientNew(virNetServerClientPtr client, void *opaque); -#endif /* __REMOTE_DAEMON_DISPATCH_H__ */ +#endif /* LIBVIRT_REMOTE_DAEMON_DISPATCH_H */ diff --git a/src/remote/remote_daemon_stream.h b/src/remote/remote_daemon_stream.h index 55a483665c..46e3df5c5e 100644 --- a/src/remote/remote_daemon_stream.h +++ b/src/remote/remote_daemon_stream.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __REMOTE_DAEMON_STREAM_H__ -# define __REMOTE_DAEMON_STREAM_H__ +#ifndef LIBVIRT_REMOTE_DAEMON_STREAM_H +# define LIBVIRT_REMOTE_DAEMON_STREAM_H # include "remote_daemon.h" @@ -44,4 +44,4 @@ daemonRemoveClientStream(virNetServerClientPtr client, void daemonRemoveAllClientStreams(daemonClientStream *stream); -#endif /* __REMOTE_DAEMON_STREAM_H__ */ +#endif /* LIBVIRT_REMOTE_DAEMON_STREAM_H */ diff --git a/src/remote/remote_driver.h b/src/remote/remote_driver.h index c125a3de82..5d6580e855 100644 --- a/src/remote/remote_driver.h +++ b/src/remote/remote_driver.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_REMOTE_INTERNAL_H__ -# define __VIR_REMOTE_INTERNAL_H__ +#ifndef LIBVIRT_REMOTE_DRIVER_H +# define LIBVIRT_REMOTE_DRIVER_H # include "internal.h" # include "configmake.h" @@ -46,4 +46,4 @@ unsigned long remoteVersion(void); # define LIBVIRT_SERVERCERT LIBVIRT_PKI_DIR "/libvirt/servercert.pem" -#endif /* __VIR_REMOTE_INTERNAL_H__ */ +#endif /* LIBVIRT_REMOTE_DRIVER_H */ diff --git a/src/rpc/virkeepalive.h b/src/rpc/virkeepalive.h index 26043ff67a..6b9524b6ba 100644 --- a/src/rpc/virkeepalive.h +++ b/src/rpc/virkeepalive.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_KEEPALIVE_H__ -# define __VIR_KEEPALIVE_H__ +#ifndef LIBVIRT_VIRKEEPALIVE_H +# define LIBVIRT_VIRKEEPALIVE_H # include "virnetmessage.h" # include "virobject.h" @@ -53,4 +53,4 @@ bool virKeepAliveCheckMessage(virKeepAlivePtr ka, virNetMessagePtr msg, virNetMessagePtr *response); -#endif /* __VIR_KEEPALIVE_H__ */ +#endif /* LIBVIRT_VIRKEEPALIVE_H */ diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h index 80ca3bf8db..39a6176d3e 100644 --- a/src/rpc/virnetclient.h +++ b/src/rpc/virnetclient.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NET_CLIENT_H__ -# define __VIR_NET_CLIENT_H__ +#ifndef LIBVIRT_VIRNETCLIENT_H +# define LIBVIRT_VIRNETCLIENT_H # ifdef WITH_GNUTLS # include "virnettlscontext.h" @@ -148,4 +148,4 @@ int virNetClientKeepAliveStart(virNetClientPtr client, void virNetClientKeepAliveStop(virNetClientPtr client); -#endif /* __VIR_NET_CLIENT_H__ */ +#endif /* LIBVIRT_VIRNETCLIENT_H */ diff --git a/src/rpc/virnetclientprogram.h b/src/rpc/virnetclientprogram.h index 3e82113ee9..36d331cbf0 100644 --- a/src/rpc/virnetclientprogram.h +++ b/src/rpc/virnetclientprogram.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NET_CLIENT_PROGRAM_H__ -# define __VIR_NET_CLIENT_PROGRAM_H__ +#ifndef LIBVIRT_VIRNETCLIENTPROGRAM_H +# define LIBVIRT_VIRNETCLIENTPROGRAM_H # include <rpc/types.h> # include <rpc/xdr.h> @@ -81,4 +81,4 @@ int virNetClientProgramCall(virNetClientProgramPtr prog, -#endif /* __VIR_NET_CLIENT_PROGRAM_H__ */ +#endif /* LIBVIRT_VIRNETCLIENTPROGRAM_H */ diff --git a/src/rpc/virnetclientstream.h b/src/rpc/virnetclientstream.h index 86db199b25..d13793222b 100644 --- a/src/rpc/virnetclientstream.h +++ b/src/rpc/virnetclientstream.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NET_CLIENT_STREAM_H__ -# define __VIR_NET_CLIENT_STREAM_H__ +#ifndef LIBVIRT_VIRNETCLIENTSTREAM_H +# define LIBVIRT_VIRNETCLIENTSTREAM_H # include "virnetclientprogram.h" # include "virobject.h" @@ -82,4 +82,4 @@ int virNetClientStreamEventRemoveCallback(virNetClientStreamPtr st); bool virNetClientStreamEOF(virNetClientStreamPtr st) ATTRIBUTE_NONNULL(1); -#endif /* __VIR_NET_CLIENT_STREAM_H__ */ +#endif /* LIBVIRT_VIRNETCLIENTSTREAM_H */ diff --git a/src/rpc/virnetdaemon.h b/src/rpc/virnetdaemon.h index e6dbb2f6c7..2ad85f265b 100644 --- a/src/rpc/virnetdaemon.h +++ b/src/rpc/virnetdaemon.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NET_DAEMON_H__ -# define __VIR_NET_DAEMON_H__ +#ifndef LIBVIRT_VIRNETDAEMON_H +# define LIBVIRT_VIRNETDAEMON_H # include <signal.h> @@ -82,4 +82,4 @@ ssize_t virNetDaemonGetServers(virNetDaemonPtr dmn, virNetServerPtr **servers); bool virNetDaemonHasServer(virNetDaemonPtr dmn, const char *serverName); -#endif /* __VIR_NET_DAEMON_H__ */ +#endif /* LIBVIRT_VIRNETDAEMON_H */ diff --git a/src/rpc/virnetlibsshsession.h b/src/rpc/virnetlibsshsession.h index b8844dc3ad..bb89267835 100644 --- a/src/rpc/virnetlibsshsession.h +++ b/src/rpc/virnetlibsshsession.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NET_LIBSSH_SESSION_H__ -# define __VIR_NET_LIBSSH_SESSION_H__ +#ifndef LIBVIRT_VIRNETLIBSSHSESSION_H +# define LIBVIRT_VIRNETLIBSSHSESSION_H # include "internal.h" # include "viruri.h" @@ -73,4 +73,4 @@ ssize_t virNetLibsshChannelWrite(virNetLibsshSessionPtr sess, bool virNetLibsshSessionHasCachedData(virNetLibsshSessionPtr sess); -#endif /* __VIR_NET_LIBSSH_SESSION_H__ */ +#endif /* LIBVIRT_VIRNETLIBSSHSESSION_H */ diff --git a/src/rpc/virnetmessage.h b/src/rpc/virnetmessage.h index d7406fcd24..c787eecb7d 100644 --- a/src/rpc/virnetmessage.h +++ b/src/rpc/virnetmessage.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NET_MESSAGE_H__ -# define __VIR_NET_MESSAGE_H__ +#ifndef LIBVIRT_VIRNETMESSAGE_H +# define LIBVIRT_VIRNETMESSAGE_H # include "virnetprotocol.h" @@ -101,4 +101,4 @@ int virNetMessageDupFD(virNetMessagePtr msg, int virNetMessageAddFD(virNetMessagePtr msg, int fd); -#endif /* __VIR_NET_MESSAGE_H__ */ +#endif /* LIBVIRT_VIRNETMESSAGE_H */ diff --git a/src/rpc/virnetsaslcontext.h b/src/rpc/virnetsaslcontext.h index edc082f3a7..6d8f16ecd0 100644 --- a/src/rpc/virnetsaslcontext.h +++ b/src/rpc/virnetsaslcontext.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NET_CLIENT_SASL_CONTEXT_H__ -# define __VIR_NET_CLIENT_SASL_CONTEXT_H__ +#ifndef LIBVIRT_VIRNETSASLCONTEXT_H +# define LIBVIRT_VIRNETSASLCONTEXT_H # include "internal.h" # include <sasl/sasl.h> @@ -110,4 +110,4 @@ ssize_t virNetSASLSessionDecode(virNetSASLSessionPtr sasl, const char **output, size_t *outputlen); -#endif /* __VIR_NET_CLIENT_SASL_CONTEXT_H__ */ +#endif /* LIBVIRT_VIRNETSASLCONTEXT_H */ diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h index 17dcad9595..92a856fb03 100644 --- a/src/rpc/virnetserver.h +++ b/src/rpc/virnetserver.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NET_SERVER_H__ -# define __VIR_NET_SERVER_H__ +#ifndef LIBVIRT_VIRNETSERVER_H +# define LIBVIRT_VIRNETSERVER_H # include "virnettlscontext.h" # include "virnetserverprogram.h" @@ -113,4 +113,4 @@ int virNetServerSetClientLimits(virNetServerPtr srv, long long int maxClients, long long int maxClientsUnauth); -#endif /* __VIR_NET_SERVER_H__ */ +#endif /* LIBVIRT_VIRNETSERVER_H */ diff --git a/src/rpc/virnetserverclient.h b/src/rpc/virnetserverclient.h index fa240f0d0f..2d6fa7ec56 100644 --- a/src/rpc/virnetserverclient.h +++ b/src/rpc/virnetserverclient.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NET_SERVER_CLIENT_H__ -# define __VIR_NET_SERVER_CLIENT_H__ +#ifndef LIBVIRT_VIRNETSERVERCLIENT_H +# define LIBVIRT_VIRNETSERVERCLIENT_H # include "viridentity.h" # include "virnetsocket.h" @@ -170,4 +170,4 @@ int virNetServerClientGetInfo(virNetServerClientPtr client, void virNetServerClientSetQuietEOF(virNetServerClientPtr client); -#endif /* __VIR_NET_SERVER_CLIENT_H__ */ +#endif /* LIBVIRT_VIRNETSERVERCLIENT_H */ diff --git a/src/rpc/virnetservermdns.h b/src/rpc/virnetservermdns.h index cced0ee0f3..64511a65c8 100644 --- a/src/rpc/virnetservermdns.h +++ b/src/rpc/virnetservermdns.h @@ -21,8 +21,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NET_SERVER_MDNS_H__ -# define __VIR_NET_SERVER_MDNS_H__ +#ifndef LIBVIRT_VIRNETSERVERMDNS_H +# define LIBVIRT_VIRNETSERVERMDNS_H # include "internal.h" @@ -104,4 +104,4 @@ void virNetServerMDNSFree(virNetServerMDNSPtr ptr); void virNetServerMDNSGroupFree(virNetServerMDNSGroupPtr ptr); void virNetServerMDNSEntryFree(virNetServerMDNSEntryPtr ptr); -#endif /* __VIR_NET_SERVER_MDNS_H__ */ +#endif /* LIBVIRT_VIRNETSERVERMDNS_H */ diff --git a/src/rpc/virnetserverprogram.h b/src/rpc/virnetserverprogram.h index fdb6a60a2b..b37fc40c9b 100644 --- a/src/rpc/virnetserverprogram.h +++ b/src/rpc/virnetserverprogram.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NET_SERVER_PROGRAM_H__ -# define __VIR_NET_SERVER_PROGRAM_H__ +#ifndef LIBVIRT_VIRNETSERVERPROGRAM_H +# define LIBVIRT_VIRNETSERVERPROGRAM_H # include "virnetmessage.h" # include "virnetserverclient.h" @@ -107,4 +107,4 @@ int virNetServerProgramSendStreamHole(virNetServerProgramPtr prog, long long length, unsigned int flags); -#endif /* __VIR_NET_SERVER_PROGRAM_H__ */ +#endif /* LIBVIRT_VIRNETSERVERPROGRAM_H */ diff --git a/src/rpc/virnetserverservice.h b/src/rpc/virnetserverservice.h index 32371d979e..5c73bdeab1 100644 --- a/src/rpc/virnetserverservice.h +++ b/src/rpc/virnetserverservice.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NET_SERVER_SERVICE_H__ -# define __VIR_NET_SERVER_SERVICE_H__ +#ifndef LIBVIRT_VIRNETSERVERSERVICE_H +# define LIBVIRT_VIRNETSERVERSERVICE_H # include "virnetserverprogram.h" # include "virobject.h" @@ -88,4 +88,4 @@ void virNetServerServiceToggle(virNetServerServicePtr svc, void virNetServerServiceClose(virNetServerServicePtr svc); -#endif /* __VIR_NET_SERVER_SERVICE_H__ */ +#endif /* LIBVIRT_VIRNETSERVERSERVICE_H */ diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h index 2d64701e40..334036aafc 100644 --- a/src/rpc/virnetsocket.h +++ b/src/rpc/virnetsocket.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NET_SOCKET_H__ -# define __VIR_NET_SOCKET_H__ +#ifndef LIBVIRT_VIRNETSOCKET_H +# define LIBVIRT_VIRNETSOCKET_H # include "virsocketaddr.h" # include "vircommand.h" @@ -185,4 +185,4 @@ void virNetSocketRemoveIOCallback(virNetSocketPtr sock); void virNetSocketClose(virNetSocketPtr sock); -#endif /* __VIR_NET_SOCKET_H__ */ +#endif /* LIBVIRT_VIRNETSOCKET_H */ diff --git a/src/rpc/virnetsshsession.h b/src/rpc/virnetsshsession.h index faecb75064..840054c51a 100644 --- a/src/rpc/virnetsshsession.h +++ b/src/rpc/virnetsshsession.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NET_SSH_SESSION_H__ -# define __VIR_NET_SSH_SESSION_H__ +#ifndef LIBVIRT_VIRNETSSHSESSION_H +# define LIBVIRT_VIRNETSSHSESSION_H # include "internal.h" # include "viruri.h" @@ -85,4 +85,4 @@ ssize_t virNetSSHChannelWrite(virNetSSHSessionPtr sess, bool virNetSSHSessionHasCachedData(virNetSSHSessionPtr sess); -#endif /* __VIR_NET_SSH_SESSION_H__ */ +#endif /* LIBVIRT_VIRNETSSHSESSION_H */ diff --git a/src/rpc/virnettlscontext.h b/src/rpc/virnettlscontext.h index c20ea9a722..82ecd8267d 100644 --- a/src/rpc/virnettlscontext.h +++ b/src/rpc/virnettlscontext.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NET_TLS_CONTEXT_H__ -# define __VIR_NET_TLS_CONTEXT_H__ +#ifndef LIBVIRT_VIRNETTLSCONTEXT_H +# define LIBVIRT_VIRNETTLSCONTEXT_H # include "internal.h" # include "virobject.h" @@ -100,4 +100,4 @@ int virNetTLSSessionGetKeySize(virNetTLSSessionPtr sess); const char *virNetTLSSessionGetX509DName(virNetTLSSessionPtr sess); -#endif /* __VIR_NET_TLS_CONTEXT_H__ */ +#endif /* LIBVIRT_VIRNETTLSCONTEXT_H */ diff --git a/src/secret/secret_driver.h b/src/secret/secret_driver.h index 7c722bda37..b7e46ee045 100644 --- a/src/secret/secret_driver.h +++ b/src/secret/secret_driver.h @@ -18,9 +18,9 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_SECRET_DRIVER_H__ -# define __VIR_SECRET_DRIVER_H__ +#ifndef LIBVIRT_SECRET_DRIVER_H +# define LIBVIRT_SECRET_DRIVER_H int secretRegister(void); -#endif /* __VIR_SECRET_DRIVER_H__ */ +#endif /* LIBVIRT_SECRET_DRIVER_H */ diff --git a/src/secret/secret_util.h b/src/secret/secret_util.h index 12b51b1aa2..7219707390 100644 --- a/src/secret/secret_util.h +++ b/src/secret/secret_util.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_SECRET_UTIL_H__ -# define __VIR_SECRET_UTIL_H__ +#ifndef LIBVIRT_SECRET_UTIL_H +# define LIBVIRT_SECRET_UTIL_H # include "internal.h" # include "virsecret.h" @@ -32,4 +32,4 @@ int virSecretGetSecretString(virConnectPtr conn, size_t *ret_secret_size) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; -#endif /* __VIR_SECRET_UTIL_H__ */ +#endif /* LIBVIRT_SECRET_UTIL_H */ diff --git a/src/security/security_apparmor.h b/src/security/security_apparmor.h index a3661a82ec..730f72ff98 100644 --- a/src/security/security_apparmor.h +++ b/src/security/security_apparmor.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_SECURITY_APPARMOR_H__ -# define __VIR_SECURITY_APPARMOR_H__ +#ifndef LIBVIRT_SECURITY_APPARMOR_H +# define LIBVIRT_SECURITY_APPARMOR_H # include "security_driver.h" @@ -27,4 +27,4 @@ extern virSecurityDriver virAppArmorSecurityDriver; # define PROFILE_NAME_SIZE 8 + VIR_UUID_STRING_BUFLEN /* AA_PREFIX + uuid */ # define MAX_FILE_LEN (1024*1024*10) /* 10MB limit for sanity check */ -#endif /* __VIR_SECURITY_APPARMOR_H__ */ +#endif /* LIBVIRT_SECURITY_APPARMOR_H */ diff --git a/src/security/security_dac.h b/src/security/security_dac.h index adc5494328..318ca06d75 100644 --- a/src/security/security_dac.h +++ b/src/security/security_dac.h @@ -18,8 +18,8 @@ * POSIX DAC security driver */ -#ifndef __VIR_SECURITY_DAC -# define __VIR_SECURITY_DAC +#ifndef LIBVIRT_SECURITY_DAC_H +# define LIBVIRT_SECURITY_DAC_H # include "security_driver.h" @@ -38,4 +38,4 @@ void virSecurityDACSetMountNamespace(virSecurityManagerPtr mgr, void virSecurityDACSetChownCallback(virSecurityManagerPtr mgr, virSecurityManagerDACChownCallback chownCallback); -#endif /* __VIR_SECURITY_DAC */ +#endif /* LIBVIRT_SECURITY_DAC_H */ diff --git a/src/security/security_driver.h b/src/security/security_driver.h index 1969f7f089..70c8cde50b 100644 --- a/src/security/security_driver.h +++ b/src/security/security_driver.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_SECURITY_H__ -# define __VIR_SECURITY_H__ +#ifndef LIBVIRT_SECURITY_DRIVER_H +# define LIBVIRT_SECURITY_DRIVER_H # include "internal.h" # include "domain_conf.h" @@ -223,4 +223,4 @@ struct _virSecurityDriver { virSecurityDriverPtr virSecurityDriverLookup(const char *name, const char *virtDriver); -#endif /* __VIR_SECURITY_H__ */ +#endif /* LIBVIRT_SECURITY_DRIVER_H */ diff --git a/src/security/security_manager.h b/src/security/security_manager.h index 23815ccded..f7beb29f86 100644 --- a/src/security/security_manager.h +++ b/src/security/security_manager.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef VIR_SECURITY_MANAGER_H__ -# define VIR_SECURITY_MANAGER_H__ +#ifndef LIBVIRT_SECURITY_MANAGER_H +# define LIBVIRT_SECURITY_MANAGER_H # include "domain_conf.h" # include "vircommand.h" @@ -208,4 +208,4 @@ void virSecurityManagerMetadataUnlock(virSecurityManagerPtr mgr, virSecurityManagerMetadataLockStatePtr *state); -#endif /* VIR_SECURITY_MANAGER_H__ */ +#endif /* LIBVIRT_SECURITY_MANAGER_H */ diff --git a/src/security/security_nop.h b/src/security/security_nop.h index 514b339467..31e46420b1 100644 --- a/src/security/security_nop.h +++ b/src/security/security_nop.h @@ -17,11 +17,11 @@ * */ -#ifndef __VIR_SECURITY_NOP_H__ -# define __VIR_SECURITY_NOP_H__ +#ifndef LIBVIRT_SECURITY_NOP_H +# define LIBVIRT_SECURITY_NOP_H # include "security_driver.h" extern virSecurityDriver virSecurityDriverNop; -#endif /* __VIR_SECURITY_NOP_H__ */ +#endif /* LIBVIRT_SECURITY_NOP_H */ diff --git a/src/security/security_selinux.h b/src/security/security_selinux.h index 3d46289849..dfd2b73baa 100644 --- a/src/security/security_selinux.h +++ b/src/security/security_selinux.h @@ -16,9 +16,9 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_SECURITY_SELINUX_H__ -# define __VIR_SECURITY_SELINUX_H__ +#ifndef LIBVIRT_SECURITY_SELINUX_H +# define LIBVIRT_SECURITY_SELINUX_H extern virSecurityDriver virSecurityDriverSELinux; -#endif /* __VIR_SECURITY_SELINUX_H__ */ +#endif /* LIBVIRT_SECURITY_SELINUX_H */ diff --git a/src/security/security_stack.h b/src/security/security_stack.h index 633182fdd8..8c264d967a 100644 --- a/src/security/security_stack.h +++ b/src/security/security_stack.h @@ -18,8 +18,8 @@ * Stacked security driver */ -#ifndef __VIR_SECURITY_STACK -# define __VIR_SECURITY_STACK +#ifndef LIBVIRT_SECURITY_STACK_H +# define LIBVIRT_SECURITY_STACK_H # include "security_driver.h" @@ -35,4 +35,4 @@ virSecurityStackGetPrimary(virSecurityManagerPtr mgr); virSecurityManagerPtr* virSecurityStackGetNested(virSecurityManagerPtr mgr); -#endif /* __VIR_SECURITY_STACK */ +#endif /* LIBVIRT_SECURITY_STACK_H */ diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index 6e74f85523..2b178494ae 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_STORAGE_BACKEND_H__ -# define __VIR_STORAGE_BACKEND_H__ +#ifndef LIBVIRT_STORAGE_BACKEND_H +# define LIBVIRT_STORAGE_BACKEND_H # include <sys/stat.h> @@ -126,4 +126,4 @@ int virStorageBackendDriversRegister(bool allmodules); int virStorageBackendRegister(virStorageBackendPtr backend); -#endif /* __VIR_STORAGE_BACKEND_H__ */ +#endif /* LIBVIRT_STORAGE_BACKEND_H */ diff --git a/src/storage/storage_backend_disk.h b/src/storage/storage_backend_disk.h index 6b450e6352..71c3bcaa2b 100644 --- a/src/storage/storage_backend_disk.h +++ b/src/storage/storage_backend_disk.h @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_STORAGE_BACKEND_DISK_H__ -# define __VIR_STORAGE_BACKEND_DISK_H__ +#ifndef LIBVIRT_STORAGE_BACKEND_DISK_H +# define LIBVIRT_STORAGE_BACKEND_DISK_H int virStorageBackendDiskRegister(void); -#endif /* __VIR_STORAGE_BACKEND_DISK_H__ */ +#endif /* LIBVIRT_STORAGE_BACKEND_DISK_H */ diff --git a/src/storage/storage_backend_fs.h b/src/storage/storage_backend_fs.h index e942f057e2..638c16a01e 100644 --- a/src/storage/storage_backend_fs.h +++ b/src/storage/storage_backend_fs.h @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_STORAGE_BACKEND_FS_H__ -# define __VIR_STORAGE_BACKEND_FS_H__ +#ifndef LIBVIRT_STORAGE_BACKEND_FS_H +# define LIBVIRT_STORAGE_BACKEND_FS_H int virStorageBackendFsRegister(void); -#endif /* __VIR_STORAGE_BACKEND_FS_H__ */ +#endif /* LIBVIRT_STORAGE_BACKEND_FS_H */ diff --git a/src/storage/storage_backend_gluster.h b/src/storage/storage_backend_gluster.h index 91b8d8275d..586d6e94dd 100644 --- a/src/storage/storage_backend_gluster.h +++ b/src/storage/storage_backend_gluster.h @@ -19,9 +19,9 @@ * */ -#ifndef __VIR_STORAGE_BACKEND_GLUSTER_H__ -# define __VIR_STORAGE_BACKEND_GLUSTER_H__ +#ifndef LIBVIRT_STORAGE_BACKEND_GLUSTER_H +# define LIBVIRT_STORAGE_BACKEND_GLUSTER_H int virStorageBackendGlusterRegister(void); -#endif /* __VIR_STORAGE_BACKEND_GLUSTER_H__ */ +#endif /* LIBVIRT_STORAGE_BACKEND_GLUSTER_H */ diff --git a/src/storage/storage_backend_iscsi.h b/src/storage/storage_backend_iscsi.h index e0935e6558..4b04d1b81d 100644 --- a/src/storage/storage_backend_iscsi.h +++ b/src/storage/storage_backend_iscsi.h @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_STORAGE_BACKEND_ISCSI_H__ -# define __VIR_STORAGE_BACKEND_ISCSI_H__ +#ifndef LIBVIRT_STORAGE_BACKEND_ISCSI_H +# define LIBVIRT_STORAGE_BACKEND_ISCSI_H int virStorageBackendISCSIRegister(void); -#endif /* __VIR_STORAGE_BACKEND_ISCSI_H__ */ +#endif /* LIBVIRT_STORAGE_BACKEND_ISCSI_H */ diff --git a/src/storage/storage_backend_iscsi_direct.h b/src/storage/storage_backend_iscsi_direct.h index eb56e857ec..07c8acad9d 100644 --- a/src/storage/storage_backend_iscsi_direct.h +++ b/src/storage/storage_backend_iscsi_direct.h @@ -14,9 +14,9 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_STORAGE_BACKEND_ISCSI_H__ -# define __VIR_STORAGE_BACKEND_ISCSI_H__ +#ifndef LIBVIRT_STORAGE_BACKEND_ISCSI_DIRECT_H +# define LIBVIRT_STORAGE_BACKEND_ISCSI_DIRECT_H int virStorageBackendISCSIDirectRegister(void); -#endif /* __VIR_STORAGE_BACKEND_ISCSI_H__ */ +#endif /* LIBVIRT_STORAGE_BACKEND_ISCSI_DIRECT_H */ diff --git a/src/storage/storage_backend_logical.h b/src/storage/storage_backend_logical.h index 6d0edd03b4..79374c6ca3 100644 --- a/src/storage/storage_backend_logical.h +++ b/src/storage/storage_backend_logical.h @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_STORAGE_BACKEND_LOGICAL_H__ -# define __VIR_STORAGE_BACKEND_LOGICAL_H__ +#ifndef LIBVIRT_STORAGE_BACKEND_LOGICAL_H +# define LIBVIRT_STORAGE_BACKEND_LOGICAL_H int virStorageBackendLogicalRegister(void); -#endif /* __VIR_STORAGE_BACKEND_LOGICAL_H__ */ +#endif /* LIBVIRT_STORAGE_BACKEND_LOGICAL_H */ diff --git a/src/storage/storage_backend_mpath.h b/src/storage/storage_backend_mpath.h index dfd3225217..39afa99964 100644 --- a/src/storage/storage_backend_mpath.h +++ b/src/storage/storage_backend_mpath.h @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_STORAGE_BACKEND_MPATH_H__ -# define __VIR_STORAGE_BACKEND_MPATH_H__ +#ifndef LIBVIRT_STORAGE_BACKEND_MPATH_H +# define LIBVIRT_STORAGE_BACKEND_MPATH_H int virStorageBackendMpathRegister(void); -#endif /* __VIR_STORAGE_BACKEND_MPATH_H__ */ +#endif /* LIBVIRT_STORAGE_BACKEND_MPATH_H */ diff --git a/src/storage/storage_backend_rbd.h b/src/storage/storage_backend_rbd.h index fb92ca3e10..1b53d3c65c 100644 --- a/src/storage/storage_backend_rbd.h +++ b/src/storage/storage_backend_rbd.h @@ -18,9 +18,9 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_STORAGE_BACKEND_RBD_H__ -# define __VIR_STORAGE_BACKEND_RBD_H__ +#ifndef LIBVIRT_STORAGE_BACKEND_RBD_H +# define LIBVIRT_STORAGE_BACKEND_RBD_H int virStorageBackendRBDRegister(void); -#endif /* __VIR_STORAGE_BACKEND_RBD_H__ */ +#endif /* LIBVIRT_STORAGE_BACKEND_RBD_H */ diff --git a/src/storage/storage_backend_scsi.h b/src/storage/storage_backend_scsi.h index af98fa502f..7daa2221db 100644 --- a/src/storage/storage_backend_scsi.h +++ b/src/storage/storage_backend_scsi.h @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_STORAGE_BACKEND_SCSI_H__ -# define __VIR_STORAGE_BACKEND_SCSI_H__ +#ifndef LIBVIRT_STORAGE_BACKEND_SCSI_H +# define LIBVIRT_STORAGE_BACKEND_SCSI_H int virStorageBackendSCSIRegister(void); -#endif /* __VIR_STORAGE_BACKEND_SCSI_H__ */ +#endif /* LIBVIRT_STORAGE_BACKEND_SCSI_H */ diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index 96d825cc1d..b6f424bea1 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -25,7 +25,7 @@ #include "virerror.h" #include "storage_backend_sheepdog.h" -#define __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_ALLOW_H__ +#define LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H_ALLOW #include "storage_backend_sheepdog_priv.h" #include "storage_conf.h" #include "vircommand.h" diff --git a/src/storage/storage_backend_sheepdog.h b/src/storage/storage_backend_sheepdog.h index a023c07460..e09ad14d1e 100644 --- a/src/storage/storage_backend_sheepdog.h +++ b/src/storage/storage_backend_sheepdog.h @@ -20,9 +20,9 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_STORAGE_BACKEND_SHEEPDOG_H__ -# define __VIR_STORAGE_BACKEND_SHEEPDOG_H__ +#ifndef LIBVIRT_STORAGE_BACKEND_SHEEPDOG_H +# define LIBVIRT_STORAGE_BACKEND_SHEEPDOG_H int virStorageBackendSheepdogRegister(void); -#endif /* __VIR_STORAGE_BACKEND_SHEEPDOG_H__ */ +#endif /* LIBVIRT_STORAGE_BACKEND_SHEEPDOG_H */ diff --git a/src/storage/storage_backend_sheepdog_priv.h b/src/storage/storage_backend_sheepdog_priv.h index 7dc2d7db3c..9f28835934 100644 --- a/src/storage/storage_backend_sheepdog_priv.h +++ b/src/storage/storage_backend_sheepdog_priv.h @@ -16,12 +16,12 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_ALLOW_H__ +#ifndef LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H_ALLOW # error "storage_backend_sheepdog_priv.h may only be included by storage_backend_sheepdog.c or test suites" -#endif /* __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_ALLOW_H__ */ +#endif /* LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H_ALLOW */ -#ifndef __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_H__ -# define __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_H__ +#ifndef LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H +# define LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H # include "conf/storage_conf.h" @@ -30,4 +30,4 @@ int virStorageBackendSheepdogParseNodeInfo(virStoragePoolDefPtr pool, int virStorageBackendSheepdogParseVdiList(virStorageVolDefPtr vol, char *output); -#endif /* __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_H__ */ +#endif /* LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H */ diff --git a/src/storage/storage_backend_vstorage.h b/src/storage/storage_backend_vstorage.h index 0a29c597fd..e6f5f821fa 100644 --- a/src/storage/storage_backend_vstorage.h +++ b/src/storage/storage_backend_vstorage.h @@ -18,9 +18,9 @@ * */ -#ifndef __VIR_STORAGE_BACKEND_VSTORAGE_H__ -# define __VIR_STORAGE_BACKEND_VSTORAGE_H__ +#ifndef LIBVIRT_STORAGE_BACKEND_VSTORAGE_H +# define LIBVIRT_STORAGE_BACKEND_VSTORAGE_H int virStorageBackendVstorageRegister(void); -#endif /* __VIR_STORAGE_BACKEND_VSTORAGE_H__ */ +#endif /* LIBVIRT_STORAGE_BACKEND_VSTORAGE_H */ diff --git a/src/storage/storage_backend_zfs.h b/src/storage/storage_backend_zfs.h index 076ff27998..98388c5fca 100644 --- a/src/storage/storage_backend_zfs.h +++ b/src/storage/storage_backend_zfs.h @@ -19,9 +19,9 @@ * */ -#ifndef __VIR_STORAGE_BACKEND_ZFS_H__ -# define __VIR_STORAGE_BACKEND_ZFS_H__ +#ifndef LIBVIRT_STORAGE_BACKEND_ZFS_H +# define LIBVIRT_STORAGE_BACKEND_ZFS_H int virStorageBackendZFSRegister(void); -#endif /* __VIR_STORAGE_BACKEND_ZFS_H__ */ +#endif /* LIBVIRT_STORAGE_BACKEND_ZFS_H */ diff --git a/src/storage/storage_driver.h b/src/storage/storage_driver.h index b5f82dde2e..75632adee5 100644 --- a/src/storage/storage_driver.h +++ b/src/storage/storage_driver.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_STORAGE_DRIVER_H__ -# define __VIR_STORAGE_DRIVER_H__ +#ifndef LIBVIRT_STORAGE_DRIVER_H +# define LIBVIRT_STORAGE_DRIVER_H # include <sys/stat.h> @@ -42,4 +42,4 @@ char *virStoragePoolObjBuildTempFilePath(virStoragePoolObjPtr obj, int storageRegister(void); int storageRegisterAll(void); -#endif /* __VIR_STORAGE_DRIVER_H__ */ +#endif /* LIBVIRT_STORAGE_DRIVER_H */ diff --git a/src/storage/storage_file_fs.h b/src/storage/storage_file_fs.h index 6b86f68b24..c51c875bc2 100644 --- a/src/storage/storage_file_fs.h +++ b/src/storage/storage_file_fs.h @@ -18,9 +18,9 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_STORAGE_FILE_FS_H__ -# define __VIR_STORAGE_FILE_FS_H__ +#ifndef LIBVIRT_STORAGE_FILE_FS_H +# define LIBVIRT_STORAGE_FILE_FS_H int virStorageFileFsRegister(void); -#endif /* __VIR_STORAGE_FILE_FS_H__ */ +#endif /* LIBVIRT_STORAGE_FILE_FS_H */ diff --git a/src/storage/storage_file_gluster.h b/src/storage/storage_file_gluster.h index a3955f9577..3e46cd1c1e 100644 --- a/src/storage/storage_file_gluster.h +++ b/src/storage/storage_file_gluster.h @@ -19,9 +19,9 @@ * */ -#ifndef __VIR_STORAGE_FILE_GLUSTER_H__ -# define __VIR_STORAGE_FILE_GLUSTER_H__ +#ifndef LIBVIRT_STORAGE_FILE_GLUSTER_H +# define LIBVIRT_STORAGE_FILE_GLUSTER_H int virStorageFileGlusterRegister(void); -#endif /* __VIR_STORAGE_FILE_GLUSTER_H__ */ +#endif /* LIBVIRT_STORAGE_FILE_GLUSTER_H */ diff --git a/src/storage/storage_util.h b/src/storage/storage_util.h index a2ef2ac07d..9520c0b825 100644 --- a/src/storage/storage_util.h +++ b/src/storage/storage_util.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_STORAGE_UTIL_H__ -# define __VIR_STORAGE_UTIL_H__ +#ifndef LIBVIRT_STORAGE_UTIL_H +# define LIBVIRT_STORAGE_UTIL_H # include <sys/stat.h> @@ -188,4 +188,4 @@ virCommandPtr virStorageBackendLogicalChangeCmd(virStoragePoolDefPtr def, bool on); -#endif /* __VIR_STORAGE_UTIL_H__ */ +#endif /* LIBVIRT_STORAGE_UTIL_H */ diff --git a/src/test/test_driver.h b/src/test/test_driver.h index df74433c36..7201a40a52 100644 --- a/src/test/test_driver.h +++ b/src/test/test_driver.h @@ -21,11 +21,11 @@ * Daniel Berrange <berrange@redhat.com> */ -#ifndef __VIR_TEST_INTERNAL_H__ -# define __VIR_TEST_INTERNAL_H__ +#ifndef LIBVIRT_TEST_DRIVER_H +# define LIBVIRT_TEST_DRIVER_H # include "internal.h" int testRegister(void); -#endif /* __VIR_TEST_INTERNAL_H__ */ +#endif /* LIBVIRT_TEST_DRIVER_H */ diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h index e301715630..a9520a6d3e 100644 --- a/src/uml/uml_conf.h +++ b/src/uml/uml_conf.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __UML_CONF_H -# define __UML_CONF_H +#ifndef LIBVIRT_UML_CONF_H +# define LIBVIRT_UML_CONF_H # include "internal.h" # include "libvirt_internal.h" @@ -79,4 +79,4 @@ virCommandPtr umlBuildCommandLine(virConnectPtr conn, struct uml_driver *driver, virDomainObjPtr dom); -#endif /* __UML_CONF_H */ +#endif /* LIBVIRT_UML_CONF_H */ diff --git a/src/uml/uml_driver.h b/src/uml/uml_driver.h index 8f877b49c5..3a258f6658 100644 --- a/src/uml/uml_driver.h +++ b/src/uml/uml_driver.h @@ -19,11 +19,11 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef UML_DRIVER_H -# define UML_DRIVER_H +#ifndef LIBVIRT_UML_DRIVER_H +# define LIBVIRT_UML_DRIVER_H # include "internal.h" int umlRegister(void); -#endif /* UML_DRIVER_H */ +#endif /* LIBVIRT_UML_DRIVER_H */ diff --git a/src/util/viralloc.h b/src/util/viralloc.h index 9e45ab5f11..aa1b92241d 100644 --- a/src/util/viralloc.h +++ b/src/util/viralloc.h @@ -20,8 +20,8 @@ * */ -#ifndef __VIR_MEMORY_H_ -# define __VIR_MEMORY_H_ +#ifndef LIBVIRT_VIRALLOC_H +# define LIBVIRT_VIRALLOC_H # include "internal.h" @@ -637,4 +637,4 @@ void virAllocTestHook(void (*func)(int, void*), void *data); # define VIR_AUTOPTR(type) \ __attribute__((cleanup(VIR_AUTOPTR_FUNC_NAME(type)))) type * -#endif /* __VIR_MEMORY_H_ */ +#endif /* LIBVIRT_VIRALLOC_H */ diff --git a/src/util/virarch.h b/src/util/virarch.h index 3247a86d49..638ca9f484 100644 --- a/src/util/virarch.h +++ b/src/util/virarch.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_ARCH_H__ -# define __VIR_ARCH_H__ +#ifndef LIBVIRT_VIRARCH_H +# define LIBVIRT_VIRARCH_H # include "internal.h" @@ -108,4 +108,4 @@ virArch virArchFromString(const char *name); virArch virArchFromHost(void); -#endif /* __VIR_ARCH_H__ */ +#endif /* LIBVIRT_VIRARCH_H */ diff --git a/src/util/virarptable.h b/src/util/virarptable.h index 783c6e7abc..4437b3544f 100644 --- a/src/util/virarptable.h +++ b/src/util/virarptable.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_ARPTABLE_H__ -# define __VIR_ARPTABLE_H__ +#ifndef LIBVIRT_VIRARPTABLE_H +# define LIBVIRT_VIRARPTABLE_H # include "internal.h" @@ -41,4 +41,4 @@ struct _virArpTable { virArpTablePtr virArpTableGet(void); void virArpTableFree(virArpTablePtr table); -#endif /* __VIR_ARPTABLE_H__ */ +#endif /* LIBVIRT_VIRARPTABLE_H */ diff --git a/src/util/viratomic.h b/src/util/viratomic.h index f63436fb6b..0b2b3df081 100644 --- a/src/util/viratomic.h +++ b/src/util/viratomic.h @@ -23,8 +23,8 @@ * */ -#ifndef __VIR_ATOMIC_H__ -# define __VIR_ATOMIC_H__ +#ifndef LIBVIRT_VIRATOMIC_H +# define LIBVIRT_VIRATOMIC_H # include "internal.h" @@ -451,4 +451,4 @@ virAtomicIntXor(volatile unsigned int *atomic, # endif -#endif /* __VIR_ATOMIC_H__ */ +#endif /* LIBVIRT_VIRATOMIC_H */ diff --git a/src/util/viraudit.h b/src/util/viraudit.h index 9e3fc89771..66605b16b5 100644 --- a/src/util/viraudit.h +++ b/src/util/viraudit.h @@ -19,8 +19,8 @@ * */ -#ifndef __LIBVIRT_AUDIT_H__ -# define __LIBVIRT_AUDIT_H__ +#ifndef LIBVIRT_VIRAUDIT_H +# define LIBVIRT_VIRAUDIT_H # include "internal.h" # include "virlog.h" @@ -57,4 +57,4 @@ void virAuditClose(void); # define VIR_AUDIT_STR(str) \ ((str) ? (str) : "?") -#endif /* __LIBVIRT_AUDIT_H__ */ +#endif /* LIBVIRT_VIRAUDIT_H */ diff --git a/src/util/virauth.h b/src/util/virauth.h index 268eb3492d..ebcca2cc01 100644 --- a/src/util/virauth.h +++ b/src/util/virauth.h @@ -20,8 +20,8 @@ * */ -#ifndef __VIR_AUTH_H__ -# define __VIR_AUTH_H__ +#ifndef LIBVIRT_VIRAUTH_H +# define LIBVIRT_VIRAUTH_H # include "internal.h" # include "viruri.h" @@ -53,4 +53,4 @@ char * virAuthGetPasswordPath(const char *path, const char *servicename, const char *username, const char *hostname); -#endif /* __VIR_AUTH_H__ */ +#endif /* LIBVIRT_VIRAUTH_H */ diff --git a/src/util/virauthconfig.h b/src/util/virauthconfig.h index d02051d1d9..93bb434616 100644 --- a/src/util/virauthconfig.h +++ b/src/util/virauthconfig.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_AUTHCONFIG_H__ -# define __VIR_AUTHCONFIG_H__ +#ifndef LIBVIRT_VIRAUTHCONFIG_H +# define LIBVIRT_VIRAUTHCONFIG_H # include "internal.h" # include "viralloc.h" @@ -43,4 +43,4 @@ int virAuthConfigLookup(virAuthConfigPtr auth, VIR_DEFINE_AUTOPTR_FUNC(virAuthConfig, virAuthConfigFree) -#endif /* __VIR_AUTHCONFIG_H__ */ +#endif /* LIBVIRT_VIRAUTHCONFIG_H */ diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h index 4318db6766..dfb30b3bc8 100644 --- a/src/util/virbitmap.h +++ b/src/util/virbitmap.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __BITMAP_H__ -# define __BITMAP_H__ +#ifndef LIBVIRT_VIRBITMAP_H +# define LIBVIRT_VIRBITMAP_H # include "internal.h" # include "viralloc.h" @@ -156,4 +156,4 @@ void virBitmapShrink(virBitmapPtr map, size_t b); VIR_DEFINE_AUTOPTR_FUNC(virBitmap, virBitmapFree) -#endif /* __BITMAP_H__ */ +#endif /* LIBVIRT_VIRBITMAP_H */ diff --git a/src/util/virbuffer.h b/src/util/virbuffer.h index c662e8ea72..4b8111de8e 100644 --- a/src/util/virbuffer.h +++ b/src/util/virbuffer.h @@ -20,8 +20,8 @@ * Daniel Veillard <veillard@redhat.com> */ -#ifndef __VIR_BUFFER_H__ -# define __VIR_BUFFER_H__ +#ifndef LIBVIRT_VIRBUFFER_H +# define LIBVIRT_VIRBUFFER_H # include <stdarg.h> @@ -123,4 +123,4 @@ void virBufferAddStr(virBufferPtr buf, const char *str); VIR_DEFINE_AUTOPTR_FUNC(virBuffer, virBufferFreeAndReset) -#endif /* __VIR_BUFFER_H__ */ +#endif /* LIBVIRT_VIRBUFFER_H */ diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 3b41dfd99d..a4e9f906cc 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -38,7 +38,7 @@ # include <unistd.h> #endif /* __linux__ */ -#define __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__ +#define LIBVIRT_VIRCGROUPPRIV_H_ALLOW #include "vircgrouppriv.h" #include "virutil.h" diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index 8309bf08d8..372009de4a 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_CGROUP_H__ -# define __VIR_CGROUP_H__ +#ifndef LIBVIRT_VIRCGROUP_H +# define LIBVIRT_VIRCGROUP_H # include "virutil.h" # include "virbitmap.h" @@ -284,4 +284,4 @@ int virCgroupSetOwner(virCgroupPtr cgroup, int virCgroupHasEmptyTasks(virCgroupPtr cgroup, int controller); bool virCgroupControllerAvailable(int controller); -#endif /* __VIR_CGROUP_H__ */ +#endif /* LIBVIRT_VIRCGROUP_H */ diff --git a/src/util/vircgroupbackend.c b/src/util/vircgroupbackend.c index 2e90781dc3..f85da0041d 100644 --- a/src/util/vircgroupbackend.c +++ b/src/util/vircgroupbackend.c @@ -20,9 +20,8 @@ #include <config.h> #include "vircgroupbackend.h" -#define __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__ +#define LIBVIRT_VIRCGROUPPRIV_H_ALLOW #include "vircgrouppriv.h" -#undef __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__ #include "vircgroupv1.h" #include "vircgroupv2.h" #include "virerror.h" diff --git a/src/util/vircgroupbackend.h b/src/util/vircgroupbackend.h index bc60b44643..29e8b8645e 100644 --- a/src/util/vircgroupbackend.h +++ b/src/util/vircgroupbackend.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_CGROUP_BACKEND_H__ -# define __VIR_CGROUP_BACKEND_H__ +#ifndef LIBVIRT_VIRCGROUPBACKEND_H +# define LIBVIRT_VIRCGROUPBACKEND_H # include "internal.h" @@ -454,4 +454,4 @@ virCgroupBackendForController(virCgroupPtr group, } \ return backend->func(group, ##__VA_ARGS__); -#endif /* __VIR_CGROUP_BACKEND_H__ */ +#endif /* LIBVIRT_VIRCGROUPBACKEND_H */ diff --git a/src/util/vircgrouppriv.h b/src/util/vircgrouppriv.h index f0e3d349c8..bd87f2ea30 100644 --- a/src/util/vircgrouppriv.h +++ b/src/util/vircgrouppriv.h @@ -19,12 +19,12 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__ +#ifndef LIBVIRT_VIRCGROUPPRIV_H_ALLOW # error "vircgrouppriv.h may only be included by vircgroup.c or its test suite" -#endif /* __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__ */ +#endif /* LIBVIRT_VIRCGROUPPRIV_H_ALLOW */ -#ifndef __VIR_CGROUP_PRIV_H__ -# define __VIR_CGROUP_PRIV_H__ +#ifndef LIBVIRT_VIRCGROUPPRIV_H +# define LIBVIRT_VIRCGROUPPRIV_H # include "vircgroup.h" # include "vircgroupbackend.h" @@ -120,4 +120,4 @@ int virCgroupNewDomainPartition(virCgroupPtr partition, int virCgroupRemoveRecursively(char *grppath); -#endif /* __VIR_CGROUP_PRIV_H__ */ +#endif /* LIBVIRT_VIRCGROUPPRIV_H */ diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index ab1a2870a3..b2729f6f55 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -28,9 +28,8 @@ #include "internal.h" -#define __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__ +#define LIBVIRT_VIRCGROUPPRIV_H_ALLOW #include "vircgrouppriv.h" -#undef __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__ #include "vircgroup.h" #include "vircgroupbackend.h" diff --git a/src/util/vircgroupv1.h b/src/util/vircgroupv1.h index 517517c109..b1f86b5492 100644 --- a/src/util/vircgroupv1.h +++ b/src/util/vircgroupv1.h @@ -18,10 +18,10 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_CGROUP_V1_H__ -# define __VIR_CGROUP_V1_H__ +#ifndef LIBVIRT_VIRCGROUPV1_H +# define LIBVIRT_VIRCGROUPV1_H void virCgroupV1Register(void); -#endif /* __VIR_CGROUP_V1_H__ */ +#endif /* LIBVIRT_VIRCGROUPV1_H */ diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c index 85aa62bd4c..a8327e394c 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -26,9 +26,8 @@ #include "internal.h" -#define __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__ +#define LIBVIRT_VIRCGROUPPRIV_H_ALLOW #include "vircgrouppriv.h" -#undef __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__ #include "vircgroup.h" #include "vircgroupbackend.h" diff --git a/src/util/vircgroupv2.h b/src/util/vircgroupv2.h index a5d0bd0978..a877d36a01 100644 --- a/src/util/vircgroupv2.h +++ b/src/util/vircgroupv2.h @@ -18,10 +18,10 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_CGROUP_V2_H__ -# define __VIR_CGROUP_V2_H__ +#ifndef LIBVIRT_VIRCGROUPV2_H +# define LIBVIRT_VIRCGROUPV2_H void virCgroupV2Register(void); -#endif /* __VIR_CGROUP_V2_H__ */ +#endif /* LIBVIRT_VIRCGROUPV2_H */ diff --git a/src/util/virclosecallbacks.h b/src/util/virclosecallbacks.h index 74ba7e19dd..e756c79a90 100644 --- a/src/util/virclosecallbacks.h +++ b/src/util/virclosecallbacks.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_CLOSE_CALLBACKS__ -# define __VIR_CLOSE_CALLBACKS__ +#ifndef LIBVIRT_VIRCLOSECALLBACKS_H +# define LIBVIRT_VIRCLOSECALLBACKS_H # include "conf/virdomainobjlist.h" @@ -49,4 +49,4 @@ virCloseCallbacksRun(virCloseCallbacksPtr closeCallbacks, virConnectPtr conn, virDomainObjListPtr domains, void *opaque); -#endif /* __VIR_CLOSE_CALLBACKS__ */ +#endif /* LIBVIRT_VIRCLOSECALLBACKS_H */ diff --git a/src/util/vircommand.c b/src/util/vircommand.c index de937f6f9a..6f106df33b 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -41,7 +41,7 @@ # include <sys/apparmor.h> #endif -#define __VIR_COMMAND_PRIV_H_ALLOW__ +#define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW #include "vircommandpriv.h" #include "virerror.h" #include "virutil.h" diff --git a/src/util/vircommand.h b/src/util/vircommand.h index 90bcc6c89d..f299acc775 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_COMMAND_H__ -# define __VIR_COMMAND_H__ +#ifndef LIBVIRT_VIRCOMMAND_H +# define LIBVIRT_VIRCOMMAND_H # include "internal.h" # include "virbuffer.h" @@ -221,4 +221,4 @@ int virCommandRunNul(virCommandPtr cmd, VIR_DEFINE_AUTOPTR_FUNC(virCommand, virCommandFree) -#endif /* __VIR_COMMAND_H__ */ +#endif /* LIBVIRT_VIRCOMMAND_H */ diff --git a/src/util/vircommandpriv.h b/src/util/vircommandpriv.h index a21643555a..e2f4c19596 100644 --- a/src/util/vircommandpriv.h +++ b/src/util/vircommandpriv.h @@ -19,12 +19,12 @@ * */ -#ifndef __VIR_COMMAND_PRIV_H_ALLOW__ +#ifndef LIBVIRT_VIRCOMMANDPRIV_H_ALLOW # error "vircommandpriv.h may only be included by vircommand.c or test suites" -#endif /* __VIR_COMMAND_PRIV_H_ALLOW__ */ +#endif /* LIBVIRT_VIRCOMMANDPRIV_H_ALLOW */ -#ifndef __VIR_COMMAND_PRIV_H__ -# define __VIR_COMMAND_PRIV_H__ +#ifndef LIBVIRT_VIRCOMMANDPRIV_H +# define LIBVIRT_VIRCOMMANDPRIV_H # include "vircommand.h" @@ -40,4 +40,4 @@ void virCommandSetDryRun(virBufferPtr buf, virCommandDryRunCallback cb, void *opaque); -#endif /* __VIR_COMMAND_PRIV_H__ */ +#endif /* LIBVIRT_VIRCOMMANDPRIV_H */ diff --git a/src/util/virconf.h b/src/util/virconf.h index c672ad645d..411b8d669b 100644 --- a/src/util/virconf.h +++ b/src/util/virconf.h @@ -20,8 +20,8 @@ * Daniel Veillard <veillard@redhat.com> */ -#ifndef __VIR_CONF_H__ -# define __VIR_CONF_H__ +#ifndef LIBVIRT_VIRCONF_H +# define LIBVIRT_VIRCONF_H # include "virutil.h" @@ -130,4 +130,4 @@ int virConfWriteMem(char *memory, virConfPtr conf); int virConfLoadConfig(virConfPtr *conf, const char *name); -#endif /* __VIR_CONF_H__ */ +#endif /* LIBVIRT_VIRCONF_H */ diff --git a/src/util/vircrypto.h b/src/util/vircrypto.h index e3c70d7d9a..f816ab5435 100644 --- a/src/util/vircrypto.h +++ b/src/util/vircrypto.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_CRYPTO_H__ -# define __VIR_CRYPTO_H__ +#ifndef LIBVIRT_VIRCRYPTO_H +# define LIBVIRT_VIRCRYPTO_H # include "internal.h" @@ -65,4 +65,4 @@ int virCryptoEncryptData(virCryptoCipher algorithm, ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(6) ATTRIBUTE_NONNULL(8) ATTRIBUTE_NONNULL(9) ATTRIBUTE_RETURN_CHECK; -#endif /* __VIR_CRYPTO_H__ */ +#endif /* LIBVIRT_VIRCRYPTO_H */ diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 1c84b9c8bd..691f182387 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -21,7 +21,7 @@ #include <config.h> -#define __VIR_DBUS_PRIV_H_ALLOW__ +#define LIBVIRT_VIRDBUSPRIV_H_ALLOW #include "virdbuspriv.h" #include "viralloc.h" #include "virerror.h" diff --git a/src/util/virdbus.h b/src/util/virdbus.h index 86b4223ffb..268a42afd4 100644 --- a/src/util/virdbus.h +++ b/src/util/virdbus.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_DBUS_H__ -# define __VIR_DBUS_H__ +#ifndef LIBVIRT_VIRDBUS_H +# define LIBVIRT_VIRDBUS_H # ifdef WITH_DBUS # undef interface /* Work around namespace pollution in mingw's rpc.h */ @@ -75,4 +75,4 @@ int virDBusIsServiceEnabled(const char *name); int virDBusIsServiceRegistered(const char *name); bool virDBusErrorIsUnknownMethod(virErrorPtr err); -#endif /* __VIR_DBUS_H__ */ +#endif /* LIBVIRT_VIRDBUS_H */ diff --git a/src/util/virdbuspriv.h b/src/util/virdbuspriv.h index 5f97a49676..4f0140c520 100644 --- a/src/util/virdbuspriv.h +++ b/src/util/virdbuspriv.h @@ -19,12 +19,12 @@ * */ -#ifndef __VIR_DBUS_PRIV_H_ALLOW__ +#ifndef LIBVIRT_VIRDBUSPRIV_H_ALLOW # error "virdbuspriv.h may only be included by virdbus.c or test suites" -#endif /* __VIR_DBUS_PRIV_H_ALLOW__ */ +#endif /* LIBVIRT_VIRDBUSPRIV_H_ALLOW */ -#ifndef __VIR_DBUS_PRIV_H__ -# define __VIR_DBUS_PRIV_H__ +#ifndef LIBVIRT_VIRDBUSPRIV_H +# define LIBVIRT_VIRDBUSPRIV_H # include "virdbus.h" @@ -60,4 +60,4 @@ int virDBusMessageDecode(DBusMessage* msg, const char *types, ...); -#endif /* __VIR_DBUS_PRIV_H__ */ +#endif /* LIBVIRT_VIRDBUSPRIV_H */ diff --git a/src/util/virdevmapper.h b/src/util/virdevmapper.h index f15242b2b0..d9e1c1775a 100644 --- a/src/util/virdevmapper.h +++ b/src/util/virdevmapper.h @@ -18,11 +18,11 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_DEVMAPPER_H__ -# define __VIR_DEVMAPPER_H__ +#ifndef LIBVIRT_VIRDEVMAPPER_H +# define LIBVIRT_VIRDEVMAPPER_H int virDevMapperGetTargets(const char *path, char ***devPaths); -#endif /* __VIR_DEVMAPPER_H__ */ +#endif /* LIBVIRT_VIRDEVMAPPER_H */ diff --git a/src/util/virdnsmasq.h b/src/util/virdnsmasq.h index efd8ee0f62..74774743fa 100644 --- a/src/util/virdnsmasq.h +++ b/src/util/virdnsmasq.h @@ -21,8 +21,8 @@ * based on iptables.h */ -#ifndef __DNSMASQ_H__ -# define __DNSMASQ_H__ +#ifndef LIBVIRT_VIRDNSMASQ_H +# define LIBVIRT_VIRDNSMASQ_H # include "virobject.h" # include "virsocketaddr.h" @@ -119,4 +119,4 @@ unsigned long dnsmasqCapsGetVersion(dnsmasqCapsPtr caps); (dnsmasqCapsGetVersion(CAPS) >= \ (DNSMASQ_RA_MAJOR_REQD * 1000000) + \ (DNSMASQ_RA_MINOR_REQD * 1000)) -#endif /* __DNSMASQ_H__ */ +#endif /* LIBVIRT_VIRDNSMASQ_H */ diff --git a/src/util/virebtables.h b/src/util/virebtables.h index b8cb584963..87bb3a3708 100644 --- a/src/util/virebtables.h +++ b/src/util/virebtables.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __QEMUD_EBTABLES_H__ -# define __QEMUD_EBTABLES_H__ +#ifndef LIBVIRT_VIREBTABLES_H +# define LIBVIRT_VIREBTABLES_H # include "virmacaddr.h" @@ -38,4 +38,4 @@ int ebtablesRemoveForwardAllowIn (ebtablesContext *ctx, int ebtablesAddForwardPolicyReject(ebtablesContext *ctx); -#endif /* __QEMUD_EBTABLES_H__ */ +#endif /* LIBVIRT_VIREBTABLES_H */ diff --git a/src/util/virendian.h b/src/util/virendian.h index 25c2f1ab1d..4a92b1822d 100644 --- a/src/util/virendian.h +++ b/src/util/virendian.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_ENDIAN_H__ -# define __VIR_ENDIAN_H__ +#ifndef LIBVIRT_VIRENDIAN_H +# define LIBVIRT_VIRENDIAN_H # include "internal.h" @@ -114,4 +114,4 @@ ((uint16_t)(uint8_t)((buf)[0]) | \ ((uint16_t)(uint8_t)((buf)[1]) << 8)) -#endif /* __VIR_ENDIAN_H__ */ +#endif /* LIBVIRT_VIRENDIAN_H */ diff --git a/src/util/virerror.h b/src/util/virerror.h index ff5bde9b10..d9d3109a4c 100644 --- a/src/util/virerror.h +++ b/src/util/virerror.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIRT_ERROR_H_ -# define __VIRT_ERROR_H_ +#ifndef LIBVIRT_VIRERROR_H +# define LIBVIRT_VIRERROR_H # include "internal.h" # include "viralloc.h" @@ -208,4 +208,4 @@ void virErrorRestore(virErrorPtr *savederr); VIR_DEFINE_AUTOPTR_FUNC(virError, virFreeError) -#endif /* __VIRT_ERROR_H_ */ +#endif /* LIBVIRT_VIRERROR_H */ diff --git a/src/util/virevent.h b/src/util/virevent.h index e26871a2ac..37d7070935 100644 --- a/src/util/virevent.h +++ b/src/util/virevent.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_EVENT_H__ -# define __VIR_EVENT_H__ +#ifndef LIBVIRT_VIREVENT_H +# define LIBVIRT_VIREVENT_H # include "internal.h" -#endif /* __VIR_EVENT_H__ */ +#endif /* LIBVIRT_VIREVENT_H */ diff --git a/src/util/vireventpoll.h b/src/util/vireventpoll.h index 199a658c2e..ad1ee56e7c 100644 --- a/src/util/vireventpoll.h +++ b/src/util/vireventpoll.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_EVENT_POLL_H__ -# define __VIR_EVENT_POLL_H__ +#ifndef LIBVIRT_VIREVENTPOLL_H +# define LIBVIRT_VIREVENTPOLL_H # include "internal.h" @@ -127,4 +127,4 @@ int virEventPollToNativeEvents(int events); int virEventPollInterrupt(void); -#endif /* __VIR_EVENT_POLL_H__ */ +#endif /* LIBVIRT_VIREVENTPOLL_H */ diff --git a/src/util/virfcp.h b/src/util/virfcp.h index fab6e9403b..16a6b2d42e 100644 --- a/src/util/virfcp.h +++ b/src/util/virfcp.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_FCP_H__ -# define __VIR_FCP_H__ +#ifndef LIBVIRT_VIRFCP_H +# define LIBVIRT_VIRFCP_H bool virFCIsCapableRport(const char *rport); @@ -29,4 +29,4 @@ virFCReadRportValue(const char *rport, const char *entry, char **result); -#endif /* __VIR_FCP_H__ */ +#endif /* LIBVIRT_VIRFCP_H */ diff --git a/src/util/virfdstream.h b/src/util/virfdstream.h index 905975ff1e..093db303ff 100644 --- a/src/util/virfdstream.h +++ b/src/util/virfdstream.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_FDSTREAM_H_ -# define __VIR_FDSTREAM_H_ +#ifndef LIBVIRT_VIRFDSTREAM_H +# define LIBVIRT_VIRFDSTREAM_H # include "internal.h" @@ -65,4 +65,4 @@ int virFDStreamSetInternalCloseCb(virStreamPtr st, virFDStreamInternalCloseCb cb, void *opaque, virFDStreamInternalCloseCbFreeOpaque fcb); -#endif /* __VIR_FDSTREAM_H_ */ +#endif /* LIBVIRT_VIRFDSTREAM_H */ diff --git a/src/util/virfile.h b/src/util/virfile.h index 795c339356..04b3e4dfb3 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -22,8 +22,8 @@ * */ -#ifndef __VIR_FILE_H_ -# define __VIR_FILE_H_ +#ifndef LIBVIRT_VIRFILE_H +# define LIBVIRT_VIRFILE_H # include <dirent.h> @@ -382,4 +382,4 @@ int virFileInData(int fd, VIR_DEFINE_AUTOPTR_FUNC(virFileWrapperFd, virFileWrapperFdFree) -#endif /* __VIR_FILE_H_ */ +#endif /* LIBVIRT_VIRFILE_H */ diff --git a/src/util/virfilecache.h b/src/util/virfilecache.h index af6a189d7f..70c8a4bffe 100644 --- a/src/util/virfilecache.h +++ b/src/util/virfilecache.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_FILE_CACHE_H__ -# define __VIR_FILE_CACHE_H__ +#ifndef LIBVIRT_VIRFILECACHE_H +# define LIBVIRT_VIRFILECACHE_H # include "internal.h" @@ -134,4 +134,4 @@ virFileCacheInsertData(virFileCachePtr cache, const char *name, void *data); -#endif /* __VIR_FILE_CACHE_H__ */ +#endif /* LIBVIRT_VIRFILECACHE_H */ diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index 8218a400d6..c25d2ddfad 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -20,10 +20,9 @@ #include <config.h> -#define __VIR_FIREWALL_PRIV_H_ALLOW__ - #include <stdarg.h> +#define LIBVIRT_VIRFIREWALLPRIV_H_ALLOW #include "virfirewallpriv.h" #include "virerror.h" #include "virutil.h" diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h index c955a2d07a..a1c45e0427 100644 --- a/src/util/virfirewall.h +++ b/src/util/virfirewall.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_FIREWALL_H__ -# define __VIR_FIREWALL_H__ +#ifndef LIBVIRT_VIRFIREWALL_H +# define LIBVIRT_VIRFIREWALL_H # include "internal.h" # include "viralloc.h" @@ -116,4 +116,4 @@ void virFirewallSetLockOverride(bool avoid); VIR_DEFINE_AUTOPTR_FUNC(virFirewall, virFirewallFree) -#endif /* __VIR_FIREWALL_H__ */ +#endif /* LIBVIRT_VIRFIREWALL_H */ diff --git a/src/util/virfirewallpriv.h b/src/util/virfirewallpriv.h index 1dca0c5e9a..efa94a7da4 100644 --- a/src/util/virfirewallpriv.h +++ b/src/util/virfirewallpriv.h @@ -18,12 +18,12 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_FIREWALL_PRIV_H_ALLOW__ +#ifndef LIBVIRT_VIRFIREWALLPRIV_H_ALLOW # error "virfirewallpriv.h may only be included by virfirewall.c or test suites" -#endif /* __VIR_FIREWALL_PRIV_H_ALLOW__ */ +#endif /* LIBVIRT_VIRFIREWALLPRIV_H_ALLOW */ -#ifndef __VIR_FIREWALL_PRIV_H__ -# define __VIR_FIREWALL_PRIV_H__ +#ifndef LIBVIRT_VIRFIREWALLPRIV_H +# define LIBVIRT_VIRFIREWALLPRIV_H # include "virfirewall.h" @@ -39,4 +39,4 @@ typedef enum { int virFirewallSetBackend(virFirewallBackend backend); -#endif /* __VIR_FIREWALL_PRIV_H__ */ +#endif /* LIBVIRT_VIRFIREWALLPRIV_H */ diff --git a/src/util/virfirmware.h b/src/util/virfirmware.h index 0bff013337..784e34cc65 100644 --- a/src/util/virfirmware.h +++ b/src/util/virfirmware.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_FIRMWARE_H__ -# define __VIR_FIRMWARE_H__ +#ifndef LIBVIRT_VIRFIRMWARE_H +# define LIBVIRT_VIRFIRMWARE_H # include "internal.h" @@ -46,4 +46,4 @@ virFirmwareParseList(const char *list, ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); -#endif /* __VIR_FIRMWARE_H__ */ +#endif /* LIBVIRT_VIRFIRMWARE_H */ diff --git a/src/util/virgettext.h b/src/util/virgettext.h index 5e9cfd2719..fe5daa3fe2 100644 --- a/src/util/virgettext.h +++ b/src/util/virgettext.h @@ -18,9 +18,9 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_GETTEXT_H__ -# define __VIR_GETTEXT_H__ +#ifndef LIBVIRT_VIRGETTEXT_H +# define LIBVIRT_VIRGETTEXT_H int virGettextInitialize(void); -#endif /* __VIR_GETTEXT_H__ */ +#endif /* LIBVIRT_VIRGETTEXT_H */ diff --git a/src/util/virgic.h b/src/util/virgic.h index 0e6fc4f566..371d04f708 100644 --- a/src/util/virgic.h +++ b/src/util/virgic.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_GIC_H__ -# define __VIR_GIC_H__ +#ifndef LIBVIRT_VIRGIC_H +# define LIBVIRT_VIRGIC_H # include "virutil.h" @@ -46,4 +46,4 @@ struct _virGICCapability { virGICImplementation implementation; }; -#endif /* __VIR_GIC_H__ */ +#endif /* LIBVIRT_VIRGIC_H */ diff --git a/src/util/virhash.h b/src/util/virhash.h index 811b6c5b21..0c849561f8 100644 --- a/src/util/virhash.h +++ b/src/util/virhash.h @@ -7,8 +7,8 @@ * Copyright (C) 2000 Bjorn Reese and Daniel Veillard. */ -#ifndef __VIR_HASH_H__ -# define __VIR_HASH_H__ +#ifndef LIBVIRT_VIRHASH_H +# define LIBVIRT_VIRHASH_H # include "viralloc.h" @@ -199,4 +199,4 @@ void virHashValueFree(void *value, const void *name); VIR_DEFINE_AUTOPTR_FUNC(virHashTable, virHashFree) -#endif /* __VIR_HASH_H__ */ +#endif /* LIBVIRT_VIRHASH_H */ diff --git a/src/util/virhashcode.h b/src/util/virhashcode.h index f8171df268..e512e04bac 100644 --- a/src/util/virhashcode.h +++ b/src/util/virhashcode.h @@ -25,12 +25,12 @@ * clients can be both 64 or 32 bit at the same time. */ -#ifndef __VIR_HASH_CODE_H__ -# define __VIR_HASH_CODE_H__ +#ifndef LIBVIRT_VIRHASHCODE_H +# define LIBVIRT_VIRHASHCODE_H # include "internal.h" uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed) ATTRIBUTE_NOINLINE; -#endif /* __VIR_HASH_CODE_H__ */ +#endif /* LIBVIRT_VIRHASHCODE_H */ diff --git a/src/util/virhook.h b/src/util/virhook.h index 64ae8c0ada..034fb8f263 100644 --- a/src/util/virhook.h +++ b/src/util/virhook.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_HOOKS_H__ -# define __VIR_HOOKS_H__ +#ifndef LIBVIRT_VIRHOOK_H +# define LIBVIRT_VIRHOOK_H # include "internal.h" @@ -105,4 +105,4 @@ int virHookPresent(int driver); int virHookCall(int driver, const char *id, int op, int sub_op, const char *extra, const char *input, char **output); -#endif /* __VIR_HOOKS_H__ */ +#endif /* LIBVIRT_VIRHOOK_H */ diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 9e80c192ac..6514c3d765 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -40,7 +40,7 @@ #include "c-ctype.h" #include "viralloc.h" -#define __VIR_HOSTCPU_PRIV_H_ALLOW__ +#define LIBVIRT_VIRHOSTCPUPRIV_H_ALLOW #include "virhostcpupriv.h" #include "physmem.h" #include "virerror.h" diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h index 9107bb32ff..df6a7e789d 100644 --- a/src/util/virhostcpu.h +++ b/src/util/virhostcpu.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_HOSTCPU_H__ -# define __VIR_HOSTCPU_H__ +#ifndef LIBVIRT_VIRHOSTCPU_H +# define LIBVIRT_VIRHOSTCPU_H # include "internal.h" # include "virarch.h" @@ -66,4 +66,4 @@ int virHostCPUGetOnline(unsigned int cpu, bool *online); unsigned int virHostCPUGetMicrocodeVersion(void); -#endif /* __VIR_HOSTCPU_H__ */ +#endif /* LIBVIRT_VIRHOSTCPU_H */ diff --git a/src/util/virhostcpupriv.h b/src/util/virhostcpupriv.h index 52ab4a9fe0..980d4cb1fa 100644 --- a/src/util/virhostcpupriv.h +++ b/src/util/virhostcpupriv.h @@ -19,12 +19,12 @@ * */ -#ifndef __VIR_HOSTCPU_PRIV_H_ALLOW__ +#ifndef LIBVIRT_VIRHOSTCPUPRIV_H_ALLOW # error "virhostcpupriv.h may only be included by virhostcpu.c or test suites" -#endif /* __VIR_HOSTCPU_PRIV_H_ALLOW__ */ +#endif /* LIBVIRT_VIRHOSTCPUPRIV_H_ALLOW */ -#ifndef __VIR_HOSTCPU_PRIV_H__ -# define __VIR_HOSTCPU_PRIV_H__ +#ifndef LIBVIRT_VIRHOSTCPUPRIV_H +# define LIBVIRT_VIRHOSTCPUPRIV_H # include "virhostcpu.h" @@ -44,4 +44,4 @@ int virHostCPUGetStatsLinux(FILE *procstat, int *nparams); # endif -#endif /* __VIR_HOSTCPU_PRIV_H__ */ +#endif /* LIBVIRT_VIRHOSTCPUPRIV_H */ diff --git a/src/util/virhostdev.h b/src/util/virhostdev.h index 93d7ccd886..7263f320a2 100644 --- a/src/util/virhostdev.h +++ b/src/util/virhostdev.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_HOSTDEV_H__ -# define __VIR_HOSTDEV_H__ +#ifndef LIBVIRT_VIRHOSTDEV_H +# define LIBVIRT_VIRHOSTDEV_H # include "internal.h" @@ -203,4 +203,4 @@ int virHostdevPCINodeDeviceReset(virHostdevManagerPtr mgr, virPCIDevicePtr pci) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -#endif /* __VIR_HOSTDEV_H__ */ +#endif /* LIBVIRT_VIRHOSTDEV_H */ diff --git a/src/util/virhostmem.h b/src/util/virhostmem.h index c5a3853fdf..cba1732d8d 100644 --- a/src/util/virhostmem.h +++ b/src/util/virhostmem.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_HOSTMEM_H__ -# define __VIR_HOSTMEM_H__ +#ifndef LIBVIRT_VIRHOSTMEM_H +# define LIBVIRT_VIRHOSTMEM_H # include "internal.h" @@ -55,4 +55,4 @@ int virHostMemAllocPages(unsigned int npages, unsigned int cellCount, bool add); -#endif /* __VIR_HOSTMEM_H__ */ +#endif /* LIBVIRT_VIRHOSTMEM_H */ diff --git a/src/util/viridentity.h b/src/util/viridentity.h index 63aa63d573..e385eda622 100644 --- a/src/util/viridentity.h +++ b/src/util/viridentity.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_IDENTITY_H__ -# define __VIR_IDENTITY_H__ +#ifndef LIBVIRT_VIRIDENTITY_H +# define LIBVIRT_VIRIDENTITY_H # include "virobject.h" @@ -105,4 +105,4 @@ int virIdentitySetSELinuxContext(virIdentityPtr ident, const char *context); -#endif /* __VIR_IDENTITY_H__ */ +#endif /* LIBVIRT_VIRIDENTITY_H */ diff --git a/src/util/virinitctl.h b/src/util/virinitctl.h index 83170753da..7ac627883a 100644 --- a/src/util/virinitctl.h +++ b/src/util/virinitctl.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_INITCTL_H__ -# define __VIR_INITCTL_H__ +#ifndef LIBVIRT_VIRINITCTL_H +# define LIBVIRT_VIRINITCTL_H typedef enum { VIR_INITCTL_RUNLEVEL_POWEROFF = 0, @@ -35,4 +35,4 @@ typedef enum { int virInitctlSetRunLevel(virInitctlRunLevel level); -#endif /* __VIR_INITCTL_H__ */ +#endif /* LIBVIRT_VIRINITCTL_H */ diff --git a/src/util/viriptables.h b/src/util/viriptables.h index 477ec23d62..b978fe409b 100644 --- a/src/util/viriptables.h +++ b/src/util/viriptables.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_IPTABLES_H__ -# define __VIR_IPTABLES_H__ +#ifndef LIBVIRT_VIRIPTABLES_H +# define LIBVIRT_VIRIPTABLES_H # include "virsocketaddr.h" # include "virfirewall.h" @@ -145,4 +145,4 @@ void iptablesRemoveOutputFixUdpChecksum (virFirewallPtr fw, const char *iface, int port); -#endif /* __VIR_IPTABLES_H__ */ +#endif /* LIBVIRT_VIRIPTABLES_H */ diff --git a/src/util/viriscsi.h b/src/util/viriscsi.h index 3fbf906637..acf9ab18eb 100644 --- a/src/util/viriscsi.h +++ b/src/util/viriscsi.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_ISCSI_H__ -# define __VIR_ISCSI_H__ +#ifndef LIBVIRT_VIRISCSI_H +# define LIBVIRT_VIRISCSI_H # include "internal.h" @@ -69,4 +69,4 @@ virISCSINodeUpdate(const char *portal, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; -#endif /* __VIR_ISCSI_H__ */ +#endif /* LIBVIRT_VIRISCSI_H */ diff --git a/src/util/virjson.h b/src/util/virjson.h index 804cc0ce95..a6768d904c 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -20,8 +20,8 @@ * */ -#ifndef __VIR_JSON_H_ -# define __VIR_JSON_H_ +#ifndef LIBVIRT_VIRJSON_H +# define LIBVIRT_VIRJSON_H # include "internal.h" # include "virbitmap.h" @@ -158,4 +158,4 @@ virJSONValuePtr virJSONValueObjectDeflatten(virJSONValuePtr json); VIR_DEFINE_AUTOPTR_FUNC(virJSONValue, virJSONValueFree) -#endif /* __VIR_JSON_H_ */ +#endif /* LIBVIRT_VIRJSON_H */ diff --git a/src/util/virkeycode.h b/src/util/virkeycode.h index 106dae7a08..7120fb96e6 100644 --- a/src/util/virkeycode.h +++ b/src/util/virkeycode.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_UTIL_VIRTKEYCODE_H__ -# define __VIR_UTIL_VIRTKEYCODE_H__ +#ifndef LIBVIRT_VIRKEYCODE_H +# define LIBVIRT_VIRKEYCODE_H # include "virutil.h" @@ -30,4 +30,4 @@ int virKeycodeValueTranslate(virKeycodeSet from_codeset, virKeycodeSet to_offset, int key_value); -#endif /* __VIR_UTIL_VIRTKEYCODE_H__ */ +#endif /* LIBVIRT_VIRKEYCODE_H */ diff --git a/src/util/virkeyfile.h b/src/util/virkeyfile.h index 457d50472a..ad82bd02d5 100644 --- a/src/util/virkeyfile.h +++ b/src/util/virkeyfile.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_KEYFILE_H__ -# define __VIR_KEYFILE_H__ +#ifndef LIBVIRT_VIRKEYFILE_H +# define LIBVIRT_VIRKEYFILE_H # include "internal.h" @@ -58,4 +58,4 @@ const char *virKeyFileGetValueString(virKeyFilePtr conf, const char *valuename) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); -#endif /* __VIR_KEYFILE_H__ */ +#endif /* LIBVIRT_VIRKEYFILE_H */ diff --git a/src/util/virkmod.h b/src/util/virkmod.h index 608f1b884e..059af4fd5f 100644 --- a/src/util/virkmod.h +++ b/src/util/virkmod.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_KMOD_H__ -# define __VIR_KMOD_H__ +#ifndef LIBVIRT_VIRKMOD_H +# define LIBVIRT_VIRKMOD_H # include "internal.h" @@ -31,4 +31,4 @@ char *virKModUnload(const char *) ATTRIBUTE_NONNULL(1); bool virKModIsBlacklisted(const char *) ATTRIBUTE_NONNULL(1); -#endif /* __VIR_KMOD_H__ */ +#endif /* LIBVIRT_VIRKMOD_H */ diff --git a/src/util/virlease.h b/src/util/virlease.h index 9f151aed74..9aa8095f83 100644 --- a/src/util/virlease.h +++ b/src/util/virlease.h @@ -20,8 +20,8 @@ * */ -#ifndef __VIR_LEASE_H_ -# define __VIR_LEASE_H_ +#ifndef LIBVIRT_VIRLEASE_H +# define LIBVIRT_VIRLEASE_H # include "virjson.h" @@ -42,4 +42,4 @@ int virLeaseNew(virJSONValuePtr *lease_ret, const char *iaid, const char *server_duid); -#endif /* __VIR_LEASE_H_ */ +#endif /* LIBVIRT_VIRLEASE_H */ diff --git a/src/util/virlockspace.h b/src/util/virlockspace.h index 041cf20396..8e6b61d486 100644 --- a/src/util/virlockspace.h +++ b/src/util/virlockspace.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_LOCK_SPACE_H__ -# define __VIR_LOCK_SPACE_H__ +#ifndef LIBVIRT_VIRLOCKSPACE_H +# define LIBVIRT_VIRLOCKSPACE_H # include "internal.h" # include "virjson.h" @@ -59,4 +59,4 @@ int virLockSpaceReleaseResource(virLockSpacePtr lockspace, int virLockSpaceReleaseResourcesForOwner(virLockSpacePtr lockspace, pid_t owner); -#endif /* __VIR_LOCK_SPACE_H__ */ +#endif /* LIBVIRT_VIRLOCKSPACE_H */ diff --git a/src/util/virlog.h b/src/util/virlog.h index 1155d35663..8edd390378 100644 --- a/src/util/virlog.h +++ b/src/util/virlog.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIRTLOG_H_ -# define __VIRTLOG_H_ +#ifndef LIBVIRT_VIRLOG_H +# define LIBVIRT_VIRLOG_H # include "internal.h" # include "virbuffer.h" @@ -239,4 +239,4 @@ int virLogParseOutputs(const char *src, int virLogParseFilters(const char *src, virLogFilterPtr **filters) ATTRIBUTE_NONNULL(1); -#endif /* __VIRTLOG_H_ */ +#endif /* LIBVIRT_VIRLOG_H */ diff --git a/src/util/virmacaddr.h b/src/util/virmacaddr.h index 8369293e96..3999de3421 100644 --- a/src/util/virmacaddr.h +++ b/src/util/virmacaddr.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_MACADDR_H__ -# define __VIR_MACADDR_H__ +#ifndef LIBVIRT_VIRMACADDR_H +# define LIBVIRT_VIRMACADDR_H # include "internal.h" # include "viralloc.h" @@ -66,4 +66,4 @@ void virMacAddrFree(virMacAddrPtr addr); VIR_DEFINE_AUTOPTR_FUNC(virMacAddr, virMacAddrFree) -#endif /* __VIR_MACADDR_H__ */ +#endif /* LIBVIRT_VIRMACADDR_H */ diff --git a/src/util/virmacmap.h b/src/util/virmacmap.h index e34f98f661..68843b947a 100644 --- a/src/util/virmacmap.h +++ b/src/util/virmacmap.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_MACMAP_H__ -# define __VIR_MACMAP_H__ +#ifndef LIBVIRT_VIRMACMAP_H +# define LIBVIRT_VIRMACMAP_H typedef struct virMacMap virMacMap; typedef virMacMap *virMacMapPtr; @@ -47,4 +47,4 @@ int virMacMapWriteFile(virMacMapPtr mgr, int virMacMapDumpStr(virMacMapPtr mgr, char **str); -#endif /* __VIR_MACMAP_H__ */ +#endif /* LIBVIRT_VIRMACMAP_H */ diff --git a/src/util/virmdev.h b/src/util/virmdev.h index c856ff5bdb..1c584712c4 100644 --- a/src/util/virmdev.h +++ b/src/util/virmdev.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_MDEV_H__ -# define __VIR_MDEV_H__ +#ifndef LIBVIRT_VIRMDEV_H +# define LIBVIRT_VIRMDEV_H # include "internal.h" # include "virobject.h" @@ -140,4 +140,4 @@ virMediatedDeviceTypeReadAttrs(const char *sysfspath, VIR_DEFINE_AUTOPTR_FUNC(virMediatedDevice, virMediatedDeviceFree) VIR_DEFINE_AUTOPTR_FUNC(virMediatedDeviceType, virMediatedDeviceTypeFree) -#endif /* __VIR_MDEV_H__ */ +#endif /* LIBVIRT_VIRMDEV_H */ diff --git a/src/util/virmodule.h b/src/util/virmodule.h index cccd836b41..de9f8ec07e 100644 --- a/src/util/virmodule.h +++ b/src/util/virmodule.h @@ -19,11 +19,11 @@ * */ -#ifndef __VIR_MODULE_H__ -# define __VIR_MODULE_H__ +#ifndef LIBVIRT_VIRMODULE_H +# define LIBVIRT_VIRMODULE_H int virModuleLoad(const char *path, const char *regfunc, bool required); -#endif /* __VIR_MODULE_H__ */ +#endif /* LIBVIRT_VIRMODULE_H */ diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 76f53a6470..7ffd872b94 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NETDEV_H__ -# define __VIR_NETDEV_H__ +#ifndef LIBVIRT_VIRNETDEV_H +# define LIBVIRT_VIRNETDEV_H # include <net/if.h> @@ -313,4 +313,4 @@ int virNetDevRunEthernetScript(const char *ifname, const char *script) VIR_DEFINE_AUTOPTR_FUNC(virNetDevRxFilter, virNetDevRxFilterFree) -#endif /* __VIR_NETDEV_H__ */ +#endif /* LIBVIRT_VIRNETDEV_H */ diff --git a/src/util/virnetdevbandwidth.h b/src/util/virnetdevbandwidth.h index 8e786eff9e..d243d7262a 100644 --- a/src/util/virnetdevbandwidth.h +++ b/src/util/virnetdevbandwidth.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NETDEV_BANDWIDTH_H__ -# define __VIR_NETDEV_BANDWIDTH_H__ +#ifndef LIBVIRT_VIRNETDEVBANDWIDTH_H +# define LIBVIRT_VIRNETDEVBANDWIDTH_H # include "internal.h" # include "virmacaddr.h" @@ -74,4 +74,4 @@ int virNetDevBandwidthUpdateFilter(const char *ifname, unsigned int id) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; -#endif /* __VIR_NETDEV_BANDWIDTH_H__ */ +#endif /* LIBVIRT_VIRNETDEVBANDWIDTH_H */ diff --git a/src/util/virnetdevbridge.h b/src/util/virnetdevbridge.h index b2967f1d42..f8cc70e7f0 100644 --- a/src/util/virnetdevbridge.h +++ b/src/util/virnetdevbridge.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NETDEV_BRIDGE_H__ -# define __VIR_NETDEV_BRIDGE_H__ +#ifndef LIBVIRT_VIRNETDEVBRIDGE_H +# define LIBVIRT_VIRNETDEVBRIDGE_H # include "internal.h" # include "virmacaddr.h" @@ -89,4 +89,4 @@ int virNetDevBridgeFDBAdd(const virMacAddr *mac, const char *ifname, int virNetDevBridgeFDBDel(const virMacAddr *mac, const char *ifname, unsigned int flags) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; -#endif /* __VIR_NETDEV_BRIDGE_H__ */ +#endif /* LIBVIRT_VIRNETDEVBRIDGE_H */ diff --git a/src/util/virnetdevip.h b/src/util/virnetdevip.h index 8ef85f58c4..1ecb4eae01 100644 --- a/src/util/virnetdevip.h +++ b/src/util/virnetdevip.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NETDEVIP_H__ -# define __VIR_NETDEVIP_H__ +#ifndef LIBVIRT_VIRNETDEVIP_H +# define LIBVIRT_VIRNETDEVIP_H # include "virsocketaddr.h" @@ -97,4 +97,4 @@ int virNetDevIPInfoAddToDev(const char *ifname, VIR_DEFINE_AUTOPTR_FUNC(virNetDevIPAddr, virNetDevIPAddrFree) VIR_DEFINE_AUTOPTR_FUNC(virNetDevIPRoute, virNetDevIPRouteFree) -#endif /* __VIR_NETDEVIP_H__ */ +#endif /* LIBVIRT_VIRNETDEVIP_H */ diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index a31401563c..a8dbc85da4 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -17,8 +17,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __UTIL_MACVTAP_H__ -# define __UTIL_MACVTAP_H__ +#ifndef LIBVIRT_VIRNETDEVMACVLAN_H +# define LIBVIRT_VIRNETDEVMACVLAN_H # include "internal.h" # include "virmacaddr.h" @@ -111,4 +111,4 @@ int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, virNetDevVPortProfileOp vmOp) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; -#endif /* __UTIL_MACVTAP_H__ */ +#endif /* LIBVIRT_VIRNETDEVMACVLAN_H */ diff --git a/src/util/virnetdevmidonet.h b/src/util/virnetdevmidonet.h index 7c44c045bd..dde72c0653 100644 --- a/src/util/virnetdevmidonet.h +++ b/src/util/virnetdevmidonet.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NETDEV_MIDONET_H__ -# define __VIR_NETDEV_MIDONET_H__ +#ifndef LIBVIRT_VIRNETDEVMIDONET_H +# define LIBVIRT_VIRNETDEVMIDONET_H # include "internal.h" # include "virnetdevvportprofile.h" @@ -30,4 +30,4 @@ int virNetDevMidonetBindPort(const char *ifname, int virNetDevMidonetUnbindPort(virNetDevVPortProfilePtr virtualport) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; -#endif /* __VIR_NETDEV_MIDONET_H__ */ +#endif /* LIBVIRT_VIRNETDEVMIDONET_H */ diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h index edb61baa76..c9428f9e3e 100644 --- a/src/util/virnetdevopenvswitch.h +++ b/src/util/virnetdevopenvswitch.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NETDEV_OPENVSWITCH_H__ -# define __VIR_NETDEV_OPENVSWITCH_H__ +#ifndef LIBVIRT_VIRNETDEVOPENVSWITCH_H +# define LIBVIRT_VIRNETDEVOPENVSWITCH_H # include "internal.h" # include "virnetdevvportprofile.h" @@ -65,4 +65,4 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname, virNetDevVlanPtr virtVlan) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; -#endif /* __VIR_NETDEV_OPENVSWITCH_H__ */ +#endif /* LIBVIRT_VIRNETDEVOPENVSWITCH_H */ diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h index b4e73f28e7..226122aa2c 100644 --- a/src/util/virnetdevtap.h +++ b/src/util/virnetdevtap.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NETDEV_TAP_H__ -# define __VIR_NETDEV_TAP_H__ +#ifndef LIBVIRT_VIRNETDEVTAP_H +# define LIBVIRT_VIRNETDEVTAP_H # include "internal.h" # include "virnetdev.h" @@ -92,4 +92,4 @@ int virNetDevTapInterfaceStats(const char *ifname, bool swapped) ATTRIBUTE_RETURN_CHECK; -#endif /* __VIR_NETDEV_TAP_H__ */ +#endif /* LIBVIRT_VIRNETDEVTAP_H */ diff --git a/src/util/virnetdevveth.h b/src/util/virnetdevveth.h index 9e5d6adb15..b00eb2b3a2 100644 --- a/src/util/virnetdevveth.h +++ b/src/util/virnetdevveth.h @@ -17,8 +17,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NETDEV_VETH_H__ -# define __VIR_NETDEV_VETH_H__ +#ifndef LIBVIRT_VIRNETDEVVETH_H +# define LIBVIRT_VIRNETDEVVETH_H # include "internal.h" @@ -28,4 +28,4 @@ int virNetDevVethCreate(char **veth1, char **veth2) int virNetDevVethDelete(const char *veth) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; -#endif /* __VIR_NETDEV_VETH_H__ */ +#endif /* LIBVIRT_VIRNETDEVVETH_H */ diff --git a/src/util/virnetdevvlan.h b/src/util/virnetdevvlan.h index 73e1ab40ad..816edce531 100644 --- a/src/util/virnetdevvlan.h +++ b/src/util/virnetdevvlan.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NETDEV_VLAN_H__ -# define __VIR_NETDEV_VLAN_H__ +#ifndef LIBVIRT_VIRNETDEVVLAN_H +# define LIBVIRT_VIRNETDEVVLAN_H # include <virutil.h> @@ -50,4 +50,4 @@ int virNetDevVlanCopy(virNetDevVlanPtr dst, const virNetDevVlan *src); VIR_DEFINE_AUTOPTR_FUNC(virNetDevVlan, virNetDevVlanFree) -#endif /* __VIR_NETDEV_VLAN_H__ */ +#endif /* LIBVIRT_VIRNETDEVVLAN_H */ diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprofile.h index 2c6f858415..da52d00708 100644 --- a/src/util/virnetdevvportprofile.h +++ b/src/util/virnetdevvportprofile.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NETDEV_VPORT_PROFILE_H__ -# define __VIR_NETDEV_VPORT_PROFILE_H__ +#ifndef LIBVIRT_VIRNETDEVVPORTPROFILE_H +# define LIBVIRT_VIRNETDEVVPORTPROFILE_H # include "internal.h" # include "viruuid.h" @@ -108,4 +108,4 @@ int virNetDevVPortProfileDisassociate(const char *ifname, ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; -#endif /* __VIR_NETDEV_VPORT_PROFILE_H__ */ +#endif /* LIBVIRT_VIRNETDEVVPORTPROFILE_H */ diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index fd140f0d57..debbd60f80 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -17,8 +17,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_NETLINK_H__ -# define __VIR_NETLINK_H__ +#ifndef LIBVIRT_VIRNETLINK_H +# define LIBVIRT_VIRNETLINK_H # include "internal.h" # include "virmacaddr.h" @@ -163,4 +163,4 @@ int virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB, int virNetlinkEventRemoveClient(int watch, const virMacAddr *macaddr, unsigned int protocol); -#endif /* __VIR_NETLINK_H__ */ +#endif /* LIBVIRT_VIRNETLINK_H */ diff --git a/src/util/virnodesuspend.h b/src/util/virnodesuspend.h index 64558ab0a5..c3e600ff88 100644 --- a/src/util/virnodesuspend.h +++ b/src/util/virnodesuspend.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_NODE_SUSPEND_H__ -# define __VIR_NODE_SUSPEND_H__ +#ifndef LIBVIRT_VIRNODESUSPEND_H +# define LIBVIRT_VIRNODESUSPEND_H # include "internal.h" @@ -30,4 +30,4 @@ int virNodeSuspend(unsigned int target, int virNodeSuspendGetTargetMask(unsigned int *bitmask); -#endif /* __VIR_NODE_SUSPEND_H__ */ +#endif /* LIBVIRT_VIRNODESUSPEND_H */ diff --git a/src/util/virnuma.h b/src/util/virnuma.h index edc206100f..cd7a3ec11f 100644 --- a/src/util/virnuma.h +++ b/src/util/virnuma.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_NUMA_H__ -# define __VIR_NUMA_H__ +#ifndef LIBVIRT_VIRNUMA_H +# define LIBVIRT_VIRNUMA_H # include "internal.h" # include "virbitmap.h" @@ -64,4 +64,4 @@ int virNumaSetPagePoolSize(int node, unsigned int page_size, unsigned long long page_count, bool add); -#endif /* __VIR_NUMA_H__ */ +#endif /* LIBVIRT_VIRNUMA_H */ diff --git a/src/util/virobject.h b/src/util/virobject.h index 6c48fb6249..b39b9946ff 100644 --- a/src/util/virobject.h +++ b/src/util/virobject.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_OBJECT_H__ -# define __VIR_OBJECT_H__ +#ifndef LIBVIRT_VIROBJECT_H +# define LIBVIRT_VIROBJECT_H # include "internal.h" # include "virthread.h" @@ -152,4 +152,4 @@ void virObjectListFreeCount(void *list, size_t count); -#endif /* __VIR_OBJECT_H__ */ +#endif /* LIBVIRT_VIROBJECT_H */ diff --git a/src/util/virpci.h b/src/util/virpci.h index 293eaa9b0a..5b6330788b 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_PCI_H__ -# define __VIR_PCI_H__ +#ifndef LIBVIRT_VIRPCI_H +# define LIBVIRT_VIRPCI_H # include "internal.h" # include "virmdev.h" @@ -275,4 +275,4 @@ VIR_DEFINE_AUTOPTR_FUNC(virPCIDevice, virPCIDeviceFree) VIR_DEFINE_AUTOPTR_FUNC(virPCIDeviceAddress, virPCIDeviceAddressFree) VIR_DEFINE_AUTOPTR_FUNC(virPCIEDeviceInfo, virPCIEDeviceInfoFree) -#endif /* __VIR_PCI_H__ */ +#endif /* LIBVIRT_VIRPCI_H */ diff --git a/src/util/virperf.h b/src/util/virperf.h index e926f91e0b..0d026e80c2 100644 --- a/src/util/virperf.h +++ b/src/util/virperf.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_PERF_H__ -# define __VIR_PERF_H__ +#ifndef LIBVIRT_VIRPERF_H +# define LIBVIRT_VIRPERF_H # include "virutil.h" # include "viralloc.h" @@ -84,4 +84,4 @@ int virPerfReadEvent(virPerfPtr perf, VIR_DEFINE_AUTOPTR_FUNC(virPerf, virPerfFree) -#endif /* __VIR_PERF_H__ */ +#endif /* LIBVIRT_VIRPERF_H */ diff --git a/src/util/virpidfile.h b/src/util/virpidfile.h index eb6516ca15..6ff55e7b02 100644 --- a/src/util/virpidfile.h +++ b/src/util/virpidfile.h @@ -21,8 +21,8 @@ * */ -#ifndef __VIR_PIDFILE_H__ -# define __VIR_PIDFILE_H__ +#ifndef LIBVIRT_VIRPIDFILE_H +# define LIBVIRT_VIRPIDFILE_H # include <sys/types.h> # include "internal.h" @@ -76,4 +76,4 @@ int virPidFileConstructPath(bool privileged, int virPidFileForceCleanupPath(const char *path) ATTRIBUTE_NONNULL(1); -#endif /* __VIR_PIDFILE_H__ */ +#endif /* LIBVIRT_VIRPIDFILE_H */ diff --git a/src/util/virpolkit.h b/src/util/virpolkit.h index 14ff0730d3..f234534015 100644 --- a/src/util/virpolkit.h +++ b/src/util/virpolkit.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_POLKIT_H__ -# define __VIR_POLKIT_H__ +#ifndef LIBVIRT_VIRPOLKIT_H +# define LIBVIRT_VIRPOLKIT_H # include "internal.h" # include "vircommand.h" @@ -40,4 +40,4 @@ typedef virPolkitAgent *virPolkitAgentPtr; void virPolkitAgentDestroy(virPolkitAgentPtr cmd); virPolkitAgentPtr virPolkitAgentCreate(void); -#endif /* __VIR_POLKIT_H__ */ +#endif /* LIBVIRT_VIRPOLKIT_H */ diff --git a/src/util/virportallocator.h b/src/util/virportallocator.h index de0209cdea..3144b7bf98 100644 --- a/src/util/virportallocator.h +++ b/src/util/virportallocator.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_PORT_ALLOCATOR_H__ -# define __VIR_PORT_ALLOCATOR_H__ +#ifndef LIBVIRT_VIRPORTALLOCATOR_H +# define LIBVIRT_VIRPORTALLOCATOR_H # include "internal.h" # include "virobject.h" @@ -42,4 +42,4 @@ int virPortAllocatorRelease(unsigned short port); int virPortAllocatorSetUsed(unsigned short port); -#endif /* __VIR_PORT_ALLOCATOR_H__ */ +#endif /* LIBVIRT_VIRPORTALLOCATOR_H */ diff --git a/src/util/virprobe.h b/src/util/virprobe.h index 88cda2104f..5635e58252 100644 --- a/src/util/virprobe.h +++ b/src/util/virprobe.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_PROBE_H__ -# define __VIR_PROBE_H__ +#ifndef LIBVIRT_VIRPROBE_H +# define LIBVIRT_VIRPROBE_H # include "internal.h" # include "virlog.h" @@ -105,4 +105,4 @@ # define PROBE_QUIET(NAME, FMT, ...) # endif -#endif /* __VIR_PROBE_H__ */ +#endif /* LIBVIRT_VIRPROBE_H */ diff --git a/src/util/virprocess.h b/src/util/virprocess.h index b1166902f0..e3944d3f1b 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_PROCESS_H__ -# define __VIR_PROCESS_H__ +#ifndef LIBVIRT_VIRPROCESS_H +# define LIBVIRT_VIRPROCESS_H # include <sys/types.h> @@ -125,4 +125,4 @@ typedef enum { int virProcessNamespaceAvailable(unsigned int ns); -#endif /* __VIR_PROCESS_H__ */ +#endif /* LIBVIRT_VIRPROCESS_H */ diff --git a/src/util/virqemu.h b/src/util/virqemu.h index 4a4d7e42cf..dc5497b6fd 100644 --- a/src/util/virqemu.h +++ b/src/util/virqemu.h @@ -20,8 +20,8 @@ * */ -#ifndef __VIR_QEMU_H_ -# define __VIR_QEMU_H_ +#ifndef LIBVIRT_VIRQEMU_H +# define LIBVIRT_VIRQEMU_H # include "internal.h" # include "virbuffer.h" @@ -53,4 +53,4 @@ void virQEMUBuildQemuImgKeySecretOpts(virBufferPtr buf, const char *alias) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); -#endif /* __VIR_QEMU_H_ */ +#endif /* LIBVIRT_VIRQEMU_H */ diff --git a/src/util/virrandom.h b/src/util/virrandom.h index 8d1257906d..55cd0971ae 100644 --- a/src/util/virrandom.h +++ b/src/util/virrandom.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_RANDOM_H__ -# define __VIR_RANDOM_H__ +#ifndef LIBVIRT_VIRRANDOM_H +# define LIBVIRT_VIRRANDOM_H # include "internal.h" @@ -28,4 +28,4 @@ int virRandomBytes(unsigned char *buf, size_t buflen) ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE; int virRandomGenerateWWN(char **wwn, const char *virt_type) ATTRIBUTE_NOINLINE; -#endif /* __VIR_RANDOM_H__ */ +#endif /* LIBVIRT_VIRRANDOM_H */ diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index c823ebb657..892b92559b 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -23,7 +23,7 @@ #include <sys/stat.h> #include <fcntl.h> -#define __VIR_RESCTRL_PRIV_H_ALLOW__ +#define LIBVIRT_VIRRESCTRLPRIV_H_ALLOW #include "virresctrlpriv.h" #include "viralloc.h" #include "virfile.h" diff --git a/src/util/virresctrl.h b/src/util/virresctrl.h index 04202b5f09..0aa8bf7ea3 100644 --- a/src/util/virresctrl.h +++ b/src/util/virresctrl.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_RESCTRL_H__ -# define __VIR_RESCTRL_H__ +#ifndef LIBVIRT_VIRRESCTRL_H +# define LIBVIRT_VIRRESCTRL_H # include "internal.h" @@ -235,4 +235,4 @@ virResctrlMonitorGetCacheOccupancy(virResctrlMonitorPtr monitor, void virResctrlMonitorFreeStats(virResctrlMonitorStatsPtr *stats, size_t nstats); -#endif /* __VIR_RESCTRL_H__ */ +#endif /* LIBVIRT_VIRRESCTRL_H */ diff --git a/src/util/virresctrlpriv.h b/src/util/virresctrlpriv.h index f8743d81ea..5f04c0c12e 100644 --- a/src/util/virresctrlpriv.h +++ b/src/util/virresctrlpriv.h @@ -16,16 +16,16 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_RESCTRL_PRIV_H_ALLOW__ +#ifndef LIBVIRT_VIRRESCTRLPRIV_H_ALLOW # error "virresctrlpriv.h may only be included by virresctrl.c or test suites" -#endif /* __VIR_RESCTRL_PRIV_H_ALLOW__ */ +#endif /* LIBVIRT_VIRRESCTRLPRIV_H_ALLOW */ -#ifndef __VIR_RESCTRL_PRIV_H__ -# define __VIR_RESCTRL_PRIV_H__ +#ifndef LIBVIRT_VIRRESCTRLPRIV_H +# define LIBVIRT_VIRRESCTRLPRIV_H # include "virresctrl.h" virResctrlAllocPtr virResctrlAllocGetUnused(virResctrlInfoPtr resctrl); -#endif /* __VIR_RESCTRL_PRIV_H__ */ +#endif /* LIBVIRT_VIRRESCTRLPRIV_H */ diff --git a/src/util/virrotatingfile.h b/src/util/virrotatingfile.h index 7848443101..1dc48fb947 100644 --- a/src/util/virrotatingfile.h +++ b/src/util/virrotatingfile.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_ROTATING_FILE_H__ -# define __VIR_ROTATING_FILE_H__ +#ifndef LIBVIRT_VIRROTATINGFILE_H +# define LIBVIRT_VIRROTATINGFILE_H # include "internal.h" @@ -59,4 +59,4 @@ ssize_t virRotatingFileReaderConsume(virRotatingFileReaderPtr file, void virRotatingFileWriterFree(virRotatingFileWriterPtr file); void virRotatingFileReaderFree(virRotatingFileReaderPtr file); -#endif /* __VIR_ROTATING_FILE_H__ */ +#endif /* LIBVIRT_VIRROTATINGFILE_H */ diff --git a/src/util/virscsi.h b/src/util/virscsi.h index 3cb50cb168..fd5986d2c0 100644 --- a/src/util/virscsi.h +++ b/src/util/virscsi.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_SCSI_H__ -# define __VIR_SCSI_H__ +#ifndef LIBVIRT_VIRSCSI_H +# define LIBVIRT_VIRSCSI_H # include "internal.h" # include "virobject.h" @@ -95,4 +95,4 @@ virSCSIDevicePtr virSCSIDeviceListFind(virSCSIDeviceListPtr list, VIR_DEFINE_AUTOPTR_FUNC(virSCSIDevice, virSCSIDeviceFree) -#endif /* __VIR_SCSI_H__ */ +#endif /* LIBVIRT_VIRSCSI_H */ diff --git a/src/util/virscsihost.h b/src/util/virscsihost.h index c35ccb9f50..1e8b8803ce 100644 --- a/src/util/virscsihost.h +++ b/src/util/virscsihost.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_SCSI_HOST_H__ -# define __VIR_SCSI_HOST_H__ +#ifndef LIBVIRT_VIRSCSIHOST_H +# define LIBVIRT_VIRSCSIHOST_H # include "internal.h" @@ -37,4 +37,4 @@ char *virSCSIHostGetNameByParentaddr(unsigned int domain, unsigned int function, unsigned int unique_id); -#endif /* __VIR_SCSI_HOST_H__ */ +#endif /* LIBVIRT_VIRSCSIHOST_H */ diff --git a/src/util/virscsivhost.h b/src/util/virscsivhost.h index 7123de8bc8..5440db16b2 100644 --- a/src/util/virscsivhost.h +++ b/src/util/virscsivhost.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_SCSIHOST_H__ -# define __VIR_SCSIHOST_H__ +#ifndef LIBVIRT_VIRSCSIVHOST_H +# define LIBVIRT_VIRSCSIVHOST_H # include "internal.h" # include "virobject.h" @@ -63,4 +63,4 @@ int virSCSIVHostOpenVhostSCSI(int *vhostfd) ATTRIBUTE_NOINLINE; VIR_DEFINE_AUTOPTR_FUNC(virSCSIVHostDevice, virSCSIVHostDeviceFree) -#endif /* __VIR_SCSIHOST_H__ */ +#endif /* LIBVIRT_VIRSCSIVHOST_H */ diff --git a/src/util/virseclabel.h b/src/util/virseclabel.h index 94c4dfc396..4480def79e 100644 --- a/src/util/virseclabel.h +++ b/src/util/virseclabel.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __SECLABEL_H -# define __SECLABEL_H +#ifndef LIBVIRT_VIRSECLABEL_H +# define LIBVIRT_VIRSECLABEL_H typedef enum { VIR_DOMAIN_SECLABEL_DEFAULT, @@ -68,4 +68,4 @@ virSecurityDeviceLabelDefCopy(const virSecurityDeviceLabelDef *src) void virSecurityLabelDefFree(virSecurityLabelDefPtr def); void virSecurityDeviceLabelDefFree(virSecurityDeviceLabelDefPtr def); -#endif /* __SECLABEL_H */ +#endif /* LIBVIRT_VIRSECLABEL_H */ diff --git a/src/util/virsecret.h b/src/util/virsecret.h index a56e0c0c57..9fdd25b53c 100644 --- a/src/util/virsecret.h +++ b/src/util/virsecret.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_SECRET_H__ -# define __VIR_SECRET_H__ +#ifndef LIBVIRT_VIRSECRET_H +# define LIBVIRT_VIRSECRET_H # include "internal.h" @@ -56,4 +56,4 @@ int virSecretLookupParseSecret(xmlNodePtr secretnode, void virSecretLookupFormatSecret(virBufferPtr buf, const char *secrettype, virSecretLookupTypeDefPtr def); -#endif /* __VIR_SECRET_H__ */ +#endif /* LIBVIRT_VIRSECRET_H */ diff --git a/src/util/virsexpr.h b/src/util/virsexpr.h index 7b8358cd72..4469207a75 100644 --- a/src/util/virsexpr.h +++ b/src/util/virsexpr.h @@ -20,8 +20,8 @@ * */ -#ifndef _LIBVIR_SEXPR_H_ -# define _LIBVIR_SEXPR_H_ +#ifndef LIBVIRT_VIRSEXPR_H +# define LIBVIRT_VIRSEXPR_H # include "internal.h" # include "virbuffer.h" @@ -66,4 +66,4 @@ int sexpr_int(const struct sexpr *sexpr, const char *name); double sexpr_float(const struct sexpr *sexpr, const char *name); uint64_t sexpr_u64(const struct sexpr *sexpr, const char *name); -#endif /* _LIBVIR_SEXPR_H_ */ +#endif /* LIBVIRT_VIRSEXPR_H */ diff --git a/src/util/virsocketaddr.h b/src/util/virsocketaddr.h index cfc79cf2ce..64bcbb36dc 100644 --- a/src/util/virsocketaddr.h +++ b/src/util/virsocketaddr.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_SOCKETADDR_H__ -# define __VIR_SOCKETADDR_H__ +#ifndef LIBVIRT_VIRSOCKETADDR_H +# define LIBVIRT_VIRSOCKETADDR_H # include <netinet/in.h> # include <sys/socket.h> @@ -162,4 +162,4 @@ void virSocketAddrFree(virSocketAddrPtr addr); VIR_DEFINE_AUTOPTR_FUNC(virSocketAddr, virSocketAddrFree) -#endif /* __VIR_SOCKETADDR_H__ */ +#endif /* LIBVIRT_VIRSOCKETADDR_H */ diff --git a/src/util/virstorageencryption.h b/src/util/virstorageencryption.h index 1134b0fe9d..421f0a2bcc 100644 --- a/src/util/virstorageencryption.h +++ b/src/util/virstorageencryption.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_STORAGE_ENCRYPTION_H__ -# define __VIR_STORAGE_ENCRYPTION_H__ +#ifndef LIBVIRT_VIRSTORAGEENCRYPTION_H +# define LIBVIRT_VIRSTORAGEENCRYPTION_H # include "internal.h" # include "virbuffer.h" @@ -93,4 +93,4 @@ enum { int virStorageGenerateQcowPassphrase(unsigned char *dest); -#endif /* __VIR_STORAGE_ENCRYPTION_H__ */ +#endif /* LIBVIRT_VIRSTORAGEENCRYPTION_H */ diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index f283e3cb08..1d6161a2c7 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_STORAGE_FILE_H__ -# define __VIR_STORAGE_FILE_H__ +#ifndef LIBVIRT_VIRSTORAGEFILE_H +# define LIBVIRT_VIRSTORAGEFILE_H # include <sys/stat.h> @@ -540,4 +540,4 @@ void virStorageFileReportBrokenChain(int errcode, virStorageSourcePtr src, virStorageSourcePtr parent); -#endif /* __VIR_STORAGE_FILE_H__ */ +#endif /* LIBVIRT_VIRSTORAGEFILE_H */ diff --git a/src/util/virstoragefilebackend.h b/src/util/virstoragefilebackend.h index 6686864367..c93bc4033a 100644 --- a/src/util/virstoragefilebackend.h +++ b/src/util/virstoragefilebackend.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_STORAGE_FILE_BACKEND_H__ -# define __VIR_STORAGE_FILE_BACKEND_H__ +#ifndef LIBVIRT_VIRSTORAGEFILEBACKEND_H +# define LIBVIRT_VIRSTORAGEFILEBACKEND_H # include <sys/stat.h> @@ -100,4 +100,4 @@ struct _virStorageFileBackend { int virStorageFileBackendRegister(virStorageFileBackendPtr backend); -#endif /* __VIR_STORAGE_FILE_BACKEND_H__ */ +#endif /* LIBVIRT_VIRSTORAGEFILEBACKEND_H */ diff --git a/src/util/virstring.h b/src/util/virstring.h index ee53ff2f5e..42848e62b1 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_STRING_H__ -# define __VIR_STRING_H__ +#ifndef LIBVIRT_VIRSTRING_H +# define LIBVIRT_VIRSTRING_H # include <stdarg.h> @@ -309,4 +309,4 @@ int virStringParsePort(const char *str, VIR_DEFINE_AUTOPTR_FUNC(virString, virStringListFree) -#endif /* __VIR_STRING_H__ */ +#endif /* LIBVIRT_VIRSTRING_H */ diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index b6785066f1..6cc1952a3a 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -34,7 +34,7 @@ #include "virfile.h" #include "virstring.h" -#define __VIR_SYSINFO_PRIV_H_ALLOW__ +#define LIBVIRT_VIRSYSINFOPRIV_H_ALLOW #include "virsysinfopriv.h" #define VIR_FROM_THIS VIR_FROM_SYSINFO diff --git a/src/util/virsysinfo.h b/src/util/virsysinfo.h index 33541701f9..f1ba3ff6c7 100644 --- a/src/util/virsysinfo.h +++ b/src/util/virsysinfo.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_SYSINFOS_H__ -# define __VIR_SYSINFOS_H__ +#ifndef LIBVIRT_VIRSYSINFO_H +# define LIBVIRT_VIRSYSINFO_H # include "internal.h" # include "virutil.h" @@ -152,4 +152,4 @@ bool virSysinfoIsEqual(virSysinfoDefPtr src, VIR_ENUM_DECL(virSysinfo) -#endif /* __VIR_SYSINFOS_H__ */ +#endif /* LIBVIRT_VIRSYSINFO_H */ diff --git a/src/util/virsysinfopriv.h b/src/util/virsysinfopriv.h index 607a9354fb..3ef675441e 100644 --- a/src/util/virsysinfopriv.h +++ b/src/util/virsysinfopriv.h @@ -17,12 +17,12 @@ * */ -#ifndef __VIR_SYSINFO_PRIV_H_ALLOW__ +#ifndef LIBVIRT_VIRSYSINFOPRIV_H_ALLOW # error "virsysinfopriv.h may only be included by virsysinfo.c or test suites" -#endif /* __VIR_SYSINFO_PRIV_H_ALLOW__ */ +#endif /* LIBVIRT_VIRSYSINFOPRIV_H_ALLOW */ -#ifndef __VIR_SYSINFO_PRIV_H__ -# define __VIR_SYSINFO_PRIV_H__ +#ifndef LIBVIRT_VIRSYSINFOPRIV_H +# define LIBVIRT_VIRSYSINFOPRIV_H void virSysinfoSetup(const char *dmidecode, @@ -41,4 +41,4 @@ virSysinfoReadS390(void); virSysinfoDefPtr virSysinfoReadX86(void); -#endif /* __VIR_SYSINFO_PRIV_H__ */ +#endif /* LIBVIRT_VIRSYSINFOPRIV_H */ diff --git a/src/util/virsystemd.c b/src/util/virsystemd.c index 3be963d704..f492ac1859 100644 --- a/src/util/virsystemd.c +++ b/src/util/virsystemd.c @@ -26,7 +26,7 @@ # include <sys/un.h> #endif -#define __VIR_SYSTEMD_PRIV_H_ALLOW__ 1 +#define LIBVIRT_VIRSYSTEMDPRIV_H_ALLOW #include "virsystemdpriv.h" #include "virsystemd.h" diff --git a/src/util/virsystemd.h b/src/util/virsystemd.h index 9aedb40b86..7d9c0ebd62 100644 --- a/src/util/virsystemd.h +++ b/src/util/virsystemd.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_SYSTEMD_H__ -# define __VIR_SYSTEMD_H__ +#ifndef LIBVIRT_VIRSYSTEMD_H +# define LIBVIRT_VIRSYSTEMD_H # include "internal.h" @@ -51,4 +51,4 @@ int virSystemdCanHybridSleep(bool *result); char *virSystemdGetMachineNameByPID(pid_t pid); -#endif /* __VIR_SYSTEMD_H__ */ +#endif /* LIBVIRT_VIRSYSTEMD_H */ diff --git a/src/util/virsystemdpriv.h b/src/util/virsystemdpriv.h index c5423cf426..be96f698f3 100644 --- a/src/util/virsystemdpriv.h +++ b/src/util/virsystemdpriv.h @@ -19,15 +19,15 @@ * */ -#ifndef __VIR_SYSTEMD_PRIV_H_ALLOW__ +#ifndef LIBVIRT_VIRSYSTEMDPRIV_H_ALLOW # error "virsystemdpriv.h may only be included by virsystemd.c or test suites" -#endif /* __VIR_SYSTEMD_PRIV_H_ALLOW__ */ +#endif /* LIBVIRT_VIRSYSTEMDPRIV_H_ALLOW */ -#ifndef __VIR_SYSTEMD_PRIV_H__ -# define __VIR_SYSTEMD_PRIV_H__ +#ifndef LIBVIRT_VIRSYSTEMDPRIV_H +# define LIBVIRT_VIRSYSTEMDPRIV_H # include "virsystemd.h" void virSystemdHasMachinedResetCachedValue(void); -#endif /* __VIR_SYSTEMD_PRIV_H__ */ +#endif /* LIBVIRT_VIRSYSTEMDPRIV_H */ diff --git a/src/util/virthread.h b/src/util/virthread.h index e4348e87a9..6af4492d42 100644 --- a/src/util/virthread.h +++ b/src/util/virthread.h @@ -19,8 +19,8 @@ * */ -#ifndef __THREADS_H_ -# define __THREADS_H_ +#ifndef LIBVIRT_VIRTHREAD_H +# define LIBVIRT_VIRTHREAD_H # include "internal.h" # include "virerror.h" @@ -213,4 +213,4 @@ int virThreadLocalSet(virThreadLocalPtr l, void*) ATTRIBUTE_RETURN_CHECK; return 0; \ } -#endif /* __THREADS_H_ */ +#endif /* LIBVIRT_VIRTHREAD_H */ diff --git a/src/util/virthreadjob.h b/src/util/virthreadjob.h index 343b8b041a..697a932625 100644 --- a/src/util/virthreadjob.h +++ b/src/util/virthreadjob.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_THREAD_JOB_H__ -# define __VIR_THREAD_JOB_H__ +#ifndef LIBVIRT_VIRTHREADJOB_H +# define LIBVIRT_VIRTHREADJOB_H const char *virThreadJobGet(void); @@ -28,4 +28,4 @@ void virThreadJobSetWorker(const char *caller); void virThreadJobSet(const char *caller); void virThreadJobClear(int rv); -#endif /* __VIR_THREAD_JOB_H__ */ +#endif /* LIBVIRT_VIRTHREADJOB_H */ diff --git a/src/util/virthreadpool.h b/src/util/virthreadpool.h index 12f12e4fc3..e3ff36998d 100644 --- a/src/util/virthreadpool.h +++ b/src/util/virthreadpool.h @@ -21,8 +21,8 @@ * Daniel P. Berrange <berrange@redhat.com> */ -#ifndef __VIR_THREADPOOL_H__ -# define __VIR_THREADPOOL_H__ +#ifndef LIBVIRT_VIRTHREADPOOL_H +# define LIBVIRT_VIRTHREADPOOL_H # include "internal.h" @@ -60,4 +60,4 @@ int virThreadPoolSetParameters(virThreadPoolPtr pool, long long int maxWorkers, long long int prioWorkers); -#endif /* __VIR_THREADPOOL_H__ */ +#endif /* LIBVIRT_VIRTHREADPOOL_H */ diff --git a/src/util/virtime.h b/src/util/virtime.h index 340ea5d588..01f6b0c7fa 100644 --- a/src/util/virtime.h +++ b/src/util/virtime.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_TIME_H__ -# define __VIR_TIME_H__ +#ifndef LIBVIRT_VIRTIME_H +# define LIBVIRT_VIRTIME_H # include <time.h> @@ -73,4 +73,4 @@ int virTimeBackOffStart(virTimeBackOffVar *var, bool virTimeBackOffWait(virTimeBackOffVar *var); -#endif /* __VIR_TIME_H__ */ +#endif /* LIBVIRT_VIRTIME_H */ diff --git a/src/util/virtpm.h b/src/util/virtpm.h index a363f37ec0..796b9c088c 100644 --- a/src/util/virtpm.h +++ b/src/util/virtpm.h @@ -18,9 +18,9 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_TPM_H__ -# define __VIR_TPM_H__ +#ifndef LIBVIRT_VIRTPM_H +# define LIBVIRT_VIRTPM_H char *virTPMCreateCancelPath(const char *devpath) ATTRIBUTE_NOINLINE; -#endif /* __VIR_TPM_H__ */ +#endif /* LIBVIRT_VIRTPM_H */ diff --git a/src/util/virtypedparam.h b/src/util/virtypedparam.h index 6df63a1e5c..4cc65cf91c 100644 --- a/src/util/virtypedparam.h +++ b/src/util/virtypedparam.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_TYPED_PARAM_H_ -# define __VIR_TYPED_PARAM_H_ +#ifndef LIBVIRT_VIRTYPEDPARAM_H +# define LIBVIRT_VIRTYPEDPARAM_H # include "internal.h" # include "virutil.h" @@ -134,4 +134,4 @@ VIR_ENUM_DECL(virTypedParameter) } \ } while (0) -#endif /* __VIR_TYPED_PARAM_H_ */ +#endif /* LIBVIRT_VIRTYPEDPARAM_H */ diff --git a/src/util/viruri.h b/src/util/viruri.h index 7850c38c22..b6e97dafe6 100644 --- a/src/util/viruri.h +++ b/src/util/viruri.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_URI_H__ -# define __VIR_URI_H__ +#ifndef LIBVIRT_VIRURI_H +# define LIBVIRT_VIRURI_H # include <libxml/uri.h> @@ -64,4 +64,4 @@ int virURIResolveAlias(virConfPtr conf, const char *alias, char **uri); # define VIR_URI_SERVER(uri) ((uri) && (uri)->server ? (uri)->server : "localhost") -#endif /* __VIR_URI_H__ */ +#endif /* LIBVIRT_VIRURI_H */ diff --git a/src/util/virusb.h b/src/util/virusb.h index 5953127748..e589a45310 100644 --- a/src/util/virusb.h +++ b/src/util/virusb.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_USB_H__ -# define __VIR_USB_H__ +#ifndef LIBVIRT_VIRUSB_H +# define LIBVIRT_VIRUSB_H # include "internal.h" # include "virobject.h" @@ -98,4 +98,4 @@ virUSBDevicePtr virUSBDeviceListFind(virUSBDeviceListPtr list, VIR_DEFINE_AUTOPTR_FUNC(virUSBDevice, virUSBDeviceFree) -#endif /* __VIR_USB_H__ */ +#endif /* LIBVIRT_VIRUSB_H */ diff --git a/src/util/virutil.h b/src/util/virutil.h index a02a03f034..908d8920ec 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_UTIL_H__ -# define __VIR_UTIL_H__ +#ifndef LIBVIRT_VIRUTIL_H +# define LIBVIRT_VIRUTIL_H # include "internal.h" # include <unistd.h> @@ -233,4 +233,4 @@ char *virHostGetDRMRenderNode(void) ATTRIBUTE_NOINLINE; # define VIR_ASSIGN_IS_OVERFLOW(lvalue, rvalue) \ (((lvalue) = (rvalue)) != (rvalue)) -#endif /* __VIR_UTIL_H__ */ +#endif /* LIBVIRT_VIRUTIL_H */ diff --git a/src/util/viruuid.h b/src/util/viruuid.h index d5a334b0ce..70223b3bb2 100644 --- a/src/util/viruuid.h +++ b/src/util/viruuid.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_UUID_H__ -# define __VIR_UUID_H__ +#ifndef LIBVIRT_VIRUUID_H +# define LIBVIRT_VIRUUID_H # include "internal.h" @@ -55,4 +55,4 @@ int virUUIDParse(const char *uuidstr, const char *virUUIDFormat(const unsigned char *uuid, char *uuidstr) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); -#endif /* __VIR_UUID_H__ */ +#endif /* LIBVIRT_VIRUUID_H */ diff --git a/src/util/virvhba.h b/src/util/virvhba.h index 32792918ae..4d15833e85 100644 --- a/src/util/virvhba.h +++ b/src/util/virvhba.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_VHBA_H__ -# define __VIR_VHBA_H__ +#ifndef LIBVIRT_VIRVHBA_H +# define LIBVIRT_VIRVHBA_H # include "internal.h" @@ -59,4 +59,4 @@ virVHBAGetHostByFabricWWN(const char *sysfs_prefix, const char *fabric_wwn) ATTRIBUTE_NONNULL(2); -#endif /* __VIR_VHBA_H__ */ +#endif /* LIBVIRT_VIRVHBA_H */ diff --git a/src/util/virvsock.h b/src/util/virvsock.h index 080a322420..268e121916 100644 --- a/src/util/virvsock.h +++ b/src/util/virvsock.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_VSOCK_H__ -# define __VIR_VSOCK_H__ +#ifndef LIBVIRT_VIRVSOCK_H +# define LIBVIRT_VIRVSOCK_H int virVsockSetGuestCid(int fd, @@ -26,4 +26,4 @@ virVsockSetGuestCid(int fd, int virVsockAcquireGuestCid(int fd, unsigned int *guest_cid); -#endif /* __VIR_VSOCK_H__ */ +#endif /* LIBVIRT_VIRVSOCK_H */ diff --git a/src/util/virxdrdefs.h b/src/util/virxdrdefs.h index 40074dde31..794606638d 100644 --- a/src/util/virxdrdefs.h +++ b/src/util/virxdrdefs.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_XDRDEFS_H__ -# define __VIR_XDRDEFS_H__ +#ifndef LIBVIRT_VIRXDRDEFS_H +# define LIBVIRT_VIRXDRDEFS_H /* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t * and lacks IXDR_PUT_INT32 and IXDR_GET_INT32 @@ -40,4 +40,4 @@ # define IXDR_GET_U_INT32 IXDR_GET_U_LONG # endif -#endif /* __VIR_XDRDEFS_H__ */ +#endif /* LIBVIRT_VIRXDRDEFS_H */ diff --git a/src/util/virxml.h b/src/util/virxml.h index 43ce031082..8d4ab0a427 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -20,8 +20,8 @@ * Daniel Veillard <veillard@redhat.com> */ -#ifndef __VIR_XML_H__ -# define __VIR_XML_H__ +#ifndef LIBVIRT_VIRXML_H +# define LIBVIRT_VIRXML_H # include "internal.h" @@ -221,4 +221,4 @@ virXMLFormatElement(virBufferPtr buf, virBufferPtr attrBuf, virBufferPtr childBuf); -#endif /* __VIR_XML_H__ */ +#endif /* LIBVIRT_VIRXML_H */ diff --git a/src/vbox/vbox_MSCOMGlue.h b/src/vbox/vbox_MSCOMGlue.h index cdc38f8310..dd42f03148 100644 --- a/src/vbox/vbox_MSCOMGlue.h +++ b/src/vbox/vbox_MSCOMGlue.h @@ -19,8 +19,8 @@ * */ -#ifndef __VBOX_MSCOMGLUE_H__ -# define __VBOX_MSCOMGLUE_H__ +#ifndef LIBVIRT_VBOX_MSCOMGLUE_H +# define LIBVIRT_VBOX_MSCOMGLUE_H # include "vbox_CAPI_v3_2.h" @@ -45,4 +45,4 @@ nsresult vboxArrayGetWithUintArg(vboxArray *array, void *self, void *getter, PRU void vboxArrayRelease(vboxArray *array); # define vboxArrayUnalloc vboxArrayRelease -#endif /* __VBOX_MSCOMGLUE_H__ */ +#endif /* LIBVIRT_VBOX_MSCOMGLUE_H */ diff --git a/src/vbox/vbox_common.h b/src/vbox/vbox_common.h index 5709ff8b4a..c67f6fba42 100644 --- a/src/vbox/vbox_common.h +++ b/src/vbox/vbox_common.h @@ -17,8 +17,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef VBOX_COMMON_H -# define VBOX_COMMON_H +#ifndef LIBVIRT_VBOX_COMMON_H +# define LIBVIRT_VBOX_COMMON_H # ifdef ___VirtualBox_CXPCOM_h # error this file should not be included after vbox_CAPI_v*.h @@ -453,4 +453,4 @@ typedef nsISupports IKeyboard; } \ } while (0) -#endif /* VBOX_COMMON_H */ +#endif /* LIBVIRT_VBOX_COMMON_H */ diff --git a/src/vbox/vbox_driver.h b/src/vbox/vbox_driver.h index 38aaaf6e39..fa30c4a3f5 100644 --- a/src/vbox/vbox_driver.h +++ b/src/vbox/vbox_driver.h @@ -22,8 +22,8 @@ * additional information or have any questions. */ -#ifndef VBOX_DRIVER_H -# define VBOX_DRIVER_H +#ifndef LIBVIRT_VBOX_DRIVER_H +# define LIBVIRT_VBOX_DRIVER_H # include "internal.h" @@ -39,4 +39,4 @@ int vboxStorageRegister(void); int vboxRegister(void); # endif -#endif /* VBOX_DRIVER_H */ +#endif /* LIBVIRT_VBOX_DRIVER_H */ diff --git a/src/vbox/vbox_get_driver.h b/src/vbox/vbox_get_driver.h index 84a1f8ab46..08e39ad157 100644 --- a/src/vbox/vbox_get_driver.h +++ b/src/vbox/vbox_get_driver.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef VBOX_GET_DRIVER_H -# define VBOX_GET_DRIVER_H +#ifndef LIBVIRT_VBOX_GET_DRIVER_H +# define LIBVIRT_VBOX_GET_DRIVER_H # include "internal.h" @@ -25,4 +25,4 @@ virHypervisorDriverPtr vboxGetHypervisorDriver(uint32_t uVersion); virNetworkDriverPtr vboxGetNetworkDriver(uint32_t uVersion); virStorageDriverPtr vboxGetStorageDriver(uint32_t uVersion); -#endif /* VBOX_GET_DRIVER_H */ +#endif /* LIBVIRT_VBOX_GET_DRIVER_H */ diff --git a/src/vbox/vbox_glue.h b/src/vbox/vbox_glue.h index 080479c74a..39281e0d78 100644 --- a/src/vbox/vbox_glue.h +++ b/src/vbox/vbox_glue.h @@ -19,8 +19,8 @@ * */ -#ifndef __VBOX_GLUE_H__ -# define __VBOX_GLUE_H__ +#ifndef LIBVIRT_VBOX_GLUE_H +# define LIBVIRT_VBOX_GLUE_H # ifdef WIN32 # include "vbox_MSCOMGlue.h" @@ -28,4 +28,4 @@ # include "vbox_XPCOMCGlue.h" # endif -#endif /* __VBOX_GLUE_H__ */ +#endif /* LIBVIRT_VBOX_GLUE_H */ diff --git a/src/vbox/vbox_snapshot_conf.h b/src/vbox/vbox_snapshot_conf.h index 7ba3ca03ea..72b90e698f 100644 --- a/src/vbox/vbox_snapshot_conf.h +++ b/src/vbox/vbox_snapshot_conf.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef VBOX_SNAPSHOT_CONF_H -# define VBOX_SNAPSHOT_CONF_H +#ifndef LIBVIRT_VBOX_SNAPSHOT_CONF_H +# define LIBVIRT_VBOX_SNAPSHOT_CONF_H # include "internal.h" @@ -138,4 +138,4 @@ virVBoxSnapshotConfSnapshotPtr virVBoxSnapshotConfSnapshotByName(virVBoxSnapshotConfSnapshotPtr snapshot, const char *snapshotName); -#endif /* VBOX_SNAPSHOT_CONF_H */ +#endif /* LIBVIRT_VBOX_SNAPSHOT_CONF_H */ diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h index eb4e148909..5f3df5fb87 100644 --- a/src/vbox/vbox_uniformed_api.h +++ b/src/vbox/vbox_uniformed_api.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef VBOX_UNIFORMED_API_H -# define VBOX_UNIFORMED_API_H +#ifndef LIBVIRT_VBOX_UNIFORMED_API_H +# define LIBVIRT_VBOX_UNIFORMED_API_H # include "internal.h" @@ -566,4 +566,4 @@ void vbox50InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); void vbox51InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); void vbox52InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI); -#endif /* VBOX_UNIFORMED_API_H */ +#endif /* LIBVIRT_VBOX_UNIFORMED_API_H */ diff --git a/src/vmware/vmware_conf.h b/src/vmware/vmware_conf.h index e7ba403848..1edd962686 100644 --- a/src/vmware/vmware_conf.h +++ b/src/vmware/vmware_conf.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef VMWARE_CONF_H -# define VMWARE_CONF_H +#ifndef LIBVIRT_VMWARE_CONF_H +# define LIBVIRT_VMWARE_CONF_H # define NOGUI "nogui" @@ -85,4 +85,4 @@ int vmwareExtractPid(const char * vmxPath); char *vmwareCopyVMXFileName(const char *datastorePath, void *opaque); -#endif /* VMWARE_CONF_H */ +#endif /* LIBVIRT_VMWARE_CONF_H */ diff --git a/src/vmware/vmware_driver.h b/src/vmware/vmware_driver.h index 94ed04d023..e66d222a51 100644 --- a/src/vmware/vmware_driver.h +++ b/src/vmware/vmware_driver.h @@ -16,9 +16,9 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef VMWARE_DRIVER_H -# define VMWARE_DRIVER_H +#ifndef LIBVIRT_VMWARE_DRIVER_H +# define LIBVIRT_VMWARE_DRIVER_H int vmwareRegister(void); -#endif /* VMWARE_DRIVER_H */ +#endif /* LIBVIRT_VMWARE_DRIVER_H */ diff --git a/src/vmx/vmx.h b/src/vmx/vmx.h index 6b3d880d61..cb99e84d18 100644 --- a/src/vmx/vmx.h +++ b/src/vmx/vmx.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_VMX_H__ -# define __VIR_VMX_H__ +#ifndef LIBVIRT_VMX_H +# define LIBVIRT_VMX_H # include "internal.h" # include "virconf.h" @@ -140,4 +140,4 @@ int virVMXFormatParallel(virVMXContext *ctx, virDomainChrDefPtr def, int virVMXFormatSVGA(virDomainVideoDefPtr def, virBufferPtr buffer); -#endif /* __VIR_VMX_H__ */ +#endif /* LIBVIRT_VMX_H */ diff --git a/src/vz/vz_driver.h b/src/vz/vz_driver.h index 82c77fd0ec..593a585075 100644 --- a/src/vz/vz_driver.h +++ b/src/vz/vz_driver.h @@ -20,9 +20,9 @@ * */ -#ifndef PARALLELS_DRIVER_H -# define PARALLELS_DRIVER_H +#ifndef LIBVIRT_VZ_DRIVER_H +# define LIBVIRT_VZ_DRIVER_H int vzRegister(void); -#endif /* PARALLELS_DRIVER_H */ +#endif /* LIBVIRT_VZ_DRIVER_H */ diff --git a/src/vz/vz_sdk.h b/src/vz/vz_sdk.h index d201d6a10d..e412b821bb 100644 --- a/src/vz/vz_sdk.h +++ b/src/vz/vz_sdk.h @@ -20,8 +20,8 @@ * */ -#ifndef __VZ_SDK_H__ -# define __VZ_SDK_H__ +#ifndef LIBVIRT_VZ_SDK_H +# define LIBVIRT_VZ_SDK_H # include <Parallels.h> @@ -95,4 +95,4 @@ prlsdkSdkDomainLookupByName(vzDriverPtr driver, const char *name); int prlsdkCancelJob(virDomainObjPtr dom); int prlsdkResizeImage(virDomainObjPtr dom, virDomainDiskDefPtr disk, unsigned long long newsize); -#endif /* __VZ_SDK_H__ */ +#endif /* LIBVIRT_VZ_SDK_H */ diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index 93db255f95..758ab6f1ae 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -20,8 +20,8 @@ * */ -#ifndef PARALLELS_UTILS_H -# define PARALLELS_UTILS_H +#ifndef LIBVIRT_VZ_UTILS_H +# define LIBVIRT_VZ_UTILS_H # include <Parallels.h> @@ -158,4 +158,4 @@ vzDomainObjEndJob(virDomainObjPtr dom); int vzDomainJobUpdateTime(vzDomainJobObjPtr job); -#endif /* PARALLELS_UTILS_H */ +#endif /* LIBVIRT_VZ_UTILS_H */ diff --git a/src/xenapi/xenapi_driver.h b/src/xenapi/xenapi_driver.h index df469aff34..85bbe06776 100644 --- a/src/xenapi/xenapi_driver.h +++ b/src/xenapi/xenapi_driver.h @@ -17,9 +17,9 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_XENAPI_PRIV_H__ -# define __VIR_XENAPI_PRIV_H__ +#ifndef LIBVIRT_XENAPI_DRIVER_H +# define LIBVIRT_XENAPI_DRIVER_H int xenapiRegister(void); -#endif /* __VIR_XENAPI_PRIV_H__ */ +#endif /* LIBVIRT_XENAPI_DRIVER_H */ diff --git a/src/xenapi/xenapi_driver_private.h b/src/xenapi/xenapi_driver_private.h index 7d8d8c66d2..590a96f532 100644 --- a/src/xenapi/xenapi_driver_private.h +++ b/src/xenapi/xenapi_driver_private.h @@ -17,8 +17,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_XENAPI_H__ -# define __VIR_XENAPI_H__ +#ifndef LIBVIRT_XENAPI_DRIVER_PRIVATE_H +# define LIBVIRT_XENAPI_DRIVER_PRIVATE_H # include <libxml/tree.h> # include <xen/api/xen_common.h> @@ -58,4 +58,4 @@ struct _xenapiPrivate { virDomainXMLOptionPtr xmlopt; }; -#endif /* __VIR_XENAPI_H__ */ +#endif /* LIBVIRT_XENAPI_DRIVER_PRIVATE_H */ diff --git a/src/xenapi/xenapi_utils.h b/src/xenapi/xenapi_utils.h index ae33e8fedb..70a0e5fc13 100644 --- a/src/xenapi/xenapi_utils.h +++ b/src/xenapi/xenapi_utils.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_XENAPI_UTILS__ -# define __VIR_XENAPI_UTILS__ +#ifndef LIBVIRT_XENAPI_UTILS_H +# define LIBVIRT_XENAPI_UTILS_H # include <xen/api/xen_all.h> # include "internal.h" @@ -76,4 +76,4 @@ createVMRecordFromXml (virConnectPtr conn, virDomainDefPtr defPtr, int allocStringMap (xen_string_string_map **strings, char *key, char *val); -#endif /* __VIR_XENAPI_UTILS__ */ +#endif /* LIBVIRT_XENAPI_UTILS_H */ diff --git a/src/xenconfig/xen_common.h b/src/xenconfig/xen_common.h index 369bba26d8..b22d18aa67 100644 --- a/src/xenconfig/xen_common.h +++ b/src/xenconfig/xen_common.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_XEN_COMMON_H__ -# define __VIR_XEN_COMMON_H__ +#ifndef LIBVIRT_XEN_COMMON_H +# define LIBVIRT_XEN_COMMON_H # include "internal.h" # include "virconf.h" @@ -69,4 +69,4 @@ char *xenMakeIPList(virNetDevIPInfoPtr guestIP); int xenDomainDefAddImplicitInputDevice(virDomainDefPtr def); -#endif /* __VIR_XEN_COMMON_H__ */ +#endif /* LIBVIRT_XEN_COMMON_H */ diff --git a/src/xenconfig/xen_sxpr.h b/src/xenconfig/xen_sxpr.h index 342ccab6f5..0cec2a4068 100644 --- a/src/xenconfig/xen_sxpr.h +++ b/src/xenconfig/xen_sxpr.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_XEN_SXPR_H__ -# define __VIR_XEN_SXPR_H__ +#ifndef LIBVIRT_XEN_SXPR_H +# define LIBVIRT_XEN_SXPR_H # include "internal.h" # include "virconf.h" @@ -66,4 +66,4 @@ int xenFormatSxprSound(virDomainDefPtr def, virBufferPtr buf); char * xenFormatSxpr(virConnectPtr conn, virDomainDefPtr def); -#endif /* __VIR_XEN_SXPR_H__ */ +#endif /* LIBVIRT_XEN_SXPR_H */ diff --git a/src/xenconfig/xen_xl.h b/src/xenconfig/xen_xl.h index 588d8d1143..e519186d46 100644 --- a/src/xenconfig/xen_xl.h +++ b/src/xenconfig/xen_xl.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_XEN_XL_H__ -# define __VIR_XEN_XL_H__ +#ifndef LIBVIRT_XEN_XL_H +# define LIBVIRT_XEN_XL_H # include "virconf.h" # include "domain_conf.h" @@ -34,4 +34,4 @@ virConfPtr xenFormatXL(virDomainDefPtr def, virConnectPtr); const char *xenTranslateCPUFeature(const char *feature_name, bool from_libxl); -#endif /* __VIR_XEN_XL_H__ */ +#endif /* LIBVIRT_XEN_XL_H */ diff --git a/src/xenconfig/xen_xm.h b/src/xenconfig/xen_xm.h index c0699c673d..b0a73fc09b 100644 --- a/src/xenconfig/xen_xm.h +++ b/src/xenconfig/xen_xm.h @@ -20,8 +20,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_XEN_XM_H__ -# define __VIR_XEN_XM_H__ +#ifndef LIBVIRT_XEN_XM_H +# define LIBVIRT_XEN_XM_H # include "internal.h" # include "virconf.h" @@ -32,4 +32,4 @@ virConfPtr xenFormatXM(virConnectPtr conn, virDomainDefPtr def); virDomainDefPtr xenParseXM(virConfPtr conf, virCapsPtr caps, virDomainXMLOptionPtr xmlopt); -#endif /* __VIR_XEN_XM_H__ */ +#endif /* LIBVIRT_XEN_XM_H */ diff --git a/src/xenconfig/xenxs_private.h b/src/xenconfig/xenxs_private.h index e2250dbd6a..7cba0bff86 100644 --- a/src/xenconfig/xenxs_private.h +++ b/src/xenconfig/xenxs_private.h @@ -19,8 +19,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_XENXS_PRIVATE_H__ -# define __VIR_XENXS_PRIVATE_H__ +#ifndef LIBVIRT_XENXS_PRIVATE_H +# define LIBVIRT_XENXS_PRIVATE_H # include "internal.h" @@ -43,4 +43,4 @@ # define DEFAULT_VIF_SCRIPT "vif-bridge" # endif -#endif /* __VIR_XENXS_PRIVATE_H__ */ +#endif /* LIBVIRT_XENXS_PRIVATE_H */ diff --git a/tests/cputest.c b/tests/cputest.c index 64d85f34db..b75d864d8e 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -38,9 +38,8 @@ #if WITH_QEMU && WITH_YAJL # include "testutilsqemu.h" # include "qemumonitortestutils.h" -# define __QEMU_CAPSPRIV_H_ALLOW__ +# define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW # include "qemu/qemu_capspriv.h" -# undef __QEMU_CAPSPRIV_H_ALLOW__ #endif #define VIR_FROM_THIS VIR_FROM_CPU diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c index 5e3d8906c5..91bb6e6b8a 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -28,10 +28,10 @@ # include "network/bridge_driver_platform.h" # include "virbuffer.h" -# define __VIR_FIREWALL_PRIV_H_ALLOW__ +# define LIBVIRT_VIRFIREWALLPRIV_H_ALLOW # include "virfirewallpriv.h" -# define __VIR_COMMAND_PRIV_H_ALLOW__ +# define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW # include "vircommandpriv.h" # define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/nwfilterebiptablestest.c b/tests/nwfilterebiptablestest.c index 6073423304..68b69a6e1f 100644 --- a/tests/nwfilterebiptablestest.c +++ b/tests/nwfilterebiptablestest.c @@ -26,10 +26,10 @@ #include "virbuffer.h" #include "virfirewall.h" -#define __VIR_FIREWALL_PRIV_H_ALLOW__ +#define LIBVIRT_VIRFIREWALLPRIV_H_ALLOW #include "virfirewallpriv.h" -#define __VIR_COMMAND_PRIV_H_ALLOW__ +#define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW #include "vircommandpriv.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewalltest.c index 043b7d170e..b4cfe5769e 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -27,10 +27,10 @@ # include "nwfilter/nwfilter_ebiptables_driver.h" # include "virbuffer.h" -# define __VIR_FIREWALL_PRIV_H_ALLOW__ +# define LIBVIRT_VIRFIREWALLPRIV_H_ALLOW # include "virfirewallpriv.h" -# define __VIR_COMMAND_PRIV_H_ALLOW__ +# define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW # include "vircommandpriv.h" # define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index a043b0fa64..b3a9a4b9fc 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -22,9 +22,9 @@ #include "testutils.h" #include "testutilsqemu.h" #include "qemumonitortestutils.h" -#define __QEMU_CAPSPRIV_H_ALLOW__ +#define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW #include "qemu/qemu_capspriv.h" -#define __QEMU_MONITOR_PRIV_H_ALLOW__ +#define LIBVIRT_QEMU_MONITOR_PRIV_H_ALLOW #include "qemu/qemu_monitor_priv.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c index 708c245561..14c0ecad97 100644 --- a/tests/qemucapsprobe.c +++ b/tests/qemucapsprobe.c @@ -23,7 +23,7 @@ #include "virarch.h" #include "virthread.h" #include "qemu/qemu_capabilities.h" -#define __QEMU_CAPSPRIV_H_ALLOW__ 1 +#define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW #include "qemu/qemu_capspriv.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/qemucpumock.c b/tests/qemucpumock.c index 7752e3157c..e028ada8eb 100644 --- a/tests/qemucpumock.c +++ b/tests/qemucpumock.c @@ -20,9 +20,8 @@ #include "conf/cpu_conf.h" #include "cpu/cpu.h" #include "qemu/qemu_capabilities.h" -#define __QEMU_CAPSPRIV_H_ALLOW__ +#define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW #include "qemu/qemu_capspriv.h" -#undef __QEMU_CAPSPRIV_H_ALLOW__ #include "testutilshostcpus.h" #include "virarch.h" diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index bf334c75ee..aa49097a4a 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -22,7 +22,7 @@ #include "qemu/qemu_alias.h" #include "qemu/qemu_conf.h" #include "qemu/qemu_hotplug.h" -#define __QEMU_HOTPLUGPRIV_H_ALLOW__ +#define LIBVIRT_QEMU_HOTPLUGPRIV_H_ALLOW #include "qemu/qemu_hotplugpriv.h" #include "qemumonitortestutils.h" #include "testutils.h" diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c index e0117d0261..dcefde2dbc 100644 --- a/tests/qemumigparamstest.c +++ b/tests/qemumigparamstest.c @@ -26,7 +26,7 @@ #include "testutilsqemu.h" #include "qemumonitortestutils.h" #include "qemu/qemu_migration_params.h" -#define __QEMU_MIGRATION_PARAMSPRIV_H_ALLOW__ +#define LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H_ALLOW #include "qemu/qemu_migration_paramspriv.h" #include "qemu/qemu_monitor.h" diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 0e7d27a610..1a8a31717f 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -33,7 +33,7 @@ #include "cpu/cpu.h" #include "qemu/qemu_monitor.h" #include "qemu/qemu_migration_params.h" -#define __QEMU_MIGRATION_PARAMSPRIV_H_ALLOW__ +#define LIBVIRT_QEMU_MIGRATION_PARAMSPRIV_H_ALLOW #include "qemu/qemu_migration_paramspriv.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index cc9e0bd0f4..4a108c382d 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -26,7 +26,7 @@ #include "qemumonitortestutils.h" #include "virthread.h" -#define __QEMU_PROCESS_PRIV_H_ALLOW__ +#define LIBVIRT_QEMU_PROCESSPRIV_H_ALLOW #include "qemu/qemu_processpriv.h" #include "qemu/qemu_monitor.h" #include "qemu/qemu_agent.h" diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h index 855e625a4f..d2520e08a4 100644 --- a/tests/qemumonitortestutils.h +++ b/tests/qemumonitortestutils.h @@ -17,8 +17,8 @@ * */ -#ifndef __VIR_QEMU_MONITOR_TEST_UTILS_H__ -# define __VIR_QEMU_MONITOR_TEST_UTILS_H__ +#ifndef LIBVIRT_QEMUMONITORTESTUTILS_H +# define LIBVIRT_QEMUMONITORTESTUTILS_H # include "domain_conf.h" # include "qemu/qemu_conf.h" @@ -101,4 +101,4 @@ qemuMonitorPtr qemuMonitorTestGetMonitor(qemuMonitorTestPtr test); qemuAgentPtr qemuMonitorTestGetAgent(qemuMonitorTestPtr test); virDomainObjPtr qemuMonitorTestGetDomainObj(qemuMonitorTestPtr test); -#endif /* __VIR_QEMU_MONITOR_TEST_UTILS_H__ */ +#endif /* LIBVIRT_QEMUMONITORTESTUTILS_H */ diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ddc488be87..287e9d4ea3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -24,9 +24,8 @@ # include "storage/storage_driver.h" # include "virmock.h" -# define __QEMU_CAPSPRIV_H_ALLOW__ +# define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW # include "qemu/qemu_capspriv.h" -# undef __QEMU_CAPSPRIV_H_ALLOW__ # include "testutilsqemu.h" diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c index 88c125236b..616af22d73 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -27,7 +27,7 @@ #include "internal.h" #include "testutils.h" -#define __VIR_STORAGE_BACKEND_SHEEPDOG_PRIV_ALLOW_H__ +#define LIBVIRT_STORAGE_BACKEND_SHEEPDOG_PRIV_H_ALLOW #include "storage/storage_backend_sheepdog_priv.h" #include "virstring.h" diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c index 62cf5878ff..7fa9a2dfd6 100644 --- a/tests/sysinfotest.c +++ b/tests/sysinfotest.c @@ -31,7 +31,7 @@ #include "virfile.h" #include "virstring.h" -#define __VIR_SYSINFO_PRIV_H_ALLOW__ +#define LIBVIRT_VIRSYSINFOPRIV_H_ALLOW #include "virsysinfopriv.h" #define VIR_FROM_THIS VIR_FROM_NONE diff --git a/tests/testutils.h b/tests/testutils.h index 8531b2a735..11d99a74b8 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -20,8 +20,8 @@ * Karel Zak <kzak@redhat.com> */ -#ifndef __VIR_TEST_UTILS_H__ -# define __VIR_TEST_UTILS_H__ +#ifndef LIBVIRT_TESTUTILS_H +# define LIBVIRT_TESTUTILS_H # include "viralloc.h" # include "virfile.h" @@ -166,4 +166,4 @@ int testCompareDomXML2XMLFiles(virCapsPtr caps, unsigned int parseFlags, testCompareDomXML2XMLResult expectResult); -#endif /* __VIR_TEST_UTILS_H__ */ +#endif /* LIBVIRT_TESTUTILS_H */ diff --git a/tests/testutilshostcpus.h b/tests/testutilshostcpus.h index 07e7302d7f..32929a0953 100644 --- a/tests/testutilshostcpus.h +++ b/tests/testutilshostcpus.h @@ -14,8 +14,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef TESTUTILSHOSTCPUS_H -# define TESTUTILSHOSTCPUS_H +#ifndef LIBVIRT_TESTUTILSHOSTCPUS_H +# define LIBVIRT_TESTUTILSHOSTCPUS_H # include "conf/cpu_conf.h" # include "internal.h" @@ -166,4 +166,4 @@ testUtilsHostCpusGetDefForArch(virArch arch) return NULL; } -#endif /* TESTUTILSHOSTCPUS_H */ +#endif /* LIBVIRT_TESTUTILSHOSTCPUS_H */ diff --git a/tests/testutilslxc.h b/tests/testutilslxc.h index 0bc69a903f..16f1986eca 100644 --- a/tests/testutilslxc.h +++ b/tests/testutilslxc.h @@ -14,8 +14,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef TESTUTILSLXC_H -# define TESTUTILSLXC_H +#ifndef LIBVIRT_TESTUTILSLXC_H +# define LIBVIRT_TESTUTILSLXC_H # include "capabilities.h" @@ -24,4 +24,4 @@ virCapsPtr testLXCCapsInit(void); -#endif /* TESTUTILSLXC_H */ +#endif /* LIBVIRT_TESTUTILSLXC_H */ diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 5add246162..1736bad032 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -8,7 +8,7 @@ # include "cpu_conf.h" # include "qemu/qemu_driver.h" # include "qemu/qemu_domain.h" -# define __QEMU_CAPSPRIV_H_ALLOW__ +# define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW # include "qemu/qemu_capspriv.h" # include "virstring.h" # include "virfilecache.h" diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h index 1aa0034bb9..5ae7f19473 100644 --- a/tests/testutilsqemu.h +++ b/tests/testutilsqemu.h @@ -14,8 +14,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef TESTUTILSQEMU_H -# define TESTUTILSQEMU_H +#ifndef LIBVIRT_TESTUTILSQEMU_H +# define LIBVIRT_TESTUTILSQEMU_H # ifdef WITH_QEMU @@ -65,4 +65,4 @@ char *testQemuGetLatestCapsForArch(const char *dirname, # endif -#endif /* TESTUTILSQEMU_H */ +#endif /* LIBVIRT_TESTUTILSQEMU_H */ diff --git a/tests/testutilsqemuschema.h b/tests/testutilsqemuschema.h index 081d12ea63..73984e9946 100644 --- a/tests/testutilsqemuschema.h +++ b/tests/testutilsqemuschema.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __TESTUTILSQEMUSCHEMA_H__ -# define __TESTUTILSQEMUSCHEMA_H__ +#ifndef LIBVIRT_TESTUTILSQEMUSCHEMA_H +# define LIBVIRT_TESTUTILSQEMUSCHEMA_H # include "virhash.h" # include "virjson.h" @@ -35,4 +35,4 @@ testQEMUSchemaGetLatest(void); virHashTablePtr testQEMUSchemaLoad(void); -#endif /* __TESTUTILSQEMUSCHEMA_H__ */ +#endif /* LIBVIRT_TESTUTILSQEMUSCHEMA_H */ diff --git a/tests/testutilsxen.h b/tests/testutilsxen.h index 0fceb93ae8..9164a59507 100644 --- a/tests/testutilsxen.h +++ b/tests/testutilsxen.h @@ -14,8 +14,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef _TESTUTILSXEN_H_ -# define _TESTUTILSXEN_H_ +#ifndef LIBVIRT_TESTUTILSXEN_H +# define LIBVIRT_TESTUTILSXEN_H # include "capabilities.h" # ifdef WITH_LIBXL @@ -24,4 +24,4 @@ virCapsPtr testXLInitCaps(void); -#endif /* _TESTUTILSXEN_H_ */ +#endif /* LIBVIRT_TESTUTILSXEN_H */ diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index 5eda6fe725..20f4c57b04 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -23,7 +23,7 @@ #ifdef __linux__ -# define __VIR_CGROUP_ALLOW_INCLUDE_PRIV_H__ +# define LIBVIRT_VIRCGROUPPRIV_H_ALLOW # include "vircgrouppriv.h" # include "virstring.h" # include "virerror.h" diff --git a/tests/virdbustest.c b/tests/virdbustest.c index b62a42eca7..ec380e8fc2 100644 --- a/tests/virdbustest.c +++ b/tests/virdbustest.c @@ -18,7 +18,7 @@ #include <config.h> -#define __VIR_DBUS_PRIV_H_ALLOW__ +#define LIBVIRT_VIRDBUSPRIV_H_ALLOW #include "virdbuspriv.h" #include "virlog.h" #include "testutils.h" diff --git a/tests/virfilewrapper.h b/tests/virfilewrapper.h index 441013cec3..9e3816b644 100644 --- a/tests/virfilewrapper.h +++ b/tests/virfilewrapper.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_FILE_MOCK_H__ -# define __VIR_FILE_MOCK_H__ +#ifndef LIBVIRT_VIRFILEWRAPPER_H +# define LIBVIRT_VIRFILEWRAPPER_H int virFileWrapperAddPrefix(const char *prefix, @@ -29,4 +29,4 @@ virFileWrapperRemovePrefix(const char *prefix); void virFileWrapperClearPrefixes(void); -#endif /* __VIR_FILE_MOCK_H__ */ +#endif /* LIBVIRT_VIRFILEWRAPPER_H */ diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index 7193576102..63b9ced820 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -18,18 +18,17 @@ #include <config.h> -#define __VIR_FIREWALL_PRIV_H_ALLOW__ -#define __VIR_COMMAND_PRIV_H_ALLOW__ -#define __VIR_DBUS_PRIV_H_ALLOW__ - #include "testutils.h" #if defined(__linux__) # include "virbuffer.h" +# define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW # include "vircommandpriv.h" +# define LIBVIRT_VIRFIREWALLPRIV_H_ALLOW # include "virfirewallpriv.h" # include "virmock.h" +# define LIBVIRT_VIRDBUSPRIV_H_ALLOW # include "virdbuspriv.h" # define VIR_FROM_THIS VIR_FROM_FIREWALL diff --git a/tests/virhashdata.h b/tests/virhashdata.h index 557ed8e923..309519962d 100644 --- a/tests/virhashdata.h +++ b/tests/virhashdata.h @@ -14,8 +14,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef VIRHASHDATA_H -# define VIRHASHDATA_H +#ifndef LIBVIRT_VIRHASHDATA_H +# define LIBVIRT_VIRHASHDATA_H const char *uuids[] = { /* [ 2] */ "a9b02f96-e430-4f7c-a7ff-a647d080447a", @@ -284,4 +284,4 @@ const char *uuids_new[] = { "53c215dd-bdba-4fdc-887a-86ab6f860df4", }; -#endif /* VIRHASHDATA_H */ +#endif /* LIBVIRT_VIRHASHDATA_H */ diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c index 219de942b7..bb60dd3ffc 100644 --- a/tests/virhostcputest.c +++ b/tests/virhostcputest.c @@ -4,7 +4,7 @@ #include "testutils.h" #include "internal.h" -#define __VIR_HOSTCPU_PRIV_H_ALLOW__ +#define LIBVIRT_VIRHOSTCPUPRIV_H_ALLOW #include "virhostcpupriv.h" #include "virfile.h" #include "virstring.h" diff --git a/tests/viriscsitest.c b/tests/viriscsitest.c index 32b8a17b90..cc552a5cfe 100644 --- a/tests/viriscsitest.c +++ b/tests/viriscsitest.c @@ -27,8 +27,7 @@ main(void) return EXIT_AM_SKIP; } #else -# define __VIR_COMMAND_PRIV_H_ALLOW__ - +# define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW # include "vircommandpriv.h" # include "viriscsi.h" diff --git a/tests/virkmodtest.c b/tests/virkmodtest.c index 879ed54036..c90830a23c 100644 --- a/tests/virkmodtest.c +++ b/tests/virkmodtest.c @@ -22,7 +22,7 @@ #ifdef __linux__ -# define __VIR_COMMAND_PRIV_H_ALLOW__ +# define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW # include "vircommandpriv.h" # include "virkmod.h" # include "virstring.h" diff --git a/tests/virmock.h b/tests/virmock.h index 09efc7478d..853dbb8be2 100644 --- a/tests/virmock.h +++ b/tests/virmock.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIR_MOCK_H__ -# define __VIR_MOCK_H__ +#ifndef LIBVIRT_VIRMOCK_H +# define LIBVIRT_VIRMOCK_H # if HAVE_DLFCN_H # include <dlfcn.h> @@ -300,4 +300,4 @@ } \ } while (0) -#endif /* __VIR_MOCK_H__ */ +#endif /* LIBVIRT_VIRMOCK_H */ diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c index 68e7595689..96776fa033 100644 --- a/tests/virnetdevbandwidthtest.c +++ b/tests/virnetdevbandwidthtest.c @@ -19,7 +19,7 @@ #include <config.h> #include "testutils.h" -#define __VIR_COMMAND_PRIV_H_ALLOW__ +#define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW #include "vircommandpriv.h" #include "virnetdevbandwidth.h" #include "netdev_bandwidth_conf.c" diff --git a/tests/virnettlshelpers.h b/tests/virnettlshelpers.h index 2ca4b52c3c..3315a054e4 100644 --- a/tests/virnettlshelpers.h +++ b/tests/virnettlshelpers.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef VIRNETTLSHELPERS_H -# define VIRNETTLSHELPERS_H +#ifndef LIBVIRT_VIRNETTLSHELPERS_H +# define LIBVIRT_VIRNETTLSHELPERS_H # include <gnutls/gnutls.h> # include <gnutls/x509.h> @@ -79,4 +79,4 @@ void testTLSCleanup(const char *keyfile); # endif -#endif /* VIRNETTLSHELPERS_H */ +#endif /* LIBVIRT_VIRNETTLSHELPERS_H */ diff --git a/tests/virresctrltest.c b/tests/virresctrltest.c index d75c73f49e..5abbb11e9a 100644 --- a/tests/virresctrltest.c +++ b/tests/virresctrltest.c @@ -2,7 +2,7 @@ #include "testutils.h" #include "virfilewrapper.h" -#define __VIR_RESCTRL_PRIV_H_ALLOW__ +#define LIBVIRT_VIRRESCTRLPRIV_H_ALLOW #include "virresctrlpriv.h" diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index 66f24143d0..82c02decd1 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -24,7 +24,7 @@ # include <dbus/dbus.h> -# define __VIR_SYSTEMD_PRIV_H_ALLOW__ 1 +# define LIBVIRT_VIRSYSTEMDPRIV_H_ALLOW # include "virsystemdpriv.h" # include "virsystemd.h" diff --git a/tools/nss/libvirt_nss.h b/tools/nss/libvirt_nss.h index 325058d4b8..4c7525a0d0 100644 --- a/tools/nss/libvirt_nss.h +++ b/tools/nss/libvirt_nss.h @@ -23,8 +23,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __LIBVIRT_NSS_H__ -# define __LIBVIRT_NSS_H__ +#ifndef LIBVIRT_NSS_H +# define LIBVIRT_NSS_H # include <nss.h> # include <netdb.h> @@ -61,4 +61,4 @@ nss_module_register(const char *name, unsigned int *size, nss_module_unregister_fn *unregister); # endif /* HAVE_BSD_NSS */ -#endif /* __LIBVIRT_NSS_H__ */ +#endif /* LIBVIRT_NSS_H */ diff --git a/tools/virsh-completer.h b/tools/virsh-completer.h index 343b2b9d6c..4069d976b8 100644 --- a/tools/virsh-completer.h +++ b/tools/virsh-completer.h @@ -21,8 +21,8 @@ * */ -#ifndef VIRSH_COMPLETER -# define VIRSH_COMPLETER +#ifndef LIBVIRT_VIRSH_COMPLETER_H +# define LIBVIRT_VIRSH_COMPLETER_H # include "vsh.h" @@ -109,4 +109,4 @@ char ** virshDomainDeviceAliasCompleter(vshControl *ctl, char ** virshCellnoCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); -#endif /* VIRSH_COMPLETER */ +#endif /* LIBVIRT_VIRSH_COMPLETER_H */ diff --git a/tools/virsh-console.h b/tools/virsh-console.h index c3fa38340e..bc1a70b518 100644 --- a/tools/virsh-console.h +++ b/tools/virsh-console.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef __VIR_CONSOLE_H__ -# define __VIR_CONSOLE_H__ +#ifndef LIBVIRT_VIRSH_CONSOLE_H +# define LIBVIRT_VIRSH_CONSOLE_H # ifndef WIN32 @@ -32,4 +32,4 @@ int virshRunConsole(vshControl *ctl, # endif /* !WIN32 */ -#endif /* __VIR_CONSOLE_H__ */ +#endif /* LIBVIRT_VIRSH_CONSOLE_H */ diff --git a/tools/virsh-domain-monitor.h b/tools/virsh-domain-monitor.h index 08ccab5902..d641df4c13 100644 --- a/tools/virsh-domain-monitor.h +++ b/tools/virsh-domain-monitor.h @@ -23,8 +23,8 @@ * */ -#ifndef VIRSH_DOMAIN_MONITOR_H -# define VIRSH_DOMAIN_MONITOR_H +#ifndef LIBVIRT_VIRSH_DOMAIN_MONITOR_H +# define LIBVIRT_VIRSH_DOMAIN_MONITOR_H # include "virsh.h" @@ -34,4 +34,4 @@ char *virshGetDomainDescription(vshControl *ctl, virDomainPtr dom, extern const vshCmdDef domMonitoringCmds[]; -#endif /* VIRSH_DOMAIN_MONITOR_H */ +#endif /* LIBVIRT_VIRSH_DOMAIN_MONITOR_H */ diff --git a/tools/virsh-domain.h b/tools/virsh-domain.h index d4407c6a77..71d7902fee 100644 --- a/tools/virsh-domain.h +++ b/tools/virsh-domain.h @@ -23,8 +23,8 @@ * */ -#ifndef VIRSH_DOMAIN_H -# define VIRSH_DOMAIN_H +#ifndef LIBVIRT_VIRSH_DOMAIN_H +# define LIBVIRT_VIRSH_DOMAIN_H # include "virsh.h" @@ -38,4 +38,4 @@ extern virshDomainEventCallback virshDomainEventCallbacks[]; extern const vshCmdDef domManagementCmds[]; -#endif /* VIRSH_DOMAIN_H */ +#endif /* LIBVIRT_VIRSH_DOMAIN_H */ diff --git a/tools/virsh-host.h b/tools/virsh-host.h index 7bc3bd54fa..cdec9ae920 100644 --- a/tools/virsh-host.h +++ b/tools/virsh-host.h @@ -23,11 +23,11 @@ * */ -#ifndef VIRSH_HOST_H -# define VIRSH_HOST_H +#ifndef LIBVIRT_VIRSH_HOST_H +# define LIBVIRT_VIRSH_HOST_H # include "virsh.h" extern const vshCmdDef hostAndHypervisorCmds[]; -#endif /* VIRSH_HOST_H */ +#endif /* LIBVIRT_VIRSH_HOST_H */ diff --git a/tools/virsh-interface.h b/tools/virsh-interface.h index f02bbdbc94..03e6ec28a5 100644 --- a/tools/virsh-interface.h +++ b/tools/virsh-interface.h @@ -23,8 +23,8 @@ * */ -#ifndef VIRSH_INTERFACE_H -# define VIRSH_INTERFACE_H +#ifndef LIBVIRT_VIRSH_INTERFACE_H +# define LIBVIRT_VIRSH_INTERFACE_H # include "virsh.h" @@ -39,4 +39,4 @@ virInterfacePtr virshCommandOptInterfaceBy(vshControl *ctl, const vshCmd *cmd, extern const vshCmdDef ifaceCmds[]; -#endif /* VIRSH_INTERFACE_H */ +#endif /* LIBVIRT_VIRSH_INTERFACE_H */ diff --git a/tools/virsh-network.h b/tools/virsh-network.h index 0e11749467..2aeb894484 100644 --- a/tools/virsh-network.h +++ b/tools/virsh-network.h @@ -23,8 +23,8 @@ * */ -#ifndef VIRSH_NETWORK_H -# define VIRSH_NETWORK_H +#ifndef LIBVIRT_VIRSH_NETWORK_H +# define LIBVIRT_VIRSH_NETWORK_H # include "virsh.h" @@ -39,4 +39,4 @@ virshCommandOptNetworkBy(vshControl *ctl, const vshCmd *cmd, extern const vshCmdDef networkCmds[]; -#endif /* VIRSH_NETWORK_H */ +#endif /* LIBVIRT_VIRSH_NETWORK_H */ diff --git a/tools/virsh-nodedev.h b/tools/virsh-nodedev.h index d32ca39c52..8be21d1b17 100644 --- a/tools/virsh-nodedev.h +++ b/tools/virsh-nodedev.h @@ -23,8 +23,8 @@ * */ -#ifndef VIRSH_NODEDEV_H -# define VIRSH_NODEDEV_H +#ifndef LIBVIRT_VIRSH_NODEDEV_H +# define LIBVIRT_VIRSH_NODEDEV_H # include "virsh.h" @@ -38,4 +38,4 @@ extern virshNodedevEventCallback virshNodedevEventCallbacks[]; extern const vshCmdDef nodedevCmds[]; -#endif /* VIRSH_NODEDEV_H */ +#endif /* LIBVIRT_VIRSH_NODEDEV_H */ diff --git a/tools/virsh-nwfilter.h b/tools/virsh-nwfilter.h index d8ca0e3960..14292424fa 100644 --- a/tools/virsh-nwfilter.h +++ b/tools/virsh-nwfilter.h @@ -23,8 +23,8 @@ * */ -#ifndef VIRSH_NWFILTER_H -# define VIRSH_NWFILTER_H +#ifndef LIBVIRT_VIRSH_NWFILTER_H +# define LIBVIRT_VIRSH_NWFILTER_H # include "virsh.h" @@ -47,4 +47,4 @@ virshCommandOptNWFilterBindingBy(vshControl *ctl, const vshCmd *cmd, extern const vshCmdDef nwfilterCmds[]; -#endif /* VIRSH_NWFILTER_H */ +#endif /* LIBVIRT_VIRSH_NWFILTER_H */ diff --git a/tools/virsh-pool.h b/tools/virsh-pool.h index 0df7a2e18d..c6edfa5541 100644 --- a/tools/virsh-pool.h +++ b/tools/virsh-pool.h @@ -23,8 +23,8 @@ * */ -#ifndef VIRSH_POOL_H -# define VIRSH_POOL_H +#ifndef LIBVIRT_VIRSH_POOL_H +# define LIBVIRT_VIRSH_POOL_H # include "virsh.h" @@ -47,4 +47,4 @@ extern virshPoolEventCallback virshPoolEventCallbacks[]; extern const vshCmdDef storagePoolCmds[]; -#endif /* VIRSH_POOL_H */ +#endif /* LIBVIRT_VIRSH_POOL_H */ diff --git a/tools/virsh-secret.h b/tools/virsh-secret.h index b68d366b2c..03b7a6a16c 100644 --- a/tools/virsh-secret.h +++ b/tools/virsh-secret.h @@ -23,8 +23,8 @@ * */ -#ifndef VIRSH_SECRET_H -# define VIRSH_SECRET_H +#ifndef LIBVIRT_VIRSH_SECRET_H +# define LIBVIRT_VIRSH_SECRET_H # include "virsh.h" @@ -38,4 +38,4 @@ extern virshSecretEventCallback virshSecretEventCallbacks[]; extern const vshCmdDef secretCmds[]; -#endif /* VIRSH_SECRET_H */ +#endif /* LIBVIRT_VIRSH_SECRET_H */ diff --git a/tools/virsh-snapshot.h b/tools/virsh-snapshot.h index 2756d382b8..e999a9bb7b 100644 --- a/tools/virsh-snapshot.h +++ b/tools/virsh-snapshot.h @@ -23,11 +23,11 @@ * */ -#ifndef VIRSH_SNAPSHOT_H -# define VIRSH_SNAPSHOT_H +#ifndef LIBVIRT_VIRSH_SNAPSHOT_H +# define LIBVIRT_VIRSH_SNAPSHOT_H # include "virsh.h" extern const vshCmdDef snapshotCmds[]; -#endif /* VIRSH_SNAPSHOT_H */ +#endif /* LIBVIRT_VIRSH_SNAPSHOT_H */ diff --git a/tools/virsh-util.h b/tools/virsh-util.h index 9a0af3513d..fb2ed277af 100644 --- a/tools/virsh-util.h +++ b/tools/virsh-util.h @@ -16,8 +16,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef VIRSH_UTIL_H -# define VIRSH_UTIL_H +#ifndef LIBVIRT_VIRSH_UTIL_H +# define LIBVIRT_VIRSH_UTIL_H # include "virsh.h" @@ -104,4 +104,4 @@ virshDomainGetXML(vshControl *ctl, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; -#endif /* VIRSH_UTIL_H */ +#endif /* LIBVIRT_VIRSH_UTIL_H */ diff --git a/tools/virsh-volume.h b/tools/virsh-volume.h index 60f647776e..ce4ee8a490 100644 --- a/tools/virsh-volume.h +++ b/tools/virsh-volume.h @@ -23,8 +23,8 @@ * */ -#ifndef VIRSH_VOLUME_H -# define VIRSH_VOLUME_H +#ifndef LIBVIRT_VIRSH_VOLUME_H +# define LIBVIRT_VIRSH_VOLUME_H # include "virsh.h" @@ -40,4 +40,4 @@ virStorageVolPtr virshCommandOptVolBy(vshControl *ctl, const vshCmd *cmd, extern const vshCmdDef storageVolCmds[]; -#endif /* VIRSH_VOLUME_H */ +#endif /* LIBVIRT_VIRSH_VOLUME_H */ diff --git a/tools/virsh.h b/tools/virsh.h index 6ff5c74b5e..dcf98c773b 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -22,8 +22,8 @@ * Daniel P. Berrange <berrange@redhat.com> */ -#ifndef VIRSH_H -# define VIRSH_H +#ifndef LIBVIRT_VIRSH_H +# define LIBVIRT_VIRSH_H # include <stdarg.h> # include <unistd.h> @@ -176,4 +176,4 @@ typedef enum { virConnectPtr virshConnect(vshControl *ctl, const char *uri, bool readonly); -#endif /* VIRSH_H */ +#endif /* LIBVIRT_VIRSH_H */ diff --git a/tools/virt-admin-completer.h b/tools/virt-admin-completer.h index 311f47fcf6..5358276daf 100644 --- a/tools/virt-admin-completer.h +++ b/tools/virt-admin-completer.h @@ -21,8 +21,8 @@ * */ -#ifndef VIRT_ADMIN_COMPLETER -# define VIRT_ADMIN_COMPLETER +#ifndef LIBVIRT_VIRT_ADMIN_COMPLETER_H +# define LIBVIRT_VIRT_ADMIN_COMPLETER_H # include "vsh.h" @@ -30,4 +30,4 @@ char ** vshAdmServerCompleter(vshControl *ctl, const vshCmd *cmd, unsigned int flags); -#endif /* VIRT_ADMIN_COMPLETER */ +#endif /* LIBVIRT_VIRT_ADMIN_COMPLETER_H */ diff --git a/tools/virt-admin.h b/tools/virt-admin.h index 62228ccab1..de5a65ebdc 100644 --- a/tools/virt-admin.h +++ b/tools/virt-admin.h @@ -20,8 +20,8 @@ * Erik Skultety <eskultet@redhat.com> */ -#ifndef VIRT_ADMIN_H -# define VIRT_ADMIN_H +#ifndef LIBVIRT_VIRT_ADMIN_H +# define LIBVIRT_VIRT_ADMIN_H # include "internal.h" # include "vsh.h" @@ -43,4 +43,4 @@ struct _vshAdmControl { bool wantReconnect; }; -#endif /* VIRT_ADMIN_H */ +#endif /* LIBVIRT_VIRT_ADMIN_H */ diff --git a/tools/virt-host-validate-bhyve.h b/tools/virt-host-validate-bhyve.h index 290d4336f8..c9a3f2b5b4 100644 --- a/tools/virt-host-validate-bhyve.h +++ b/tools/virt-host-validate-bhyve.h @@ -19,9 +19,9 @@ * */ -#ifndef __VIRT_HOST_VALIDATE_BHYVE_H__ -# define __VIRT_HOST_VALIDATE_BHYVE_H__ +#ifndef LIBVIRT_VIRT_HOST_VALIDATE_BHYVE_H +# define LIBVIRT_VIRT_HOST_VALIDATE_BHYVE_H int virHostValidateBhyve(void); -#endif /* __VIRT_HOST_VALIDATE_BHYVE_H__ */ +#endif /* LIBVIRT_VIRT_HOST_VALIDATE_BHYVE_H */ diff --git a/tools/virt-host-validate-common.h b/tools/virt-host-validate-common.h index b23dd7cdbe..c2e11dae01 100644 --- a/tools/virt-host-validate-common.h +++ b/tools/virt-host-validate-common.h @@ -19,8 +19,8 @@ * */ -#ifndef __VIRT_HOST_VALIDATE_COMMON_H__ -# define __VIRT_HOST_VALIDATE_COMMON_H__ +#ifndef LIBVIRT_VIRT_HOST_VALIDATE_COMMON_H +# define LIBVIRT_VIRT_HOST_VALIDATE_COMMON_H # include "internal.h" # include "virutil.h" @@ -84,4 +84,4 @@ int virHostValidateCGroupControllers(const char *hvname, int virHostValidateIOMMU(const char *hvname, virHostValidateLevel level); -#endif /* __VIRT_HOST_VALIDATE_COMMON_H__ */ +#endif /* LIBVIRT_VIRT_HOST_VALIDATE_COMMON_H */ diff --git a/tools/virt-host-validate-lxc.h b/tools/virt-host-validate-lxc.h index 17b02a3e30..b8d3dd8eb0 100644 --- a/tools/virt-host-validate-lxc.h +++ b/tools/virt-host-validate-lxc.h @@ -19,9 +19,9 @@ * */ -#ifndef __VIRT_HOST_VALIDATE_LXC_H__ -# define __VIRT_HOST_VALIDATE_LXC_H__ +#ifndef LIBVIRT_VIRT_HOST_VALIDATE_LXC_H +# define LIBVIRT_VIRT_HOST_VALIDATE_LXC_H int virHostValidateLXC(void); -#endif /* __VIRT_HOST_VALIDATE_LXC_H__ */ +#endif /* LIBVIRT_VIRT_HOST_VALIDATE_LXC_H */ diff --git a/tools/virt-host-validate-qemu.h b/tools/virt-host-validate-qemu.h index 8a0ce4617a..031029dd61 100644 --- a/tools/virt-host-validate-qemu.h +++ b/tools/virt-host-validate-qemu.h @@ -19,9 +19,9 @@ * */ -#ifndef __VIRT_HOST_VALIDATE_QEMU_H__ -# define __VIRT_HOST_VALIDATE_QEMU_H__ +#ifndef LIBVIRT_VIRT_HOST_VALIDATE_QEMU_H +# define LIBVIRT_VIRT_HOST_VALIDATE_QEMU_H int virHostValidateQEMU(void); -#endif /* __VIRT_HOST_VALIDATE_QEMU_H__ */ +#endif /* LIBVIRT_VIRT_HOST_VALIDATE_QEMU_H */ diff --git a/tools/vsh-table.h b/tools/vsh-table.h index 15a9f8957b..e5b8a9f480 100644 --- a/tools/vsh-table.h +++ b/tools/vsh-table.h @@ -18,8 +18,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef VSH_TABLE_H -# define VSH_TABLE_H +#ifndef LIBVIRT_VSH_TABLE_H +# define LIBVIRT_VSH_TABLE_H # include "vsh.h" @@ -34,4 +34,4 @@ int vshTableRowAppend(vshTablePtr table, const char *arg, ...); void vshTablePrintToStdout(vshTablePtr table, vshControl *ctl); char *vshTablePrintToString(vshTablePtr table, bool header); -#endif /* VSH_TABLE_H */ +#endif /* LIBVIRT_VSH_TABLE_H */ diff --git a/tools/vsh.h b/tools/vsh.h index 8b4f544a61..d5f15622f8 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -22,8 +22,8 @@ * Daniel P. Berrange <berrange@redhat.com> */ -#ifndef VSH_H -# define VSH_H +#ifndef LIBVIRT_VSH_H +# define LIBVIRT_VSH_H # include <stdarg.h> # include <unistd.h> @@ -587,4 +587,4 @@ char *_vshStrdup(vshControl *ctl, const char *s, const char *filename, # define VSH_REQUIRE_OPTION_VAR(VARNAME1, VARNAME2) \ VSH_REQUIRE_OPTION_EXPR(#VARNAME1, VARNAME1, #VARNAME2, VARNAME2) -#endif /* VSH_H */ +#endif /* LIBVIRT_VSH_H */ diff --git a/tools/wireshark/src/packet-libvirt.h b/tools/wireshark/src/packet-libvirt.h index 896b33fb6c..4f2a275ba6 100644 --- a/tools/wireshark/src/packet-libvirt.h +++ b/tools/wireshark/src/packet-libvirt.h @@ -17,8 +17,8 @@ * <http://www.gnu.org/licenses/>. */ -#ifndef _PACKET_LIBVIRT_H_ -# define _PACKET_LIBVIRT_H_ +#ifndef LIBVIRT_PACKET_LIBVIRT_H +# define LIBVIRT_PACKET_LIBVIRT_H # include "libvirt/libvirt.h" @@ -112,4 +112,4 @@ static gboolean dissect_xdr_array(tvbuff_t *tvb, proto_tree *tree, XDR *xdrs, in # include "libvirt/protocol.h" -#endif /* _PACKET_LIBVIRT_H_ */ +#endif /* LIBVIRT_PACKET_LIBVIRT_H */ -- 2.19.2
On 12/13/18 5:26 PM, Daniel P. Berrangé wrote:
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
Thanks for taking care of this. ACK Michal
participants (2)
-
Daniel P. Berrangé -
Michal Privoznik