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

util: storage: use stored index to lookup disks

Browse Source 
We can now use the backing store ID directly rather than counting the
number of images seen while looking up images.
This commit is contained in:
Peter Krempa 2017-10-06 14:23:05 +02:00
parent c6231a6a6c
commit 9cc8d6ee9e
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/util/virstoragefile.c
View File

@ -1588,25 +1588,14 @@ virStorageFileChainLookup(virStorageSourcePtr chain,
const char *start = chain->path;
char *parentDir = NULL;
bool nameIsFile = virStorageIsFile(name);
size_t i = 0;
if (!parent)
parent = &prev;
*parent = NULL;
if (startFrom) {
while (chain && chain != startFrom->backingStore) {
while (chain && chain != startFrom->backingStore)
chain = chain->backingStore;
i++;
}
if (idx && idx < i) {
virReportError(VIR_ERR_INVALID_ARG,
_("requested backing store index %u is above '%s' "
"in chain for '%s'"),
idx, NULLSTR(startFrom->path), NULLSTR(start));
return NULL;
}
*parent = startFrom;
}
@ -1616,8 +1605,8 @@ virStorageFileChainLookup(virStorageSourcePtr chain,
if (!chain->backingStore)
break;
} else if (idx) {
VIR_DEBUG("%zu: %s", i, chain->path);
if (idx == i)
VIR_DEBUG("%u: %s", chain->id, chain->path);
if (idx == chain->id)
break;
} else {
if (STREQ_NULLABLE(name, chain->relPath) ||
@ -1649,7 +1638,6 @@ virStorageFileChainLookup(virStorageSourcePtr chain,
}
*parent = chain;
chain = chain->backingStore;
i++;
}
if (!chain)