External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-27 08:05:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Fix domain disk path iterator to work with networked storage

Browse Source 
Skip networked storage but continue iteration through backing chain to
iterate through all the local paths in the backing chain.
This commit is contained in:
Peter Krempa 2014-04-26 11:38:29 +02:00
parent 0620bd42ad
commit b52e1ad961
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/conf/domain_conf.c
View File

@ -18686,34 +18686,37 @@ virDomainDiskDefForeachPath(virDomainDiskDefPtr disk,
int ret = -1; int ret = -1;
size_t depth = 0; size_t depth = 0;
virStorageSourcePtr tmp; virStorageSourcePtr tmp;
const char *path = virDomainDiskGetSource(disk); char *brokenRaw = NULL;
int type = virDomainDiskGetType(disk);
if (!path || type == VIR_STORAGE_TYPE_NETWORK || if (!ignoreOpenFailure) {
(type == VIR_STORAGE_TYPE_VOLUME && if (virStorageFileChainGetBroken(&disk->src, &brokenRaw) < 0)
disk->src.srcpool && goto cleanup;
disk->src.srcpool->mode == VIR_STORAGE_SOURCE_POOL_MODE_DIRECT))
return 0;
if (iter(disk, path, 0, opaque) < 0) if (brokenRaw) {
goto cleanup;
tmp = disk->src.backingStore;
while (tmp && virStorageIsFile(tmp->path)) {
if (!ignoreOpenFailure && tmp->backingStoreRaw && !tmp->backingStore) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unable to visit backing chain file %s"), _("unable to visit backing chain file %s"),
tmp->backingStoreRaw); brokenRaw);
goto cleanup; goto cleanup;
} }
if (iter(disk, tmp->path, ++depth, opaque) < 0) }
goto cleanup;
tmp = tmp->backingStore; for (tmp = &disk->src; tmp; tmp = tmp->backingStore) {
int actualType = virStorageSourceGetActualType(tmp);
/* execute the callback only for local storage */
if (actualType != VIR_STORAGE_TYPE_NETWORK &&
actualType != VIR_STORAGE_TYPE_VOLUME &&
tmp->path) {
if (iter(disk, tmp->path, depth, opaque) < 0)
goto cleanup;
}
depth++;
} }
ret = 0; ret = 0;
cleanup: cleanup:
VIR_FREE(brokenRaw);
return ret; return ret;
} }