This series is pushed, posting only to track the changes to fix the issues pointed out by Peter. Pavel Hrdina (9): util: remove unused virStorageGenerateQcowPassphrase virstoragefile: remove unused virStorageFileChainCheckBroken util: move virQEMUBuildQemuImgKeySecretOpts into storage util: move virStorageFileGetLVMKey to locking util: move virStorageFileCheckCompat into conf src: add missing headers to various files virfile: refactor virFileNBDDeviceAssociate virstoragefile: move virStorageFileResize into virfile virstoragefile: move virStorageFileIsClusterFS into virfile src/conf/storage_conf.c | 23 ++++- src/driver.c | 1 + src/libvirt_private.syms | 8 +- src/locking/lock_driver_lockd.c | 68 +++++++++++- src/lxc/lxc_controller.c | 4 +- src/qemu/qemu_interop_config.c | 1 + src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_shim.c | 1 + src/storage/parthelper.c | 1 + src/storage/storage_util.c | 76 +++++++++++++- src/util/virarptable.c | 1 + src/util/vircgroupv1.c | 1 + src/util/vircgroupv2devices.c | 1 + src/util/virfile.c | 68 ++++++++++-- src/util/virfile.h | 9 +- src/util/virpidfile.c | 1 + src/util/virqemu.c | 69 ------------- src/util/virqemu.h | 6 -- src/util/virresctrl.c | 1 + src/util/virstorageencryption.c | 34 ------ src/util/virstorageencryption.h | 2 - src/util/virstoragefile.c | 177 -------------------------------- src/util/virstoragefile.h | 12 --- src/util/virsysinfo.c | 1 + src/util/virtpm.c | 1 + tests/virstoragetest.c | 6 -- tools/virsh-console.c | 1 + tools/virsh-util.c | 1 + 28 files changed, 249 insertions(+), 328 deletions(-) -- 2.29.2