The series is a prerequisite for implementing vhost-user-blk-pci. I wanted to use already existing code to parse and format virDomainChrSourceDefPtr as the vhostuser <disk> source similarly like we do for <interface> but it was not possible because the virStorageSource definition was living in util directory where we don't allow including anything from conf directory. Pavel Hrdina (17): util: remove unused virStorageGenerateQcowPassphrase virstoragefile: remove unused virStorageFileChainCheckBroken util: move virQEMUBuildQemuImgKeySecretOpts into storage util: move virStorageFileGetLVMKey to locking util: move virStorageFileCheckCompat into conf virfile: refactor virFileNBDDeviceAssociate virstoragefile: move virStorageFileResize into virfile virstoragefile: move virStorageFileIsClusterFS into virfile virstoragefile: move virStorageIsFile into virfile virstoragefile: move virStorageIsRelative into virfile virstoragefile: change virStorageSource->drv to void pointer storage: move storage file sources to separate directory util: extract virStorageFile code into storage_file util: move virStorageFileBackend code into storage_file util: move virStorageSource code into conf util: move virStorageEncryption code into conf storage_file: use virStorageFile prefix for all functions po/POTFILES.in | 10 +- src/conf/backup_conf.c | 2 +- src/conf/checkpoint_conf.c | 2 +- src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 6 +- src/conf/meson.build | 2 + src/conf/snapshot_conf.c | 2 +- src/conf/storage_conf.c | 25 +- src/conf/storage_conf.h | 4 +- .../storage_encryption.c} | 38 +- .../storage_encryption.h} | 4 +- src/conf/storage_source.c | 1316 +++++ src/conf/storage_source.h | 518 ++ src/driver.c | 1 + src/esx/esx_storage_backend_iscsi.c | 2 +- src/esx/esx_storage_backend_vmfs.c | 2 +- src/libvirt_private.syms | 200 +- src/libxl/meson.build | 1 + src/libxl/xen_xl.c | 3 +- src/locking/lock_driver_lockd.c | 67 +- src/lxc/lxc_controller.c | 4 +- src/meson.build | 1 + src/qemu/meson.build | 1 + src/qemu/qemu_backup.c | 3 +- src/qemu/qemu_block.c | 3 +- src/qemu/qemu_blockjob.c | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain.c | 19 +- src/qemu/qemu_driver.c | 9 +- src/qemu/qemu_hotplug.c | 3 +- src/qemu/qemu_interop_config.c | 1 + src/qemu/qemu_migration.c | 4 +- src/qemu/qemu_process.c | 1 + src/qemu/qemu_process.h | 2 +- src/qemu/qemu_shim.c | 1 + src/qemu/qemu_snapshot.c | 3 +- src/storage/meson.build | 34 +- src/storage/parthelper.c | 1 + src/storage/storage_backend.c | 2 +- src/storage/storage_backend_gluster.c | 1 + src/storage/storage_util.c | 84 +- src/storage_file/meson.build | 60 + src/storage_file/storage_file.c | 3845 ++++++++++++ src/storage_file/storage_file.h | 197 + .../storage_file_backend.c} | 4 +- .../storage_file_backend.h} | 6 +- .../storage_file_fs.c | 23 +- .../storage_file_fs.h | 0 .../storage_file_gluster.c | 34 +- .../storage_file_gluster.h | 0 src/util/meson.build | 2 - src/util/virarptable.c | 1 + src/util/vircgroupv1.c | 1 + src/util/vircgroupv2devices.c | 1 + src/util/virfile.c | 101 +- src/util/virfile.h | 12 +- src/util/virpidfile.c | 1 + src/util/virqemu.c | 69 - src/util/virqemu.h | 6 - src/util/virresctrl.c | 1 + src/util/virstoragefile.c | 5222 +---------------- src/util/virstoragefile.h | 572 +- src/util/virsysinfo.c | 1 + src/util/virtpm.c | 1 + tests/meson.build | 4 +- tests/qemublocktest.c | 7 +- tests/virstoragetest.c | 9 +- tools/virsh-console.c | 1 + tools/virsh-util.c | 1 + 69 files changed, 6441 insertions(+), 6129 deletions(-) rename src/{util/virstorageencryption.c => conf/storage_encryption.c} (90%) rename src/{util/virstorageencryption.h => conf/storage_encryption.h} (96%) create mode 100644 src/conf/storage_source.c create mode 100644 src/conf/storage_source.h create mode 100644 src/storage_file/meson.build create mode 100644 src/storage_file/storage_file.c create mode 100644 src/storage_file/storage_file.h rename src/{util/virstoragefilebackend.c => storage_file/storage_file_backend.c} (97%) rename src/{util/virstoragefilebackend.h => storage_file/storage_file_backend.h} (93%) rename src/{storage => storage_file}/storage_file_fs.c (90%) rename src/{storage => storage_file}/storage_file_fs.h (100%) rename src/{storage => storage_file}/storage_file_gluster.c (89%) rename src/{storage => storage_file}/storage_file_gluster.h (100%) -- 2.28.0