External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: storagefile: Don't traverse storage sources unusable by VM

Browse Source 
virStorageFileGetMetadataRecurse would include files in the backing
chain which would not really be usable by libvirt directly e.g.
when such file would be promoted to the top layer by an active block
commit as for example inline authentication data can't be represented in
the VM xml file. The idea is to use secrets for this.

With the changes to the backing store string parsers we can report and
propagate if such a thing is present in the configuration and thus start
skipping those files in the backing chain traversal code. This approach
still allows to report the appropriate backing store string in the
storage driver which doesn't directly use the backing file.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-08-16 11:34:27 +02:00
parent 46135dd40f
commit b1c778d854
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/virstoragefile.c
View File

@ -4935,9 +4935,15 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
goto cleanup;
if (src->backingStoreRaw) {
if (virStorageSourceNewFromBacking(src, &backingStore) < 0)
if ((rv = virStorageSourceNewFromBacking(src, &backingStore)) < 0)
goto cleanup;
if (rv == 1) {
/* the backing file would not be usable for VM usage */
ret = 0;
goto cleanup;
}
if (backingFormat == VIR_STORAGE_FILE_AUTO)
backingStore->format = VIR_STORAGE_FILE_RAW;
else if (backingFormat == VIR_STORAGE_FILE_AUTO_SAFE)