This is patch set that implement dropping of virXXXPtr typedefs as discussed here: https://listman.redhat.com/archives/libvir-list/2021-March/msg00427.html and it does is in big bang style, just like suggested in the discussion. Patches can be found here: https://gitlab.com/MichalPrivoznik/libvirt/-/tree/ptr_remove And of course pipeline is green: https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/269102351 Patch 6/6 is intentionally cut off as it has ~ 6MiB. I'll replace $URL in its commit message with link to this cover letter, once I send it. I've played around with sed and came to the following ugly, horrible and ineffective bash script: =========== #!/bin/bash SED_SCRIPT="sed_script" export IFS=$'\n' PRESERVED=( $(git grep -h "^typedef.*Ptr;$" -- include/) ) for i in $(git grep -h "^typedef.*Ptr;$"); do subst=1 for p in ${PRESERVED[*]}; do if [[ $i == *$p* ]]; then subst=0 fi done if [ $subst -ne 1 ]; then continue; fi PTR=$(echo $i | cut -d'*' -f2 | cut -d';' -f1); if [[ $i == *struct* ]]; then SRC=$(echo ${i#"typedef "} | cut -d' ' -f1-2); else SRC=$(echo ${i#"typedef "} | cut -d' ' -f1) ; fi if [ "$1" -eq 0 ]; then echo "s/${PTR} /${SRC} */g"; elif [ "$1" -eq 1 ]; then echo "s/${PTR}/${SRC} */g"; echo "/^typedef.*\*${SRC} \*;$/D"; fi done > ${SED_SCRIPT} for i in $(git ls-files); do if [ -f $i -a ! -L $i ]; then echo $i; sed -i -f ${SED_SCRIPT} $i; fi done rm ${SED_SCRIPT} =========== I've ran it like following: ./script.sh 0 && ./script.sh 1 Mostly, because in the first run I wanted to fix following pattern: virXXXPtr variable; and in the second: static virXXXPtr function() And just like always, I had to fix some stuff by hand. For instance, in vbox there is this function virVBoxSnapshotConfHardDiskPtrByLocation() and of course there's also virVBoxSnapshotConfHardDiskPtr. Then, I've dropped some empty lines, mostly from patterns like this: typedef struct _virXXX virXXX; <!-- typedef virXXXPtr used to live here --> struct _virXXX { Michal Prívozník (6): virsysinfo: Define and use auto cleanup func for virSysinfoDef properly gendispatch: Don't use virXXXPtr for internal types syntax-check: Fix and rename virSecurity rule virconftypes: Fix name of virCapsGuestArchPtr lib: Put some variable declarations on individual lines lib: Drop internal virXXXPtr typedefs build-aux/syntax-check.mk | 4 +- docs/advanced-tests.rst | 2 +- docs/api_extension.html.in | 2 +- docs/coding-style.rst | 2 +- docs/internals/command.html.in | 12 +- docs/internals/rpc.html.in | 32 +- scripts/esx_vi_generator.py | 6 +- scripts/hyperv_wmi_generator.py | 6 +- src/access/viraccessdriver.h | 52 +- src/access/viraccessdrivernop.c | 46 +- src/access/viraccessdriverpolkit.c | 52 +- src/access/viraccessdriverstack.c | 82 +- src/access/viraccessdriverstack.h | 4 +- src/access/viraccessmanager.c | 78 +- src/access/viraccessmanager.h | 57 +- src/admin/admin_remote.c | 56 +- src/admin/admin_server.c | 34 +- src/admin/admin_server.h | 26 +- src/admin/admin_server_dispatch.c | 129 +- src/admin/admin_server_dispatch.h | 8 +- src/admin/libvirt-admin.c | 8 +- src/bhyve/bhyve_capabilities.c | 26 +- src/bhyve/bhyve_capabilities.h | 8 +- src/bhyve/bhyve_command.c | 121 +- src/bhyve/bhyve_command.h | 14 +- src/bhyve/bhyve_conf.c | 18 +- src/bhyve/bhyve_conf.h | 9 +- src/bhyve/bhyve_device.c | 30 +- src/bhyve/bhyve_device.h | 6 +- src/bhyve/bhyve_domain.c | 36 +- src/bhyve/bhyve_domain.h | 7 +- src/bhyve/bhyve_driver.c | 161 +- src/bhyve/bhyve_driver.h | 6 +- src/bhyve/bhyve_monitor.c | 34 +- src/bhyve/bhyve_monitor.h | 7 +- src/bhyve/bhyve_parse_command.c | 40 +- src/bhyve/bhyve_parse_command.h | 4 +- src/bhyve/bhyve_process.c | 52 +- src/bhyve/bhyve_process.h | 16 +- src/bhyve/bhyve_utils.h | 25 +- src/conf/backup_conf.c | 54 +- src/conf/backup_conf.h | 24 +- src/conf/capabilities.c | 240 +- src/conf/capabilities.h | 116 +- src/conf/checkpoint_conf.c | 80 +- src/conf/checkpoint_conf.h | 23 +- src/conf/cpu_conf.c | 78 +- src/conf/cpu_conf.h | 71 +- src/conf/device_conf.c | 36 +- src/conf/device_conf.h | 42 +- src/conf/domain_addr.c | 315 +-- src/conf/domain_addr.h | 128 +- src/conf/domain_audit.c | 96 +- src/conf/domain_audit.h | 76 +- src/conf/domain_capabilities.c | 70 +- src/conf/domain_capabilities.h | 39 +- src/conf/domain_conf.c | 2508 ++++++++--------- src/conf/domain_conf.h | 967 ++++--- src/conf/domain_event.c | 552 ++-- src/conf/domain_event.h | 178 +- src/conf/domain_nwfilter.c | 18 +- src/conf/domain_nwfilter.h | 6 +- src/conf/domain_validate.c | 64 +- src/conf/domain_validate.h | 10 +- src/conf/interface_conf.c | 76 +- src/conf/interface_conf.h | 18 +- src/conf/moment_conf.c | 8 +- src/conf/moment_conf.h | 8 +- src/conf/netdev_bandwidth_conf.c | 12 +- src/conf/netdev_bandwidth_conf.h | 6 +- src/conf/netdev_vlan_conf.c | 4 +- src/conf/netdev_vlan_conf.h | 4 +- src/conf/netdev_vport_profile_conf.c | 6 +- src/conf/netdev_vport_profile_conf.h | 4 +- src/conf/network_conf.c | 198 +- src/conf/network_conf.h | 105 +- src/conf/network_event.c | 26 +- src/conf/network_event.h | 6 +- src/conf/networkcommon_conf.c | 6 +- src/conf/networkcommon_conf.h | 6 +- src/conf/node_device_conf.c | 214 +- src/conf/node_device_conf.h | 70 +- src/conf/node_device_event.c | 37 +- src/conf/node_device_event.h | 8 +- src/conf/node_device_util.c | 4 +- src/conf/node_device_util.h | 4 +- src/conf/numa_conf.c | 161 +- src/conf/numa_conf.h | 93 +- src/conf/nwfilter_conf.c | 142 +- src/conf/nwfilter_conf.h | 52 +- src/conf/nwfilter_ipaddrmap.c | 10 +- src/conf/nwfilter_ipaddrmap.h | 2 +- src/conf/nwfilter_params.c | 77 +- src/conf/nwfilter_params.h | 42 +- src/conf/object_event.c | 134 +- src/conf/object_event.h | 18 +- src/conf/object_event_private.h | 18 +- src/conf/secret_conf.c | 16 +- src/conf/secret_conf.h | 7 +- src/conf/secret_event.c | 37 +- src/conf/secret_event.h | 8 +- src/conf/snapshot_conf.c | 98 +- src/conf/snapshot_conf.h | 41 +- src/conf/snapshot_conf_priv.h | 4 +- src/conf/storage_adapter_conf.c | 30 +- src/conf/storage_adapter_conf.h | 13 +- src/conf/storage_capabilities.c | 14 +- src/conf/storage_capabilities.h | 7 +- src/conf/storage_conf.c | 143 +- src/conf/storage_conf.h | 82 +- src/conf/storage_encryption_conf.c | 44 +- src/conf/storage_encryption_conf.h | 15 +- src/conf/storage_event.c | 37 +- src/conf/storage_event.h | 8 +- src/conf/storage_source_conf.c | 152 +- src/conf/storage_source_conf.h | 125 +- src/conf/virchrdev.c | 19 +- src/conf/virchrdev.h | 7 +- src/conf/virconftypes.h | 114 - src/conf/virdomaincheckpointobjlist.c | 58 +- src/conf/virdomaincheckpointobjlist.h | 54 +- src/conf/virdomainmomentobjlist.c | 110 +- src/conf/virdomainmomentobjlist.h | 66 +- src/conf/virdomainobjlist.c | 144 +- src/conf/virdomainobjlist.h | 55 +- src/conf/virdomainsnapshotobjlist.c | 62 +- src/conf/virdomainsnapshotobjlist.h | 54 +- src/conf/virinterfaceobj.c | 83 +- src/conf/virinterfaceobj.h | 44 +- src/conf/virnetworkobj.c | 271 +- src/conf/virnetworkobj.h | 156 +- src/conf/virnetworkportdef.c | 18 +- src/conf/virnetworkportdef.h | 15 +- src/conf/virnodedeviceobj.c | 159 +- src/conf/virnodedeviceobj.h | 57 +- src/conf/virnwfilterbindingdef.c | 26 +- src/conf/virnwfilterbindingdef.h | 16 +- src/conf/virnwfilterbindingobj.c | 40 +- src/conf/virnwfilterbindingobj.h | 23 +- src/conf/virnwfilterbindingobjlist.c | 88 +- src/conf/virnwfilterbindingobjlist.h | 27 +- src/conf/virnwfilterobj.c | 112 +- src/conf/virnwfilterobj.h | 59 +- src/conf/virsavecookie.c | 22 +- src/conf/virsavecookie.h | 25 +- src/conf/virsecretobj.c | 139 +- src/conf/virsecretobj.h | 60 +- src/conf/virstorageobj.c | 340 ++- src/conf/virstorageobj.h | 150 +- src/cpu/cpu.c | 70 +- src/cpu/cpu.h | 125 +- src/cpu/cpu_arm.c | 94 +- src/cpu/cpu_ppc64.c | 63 +- src/cpu/cpu_s390.c | 8 +- src/cpu/cpu_x86.c | 426 ++- src/cpu/cpu_x86.h | 8 +- src/cpu/cpu_x86_data.h | 3 - src/datatypes.c | 58 +- src/datatypes.h | 74 +- src/driver-hypervisor.h | 3 +- src/driver-interface.h | 1 - src/driver-network.h | 1 - src/driver-nodedev.h | 1 - src/driver-nwfilter.h | 1 - src/driver-secret.h | 1 - src/driver-state.h | 2 - src/driver-storage.h | 1 - src/driver-stream.h | 2 - src/driver.c | 2 +- src/driver.h | 32 +- src/esx/esx_driver.c | 22 +- src/esx/esx_interface_driver.c | 4 +- src/esx/esx_network_driver.c | 8 +- src/esx/esx_private.h | 4 +- src/esx/esx_storage_driver.c | 28 +- src/esx/esx_util.c | 4 +- src/esx/esx_util.h | 2 +- src/esx/esx_vi.c | 6 +- src/esx/esx_vi.h | 8 +- src/esx/esx_vi_types.c | 12 +- src/esx/esx_vi_types.h | 26 +- src/hyperv/hyperv_driver.c | 74 +- src/hyperv/hyperv_private.h | 4 +- src/hyperv/hyperv_util.c | 4 +- src/hyperv/hyperv_util.h | 2 +- src/hyperv/hyperv_wmi.c | 66 +- src/hyperv/hyperv_wmi.h | 49 +- src/hyperv/hyperv_wmi_classes.h | 4 +- src/hypervisor/domain_cgroup.c | 20 +- src/hypervisor/domain_cgroup.h | 16 +- src/hypervisor/domain_driver.c | 29 +- src/hypervisor/domain_driver.h | 18 +- src/hypervisor/virclosecallbacks.c | 55 +- src/hypervisor/virclosecallbacks.h | 25 +- src/hypervisor/virhostdev.c | 327 +-- src/hypervisor/virhostdev.h | 121 +- src/interface/interface_backend_netcf.c | 26 +- src/interface/interface_backend_udev.c | 14 +- src/libvirt.c | 38 +- src/libxl/libxl_capabilities.c | 64 +- src/libxl/libxl_capabilities.h | 6 +- src/libxl/libxl_conf.c | 142 +- src/libxl/libxl_conf.h | 75 +- src/libxl/libxl_domain.c | 196 +- src/libxl/libxl_domain.h | 57 +- src/libxl/libxl_driver.c | 727 ++--- src/libxl/libxl_logger.c | 8 +- src/libxl/libxl_logger.h | 9 +- src/libxl/libxl_migration.c | 145 +- src/libxl/libxl_migration.h | 24 +- src/libxl/xen_common.c | 184 +- src/libxl/xen_common.h | 30 +- src/libxl/xen_xl.c | 178 +- src/libxl/xen_xl.h | 8 +- src/libxl/xen_xm.c | 43 +- src/libxl/xen_xm.h | 6 +- src/locking/domain_lock.c | 72 +- src/locking/domain_lock.h | 40 +- src/locking/lock_daemon.c | 106 +- src/locking/lock_daemon.h | 10 +- src/locking/lock_daemon_config.c | 12 +- src/locking/lock_daemon_config.h | 8 +- src/locking/lock_daemon_dispatch.c | 92 +- src/locking/lock_driver.h | 21 +- src/locking/lock_driver_lockd.c | 73 +- src/locking/lock_driver_nop.c | 16 +- src/locking/lock_driver_sanlock.c | 62 +- src/locking/lock_manager.c | 42 +- src/locking/lock_manager.h | 29 +- src/logging/log_daemon.c | 88 +- src/logging/log_daemon.h | 7 +- src/logging/log_daemon_config.c | 12 +- src/logging/log_daemon_config.h | 8 +- src/logging/log_daemon_dispatch.c | 32 +- src/logging/log_handler.c | 72 +- src/logging/log_handler.h | 17 +- src/logging/log_manager.c | 24 +- src/logging/log_manager.h | 13 +- src/lxc/lxc_cgroup.c | 74 +- src/lxc/lxc_cgroup.h | 16 +- src/lxc/lxc_conf.c | 34 +- src/lxc/lxc_conf.h | 37 +- src/lxc/lxc_container.c | 92 +- src/lxc/lxc_container.h | 6 +- src/lxc/lxc_controller.c | 225 +- src/lxc/lxc_domain.c | 56 +- src/lxc/lxc_domain.h | 18 +- src/lxc/lxc_driver.c | 590 ++-- src/lxc/lxc_fuse.c | 32 +- src/lxc/lxc_fuse.h | 10 +- src/lxc/lxc_hostdev.c | 30 +- src/lxc/lxc_hostdev.h | 20 +- src/lxc/lxc_monitor.c | 50 +- src/lxc/lxc_monitor.h | 28 +- src/lxc/lxc_native.c | 114 +- src/lxc/lxc_native.h | 6 +- src/lxc/lxc_process.c | 162 +- src/lxc/lxc_process.h | 38 +- src/network/bridge_driver.c | 568 ++-- src/network/bridge_driver.h | 6 +- src/network/bridge_driver_linux.c | 100 +- src/network/bridge_driver_nop.c | 8 +- src/network/bridge_driver_platform.h | 17 +- src/node_device/node_device_driver.c | 74 +- src/node_device/node_device_driver.h | 10 +- src/node_device/node_device_udev.c | 152 +- src/nwfilter/nwfilter_dhcpsnoop.c | 186 +- src/nwfilter/nwfilter_dhcpsnoop.h | 6 +- src/nwfilter/nwfilter_driver.c | 48 +- src/nwfilter/nwfilter_ebiptables_driver.c | 205 +- src/nwfilter/nwfilter_gentech_driver.c | 129 +- src/nwfilter/nwfilter_gentech_driver.h | 18 +- src/nwfilter/nwfilter_learnipaddr.c | 40 +- src/nwfilter/nwfilter_learnipaddr.h | 6 +- src/nwfilter/nwfilter_tech_driver.h | 8 +- src/openvz/openvz_conf.c | 30 +- src/openvz/openvz_conf.h | 12 +- src/openvz/openvz_driver.c | 141 +- src/openvz/openvz_util.c | 2 +- src/qemu/THREADS.txt | 72 +- src/qemu/qemu_agent.c | 279 +- src/qemu/qemu_agent.h | 90 +- src/qemu/qemu_alias.c | 72 +- src/qemu/qemu_alias.h | 48 +- src/qemu/qemu_backup.c | 136 +- src/qemu/qemu_backup.h | 26 +- src/qemu/qemu_block.c | 522 ++-- src/qemu/qemu_block.h | 199 +- src/qemu/qemu_blockjob.c | 334 +-- src/qemu/qemu_blockjob.h | 120 +- src/qemu/qemu_capabilities.c | 643 +++-- src/qemu/qemu_capabilities.h | 117 +- src/qemu/qemu_capspriv.h | 60 +- src/qemu/qemu_cgroup.c | 202 +- src/qemu/qemu_cgroup.h | 81 +- src/qemu/qemu_checkpoint.c | 190 +- src/qemu/qemu_checkpoint.h | 52 +- src/qemu/qemu_command.c | 1154 ++++---- src/qemu/qemu_command.h | 176 +- src/qemu/qemu_conf.c | 204 +- src/qemu/qemu_conf.h | 105 +- src/qemu/qemu_dbus.c | 38 +- src/qemu/qemu_dbus.h | 22 +- src/qemu/qemu_domain.c | 1453 +++++----- src/qemu/qemu_domain.h | 627 ++--- src/qemu/qemu_domain_address.c | 384 +-- src/qemu/qemu_domain_address.h | 44 +- src/qemu/qemu_domainjob.c | 132 +- src/qemu/qemu_domainjob.h | 100 +- src/qemu/qemu_driver.c | 2026 ++++++------- src/qemu/qemu_extdevice.c | 82 +- src/qemu/qemu_extdevice.h | 36 +- src/qemu/qemu_firmware.c | 140 +- src/qemu/qemu_firmware.h | 13 +- src/qemu/qemu_hostdev.c | 128 +- src/qemu/qemu_hostdev.h | 92 +- src/qemu/qemu_hotplug.c | 876 +++--- src/qemu/qemu_hotplug.h | 190 +- src/qemu/qemu_interface.c | 42 +- src/qemu/qemu_interface.h | 38 +- src/qemu/qemu_interop_config.c | 4 +- src/qemu/qemu_migration.c | 598 ++-- src/qemu/qemu_migration.h | 76 +- src/qemu/qemu_migration_cookie.c | 188 +- src/qemu/qemu_migration_cookie.h | 66 +- src/qemu/qemu_migration_params.c | 139 +- src/qemu/qemu_migration_params.h | 69 +- src/qemu/qemu_migration_paramspriv.h | 14 +- src/qemu/qemu_monitor.c | 600 ++-- src/qemu/qemu_monitor.h | 710 +++-- src/qemu/qemu_monitor_json.c | 1544 +++++----- src/qemu/qemu_monitor_json.h | 413 ++- src/qemu/qemu_monitor_priv.h | 2 +- src/qemu/qemu_monitor_text.c | 10 +- src/qemu/qemu_monitor_text.h | 10 +- src/qemu/qemu_namespace.c | 182 +- src/qemu/qemu_namespace.h | 66 +- src/qemu/qemu_process.c | 1198 ++++---- src/qemu/qemu_process.h | 158 +- src/qemu/qemu_processpriv.h | 6 +- src/qemu/qemu_qapi.c | 48 +- src/qemu/qemu_qapi.h | 4 +- src/qemu/qemu_saveimage.c | 78 +- src/qemu/qemu_saveimage.h | 44 +- src/qemu/qemu_security.c | 140 +- src/qemu/qemu_security.h | 110 +- src/qemu/qemu_slirp.c | 44 +- src/qemu/qemu_slirp.h | 39 +- src/qemu/qemu_snapshot.c | 303 +- src/qemu/qemu_snapshot.h | 20 +- src/qemu/qemu_tpm.c | 44 +- src/qemu/qemu_tpm.h | 24 +- src/qemu/qemu_validate.c | 162 +- src/qemu/qemu_validate.h | 2 +- src/qemu/qemu_vhost_user.c | 49 +- src/qemu/qemu_vhost_user.h | 15 +- src/qemu/qemu_vhost_user_gpu.c | 24 +- src/qemu/qemu_vhost_user_gpu.h | 24 +- src/qemu/qemu_virtiofs.c | 46 +- src/qemu/qemu_virtiofs.h | 28 +- src/remote/remote_daemon.c | 46 +- src/remote/remote_daemon.h | 25 +- src/remote/remote_daemon_config.c | 4 +- src/remote/remote_daemon_dispatch.c | 990 +++---- src/remote/remote_daemon_dispatch.h | 2 +- src/remote/remote_daemon_stream.c | 82 +- src/remote/remote_daemon_stream.h | 12 +- src/remote/remote_driver.c | 590 ++-- src/remote/remote_sockets.c | 4 +- src/remote/remote_sockets.h | 4 +- src/remote/remote_ssh_helper.c | 17 +- src/rpc/gendispatch.pl | 66 +- src/rpc/virkeepalive.c | 38 +- src/rpc/virkeepalive.h | 21 +- src/rpc/virnetclient.c | 271 +- src/rpc/virnetclient.h | 82 +- src/rpc/virnetclientprogram.c | 38 +- src/rpc/virnetclientprogram.h | 30 +- src/rpc/virnetclientstream.c | 82 +- src/rpc/virnetclientstream.h | 49 +- src/rpc/virnetdaemon.c | 114 +- src/rpc/virnetdaemon.h | 46 +- src/rpc/virnetlibsshsession.c | 84 +- src/rpc/virnetlibsshsession.h | 29 +- src/rpc/virnetmessage.c | 42 +- src/rpc/virnetmessage.h | 46 +- src/rpc/virnetsaslcontext.c | 50 +- src/rpc/virnetsaslcontext.h | 36 +- src/rpc/virnetserver.c | 202 +- src/rpc/virnetserver.h | 74 +- src/rpc/virnetserverclient.c | 231 +- src/rpc/virnetserverclient.h | 130 +- src/rpc/virnetserverprogram.c | 94 +- src/rpc/virnetserverprogram.h | 70 +- src/rpc/virnetserverservice.c | 80 +- src/rpc/virnetserverservice.h | 36 +- src/rpc/virnetsocket.c | 174 +- src/rpc/virnetsocket.h | 95 +- src/rpc/virnetsshsession.c | 85 +- src/rpc/virnetsshsession.h | 31 +- src/rpc/virnettlscontext.c | 58 +- src/rpc/virnettlscontext.h | 32 +- src/secret/secret_driver.c | 51 +- src/security/security_apparmor.c | 218 +- src/security/security_dac.c | 474 ++-- src/security/security_dac.h | 8 +- src/security/security_driver.c | 8 +- src/security/security_driver.h | 181 +- src/security/security_manager.c | 264 +- src/security/security_manager.h | 210 +- src/security/security_nop.c | 128 +- src/security/security_selinux.c | 530 ++-- src/security/security_stack.c | 345 ++- src/security/security_stack.h | 12 +- src/security/virt-aa-helper.c | 58 +- src/storage/storage_backend.c | 10 +- src/storage/storage_backend.h | 57 +- src/storage/storage_backend_disk.c | 96 +- src/storage/storage_backend_fs.c | 38 +- src/storage/storage_backend_gluster.c | 35 +- src/storage/storage_backend_iscsi.c | 28 +- src/storage/storage_backend_iscsi_direct.c | 36 +- src/storage/storage_backend_logical.c | 80 +- src/storage/storage_backend_mpath.c | 14 +- src/storage/storage_backend_rbd.c | 118 +- src/storage/storage_backend_scsi.c | 39 +- src/storage/storage_backend_sheepdog.c | 48 +- src/storage/storage_backend_sheepdog_priv.h | 4 +- src/storage/storage_backend_vstorage.c | 16 +- src/storage/storage_backend_zfs.c | 42 +- src/storage/storage_driver.c | 293 +- src/storage/storage_driver.h | 6 +- src/storage/storage_util.c | 270 +- src/storage/storage_util.h | 89 +- src/storage_file/storage_file_backend.c | 6 +- src/storage_file/storage_file_backend.h | 24 +- src/storage_file/storage_file_backend_fs.c | 36 +- .../storage_file_backend_gluster.c | 60 +- src/storage_file/storage_file_probe.c | 10 +- src/storage_file/storage_file_probe.h | 2 +- src/storage_file/storage_source.c | 110 +- src/storage_file/storage_source.h | 56 +- .../storage_source_backingstore.c | 104 +- .../storage_source_backingstore.h | 8 +- src/test/test_driver.c | 1162 ++++---- src/util/virarptable.c | 8 +- src/util/virarptable.h | 8 +- src/util/viraudit.c | 2 +- src/util/viraudit.h | 2 +- src/util/virauth.c | 2 +- src/util/virauth.h | 2 +- src/util/virauthconfig.c | 12 +- src/util/virauthconfig.h | 10 +- src/util/virbitmap.c | 94 +- src/util/virbitmap.h | 69 +- src/util/virbuffer.c | 50 +- src/util/virbuffer.h | 47 +- src/util/vircgroup.c | 484 ++-- src/util/vircgroup.h | 139 +- src/util/vircgroupbackend.c | 10 +- src/util/vircgroupbackend.h | 151 +- src/util/vircgrouppriv.h | 27 +- src/util/vircgroupv1.c | 152 +- src/util/vircgroupv2.c | 144 +- src/util/vircgroupv2devices.c | 22 +- src/util/vircgroupv2devices.h | 10 +- src/util/vircommand.c | 206 +- src/util/vircommand.h | 123 +- src/util/vircommandpriv.h | 2 +- src/util/virconf.c | 147 +- src/util/virconf.h | 55 +- src/util/virdnsmasq.c | 40 +- src/util/virdnsmasq.h | 15 +- src/util/virfdstream.c | 81 +- src/util/virfile.c | 28 +- src/util/virfile.h | 14 +- src/util/virfilecache.c | 30 +- src/util/virfilecache.h | 14 +- src/util/virfirewall.c | 85 +- src/util/virfirewall.h | 38 +- src/util/virfirmware.c | 12 +- src/util/virfirmware.h | 10 +- src/util/virgic.h | 1 - src/util/virhash.c | 18 +- src/util/virhash.h | 10 +- src/util/virhostcpu.c | 40 +- src/util/virhostcpu.h | 11 +- src/util/viridentity.c | 52 +- src/util/viridentity.h | 50 +- src/util/viriptables.c | 90 +- src/util/viriptables.h | 60 +- src/util/virjson.c | 341 ++- src/util/virjson.h | 161 +- src/util/virlease.c | 10 +- src/util/virlease.h | 6 +- src/util/virlockspace.c | 60 +- src/util/virlockspace.h | 21 +- src/util/virlog.c | 90 +- src/util/virlog.h | 39 +- src/util/virmacaddr.c | 12 +- src/util/virmacaddr.h | 14 +- src/util/virmacmap.c | 34 +- src/util/virmacmap.h | 13 +- src/util/virmdev.c | 88 +- src/util/virmdev.h | 75 +- src/util/virnetdev.c | 88 +- src/util/virnetdev.h | 36 +- src/util/virnetdevbandwidth.c | 27 +- src/util/virnetdevbandwidth.h | 15 +- src/util/virnetdevip.c | 42 +- src/util/virnetdevip.h | 27 +- src/util/virnetdevmacvlan.c | 12 +- src/util/virnetdevmidonet.c | 4 +- src/util/virnetdevopenvswitch.c | 14 +- src/util/virnetdevtap.c | 2 +- src/util/virnetdevtap.h | 2 +- src/util/virnetdevvlan.c | 6 +- src/util/virnetdevvlan.h | 7 +- src/util/virnetdevvportprofile.c | 8 +- src/util/virnetdevvportprofile.h | 7 +- src/util/virnetlink.c | 21 +- src/util/virnetlink.h | 3 +- src/util/virnodesuspend.c | 4 +- src/util/virnuma.c | 22 +- src/util/virnuma.h | 12 +- src/util/virnvme.c | 66 +- src/util/virnvme.h | 40 +- src/util/virobject.c | 80 +- src/util/virobject.h | 28 +- src/util/virpci.c | 263 +- src/util/virpci.h | 132 +- src/util/virperf.c | 32 +- src/util/virperf.h | 13 +- src/util/virpolkit.c | 16 +- src/util/virpolkit.h | 5 +- src/util/virportallocator.c | 27 +- src/util/virportallocator.h | 5 +- src/util/virprocess.c | 16 +- src/util/virprocess.h | 4 +- src/util/virqemu.c | 54 +- src/util/virqemu.h | 26 +- src/util/virresctrl.c | 331 ++- src/util/virresctrl.h | 75 +- src/util/virresctrlpriv.h | 4 +- src/util/virrotatingfile.c | 54 +- src/util/virrotatingfile.h | 22 +- src/util/virscsi.c | 69 +- src/util/virscsi.h | 52 +- src/util/virscsivhost.c | 56 +- src/util/virscsivhost.h | 40 +- src/util/virseclabel.c | 16 +- src/util/virseclabel.h | 12 +- src/util/virsecret.c | 12 +- src/util/virsecret.h | 13 +- src/util/virsocketaddr.c | 65 +- src/util/virsocketaddr.h | 52 +- src/util/virsysinfo.c | 140 +- src/util/virsysinfo.h | 47 +- src/util/virsysinfopriv.h | 8 +- src/util/virsystemd.c | 30 +- src/util/virsystemd.h | 11 +- src/util/virthread.c | 52 +- src/util/virthread.h | 64 +- src/util/virthreadpool.c | 68 +- src/util/virthreadpool.h | 25 +- src/util/virtpm.c | 18 +- src/util/virtypedparam.c | 32 +- src/util/virtypedparam.h | 29 +- src/util/viruri.c | 20 +- src/util/viruri.h | 19 +- src/util/virusb.c | 76 +- src/util/virusb.h | 50 +- src/util/virxml.c | 22 +- src/util/virxml.h | 21 +- src/vbox/vbox_common.c | 274 +- src/vbox/vbox_driver.c | 2 +- src/vbox/vbox_get_driver.h | 6 +- src/vbox/vbox_network.c | 36 +- src/vbox/vbox_snapshot_conf.c | 128 +- src/vbox/vbox_snapshot_conf.h | 62 +- src/vbox/vbox_storage.c | 22 +- src/vbox/vbox_tmpl.c | 44 +- src/vbox/vbox_uniformed_api.h | 51 +- src/vmware/vmware_conf.c | 20 +- src/vmware/vmware_conf.h | 12 +- src/vmware/vmware_driver.c | 70 +- src/vmx/vmx.c | 184 +- src/vmx/vmx.h | 14 +- src/vz/vz_driver.c | 420 +-- src/vz/vz_sdk.c | 387 +-- src/vz/vz_sdk.h | 80 +- src/vz/vz_utils.c | 48 +- src/vz/vz_utils.h | 42 +- tests/bhyveargv2xmlmock.c | 4 +- tests/bhyvexml2argvmock.c | 4 +- tests/commandtest.c | 8 +- tests/cputest.c | 106 +- tests/domaincapstest.c | 22 +- tests/domainconftest.c | 8 +- tests/genericxml2xmltest.c | 10 +- tests/interfacexml2xmltest.c | 2 +- tests/libxlxml2domconfigtest.c | 6 +- tests/lxcconf2xmltest.c | 6 +- tests/lxcxml2xmltest.c | 2 +- tests/networkxml2conftest.c | 18 +- tests/networkxml2firewalltest.c | 2 +- tests/networkxml2xmltest.c | 4 +- tests/networkxml2xmlupdatetest.c | 2 +- tests/nodedevmdevctltest.c | 18 +- tests/nodedevxml2xmltest.c | 6 +- tests/nwfilterxml2firewalltest.c | 29 +- tests/nwfilterxml2xmltest.c | 2 +- tests/openvzutilstest.c | 2 +- tests/qemuagenttest.c | 86 +- tests/qemublocktest.c | 80 +- tests/qemucapabilitiestest.c | 9 +- tests/qemucaps2xmltest.c | 13 +- tests/qemucapsprobe.c | 2 +- tests/qemucapsprobemock.c | 18 +- tests/qemucommandutiltest.c | 2 +- tests/qemucpumock.c | 4 +- tests/qemudomaincheckpointxml2xmltest.c | 4 +- tests/qemudomainsnapshotxml2xmltest.c | 2 +- tests/qemufirmwaretest.c | 10 +- tests/qemuhotplugmock.c | 8 +- tests/qemuhotplugtest.c | 42 +- tests/qemumigparamstest.c | 10 +- tests/qemumigrationcookiexmltest.c | 10 +- tests/qemumonitorjsontest.c | 141 +- tests/qemumonitortestutils.c | 163 +- tests/qemumonitortestutils.h | 56 +- tests/qemusecuritytest.c | 18 +- tests/qemustatusxml2xmltest.c | 2 +- tests/qemuxml2argvmock.c | 12 +- tests/qemuxml2argvtest.c | 44 +- tests/seclabeltest.c | 2 +- tests/secretxml2xmltest.c | 2 +- tests/securityselinuxlabeltest.c | 8 +- tests/securityselinuxtest.c | 14 +- tests/storagepoolcapstest.c | 8 +- tests/storagepoolxml2argvtest.c | 4 +- tests/storagevolxml2argvtest.c | 8 +- tests/sysinfotest.c | 4 +- tests/testutils.c | 32 +- tests/testutils.h | 12 +- tests/testutilshostcpus.h | 4 +- tests/testutilslxc.c | 12 +- tests/testutilslxc.h | 6 +- tests/testutilsqemu.c | 44 +- tests/testutilsqemu.h | 28 +- tests/testutilsqemuschema.c | 108 +- tests/testutilsqemuschema.h | 14 +- tests/testutilsxen.c | 14 +- tests/testutilsxen.h | 4 +- tests/vboxsnapshotxmltest.c | 2 +- tests/virauthconfigtest.c | 4 +- tests/virbitmaptest.c | 4 +- tests/virbuftest.c | 4 +- tests/vircaps2xmltest.c | 2 +- tests/vircapstest.c | 16 +- tests/vircgroupmock.c | 2 +- tests/vircgrouptest.c | 2 +- tests/virconftest.c | 2 +- tests/virfilecachetest.c | 29 +- tests/virfirewalltest.c | 6 +- tests/virhostcputest.c | 2 +- tests/virhostdevtest.c | 8 +- tests/virjsontest.c | 2 +- tests/virkmodtest.c | 2 +- tests/virlockspacetest.c | 14 +- tests/virlogtest.c | 4 +- tests/virmacmaptest.c | 8 +- tests/virnetdaemontest.c | 40 +- tests/virnetmessagetest.c | 10 +- tests/virnetserverclientmock.c | 4 +- tests/virnetserverclienttest.c | 6 +- tests/virnetsockettest.c | 32 +- tests/virnettlscontexttest.c | 4 +- tests/virnettlssessiontest.c | 8 +- tests/virnumamock.c | 6 +- tests/virnwfilterbindingxml2xmltest.c | 2 +- tests/virpcitest.c | 29 +- tests/virportallocatortest.c | 4 +- tests/virresctrltest.c | 4 +- tests/virrotatingfiletest.c | 26 +- tests/virschematest.c | 10 +- tests/virscsitest.c | 8 +- tests/virstoragetest.c | 24 +- tests/virsystemdtest.c | 10 +- tests/viruritest.c | 4 +- tests/virusbtest.c | 14 +- tests/vmx2xmltest.c | 8 +- tests/vshtabletest.c | 20 +- tests/xlconfigtest.c | 6 +- tests/xmconfigtest.c | 6 +- tests/xml2vmxtest.c | 10 +- tools/virsh-checkpoint.c | 17 +- tools/virsh-completer-checkpoint.c | 2 +- tools/virsh-completer-domain.c | 16 +- tools/virsh-completer-host.c | 6 +- tools/virsh-completer-interface.c | 2 +- tools/virsh-completer-network.c | 8 +- tools/virsh-completer-nodedev.c | 2 +- tools/virsh-completer-nwfilter.c | 4 +- tools/virsh-completer-pool.c | 2 +- tools/virsh-completer-secret.c | 2 +- tools/virsh-completer-snapshot.c | 2 +- tools/virsh-completer-volume.c | 2 +- tools/virsh-console.c | 21 +- tools/virsh-domain-monitor.c | 23 +- tools/virsh-domain.c | 95 +- tools/virsh-host.c | 42 +- tools/virsh-interface.c | 29 +- tools/virsh-network.c | 36 +- tools/virsh-nodedev.c | 25 +- tools/virsh-nwfilter.c | 36 +- tools/virsh-pool.c | 33 +- tools/virsh-secret.c | 19 +- tools/virsh-snapshot.c | 25 +- tools/virsh-util.c | 14 +- tools/virsh-util.h | 1 - tools/virsh-volume.c | 19 +- tools/virsh.c | 12 +- tools/virsh.h | 1 - tools/virt-admin-completer.c | 2 +- tools/virt-admin.c | 44 +- tools/virt-admin.h | 1 - tools/virt-host-validate-common.c | 8 +- tools/virt-host-validate-common.h | 2 +- tools/virt-host-validate-qemu.c | 2 +- tools/virt-login-shell-helper.c | 4 +- tools/vsh-table.c | 36 +- tools/vsh-table.h | 12 +- tools/vsh.c | 4 +- 734 files changed, 29278 insertions(+), 30098 deletions(-) -- 2.26.2