NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

util: storage: Remove now redundant backingRelative from virStorageSource

Browse Source 
Now that we store only relative names in virStorageSource's member
relPath the backingRelative member is obsolete. Remove it and adapt the
code to the removal.
This commit is contained in:
Peter Krempa
2014-05-27 10:40:59 +02:00
parent feb26b85f3
commit 84b1f5d875
3 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/util/virstoragefile.c
View File

@@ -1621,8 +1621,6 @@ virStorageSourceNewFromBackingRelative(virStorageSourcePtr parent,
if (VIR_ALLOC(ret) < 0)
return NULL;
ret->backingRelative = true;
/* store relative name */
if (VIR_STRDUP(ret->relPath, parent->backingStoreRaw) < 0)
goto error;
@@ -2223,7 +2221,7 @@ virStorageFileGetRelativeBackingPath(virStorageSourcePtr top,
*relpath = NULL;
for (next = top; next; next = next->backingStore) {
if (!next->backingRelative || !next->relPath) {
if (!next->relPath) {
ret = 1;
goto cleanup;
}

2
src/util/virstoragefile.h
View File

@@ -256,8 +256,6 @@ struct _virStorageSource {
/* Name of the child backing store recorded in metadata of the
* current file. */
char *backingStoreRaw;
/* is backing store identified as relative */
bool backingRelative;
};

8
tests/virstoragetest.c
View File

@@ -591,13 +591,11 @@ testPathRelativePrepare(void)
else
backingchain[i].backingStore = NULL;
backingchain[i].backingRelative = true;
backingchain[i].relPath = NULL;
}
/* normal relative backing chain */
backingchain[0].path = (char *) "/path/to/some/img";
backingchain[0].relPath = (char *) "/path/to/some/img";
backingchain[0].backingRelative = false;
backingchain[1].path = (char *) "/path/to/some/asdf";
backingchain[1].relPath = (char *) "asdf";
@@ -610,8 +608,6 @@ testPathRelativePrepare(void)
/* ovirt's backing chain */
backingchain[4].path = (char *) "/path/to/volume/image1";
backingchain[4].relPath = (char *) "/path/to/volume/image1";
backingchain[4].backingRelative = false;
backingchain[5].path = (char *) "/path/to/volume/image2";
backingchain[5].relPath = (char *) "../volume/image2";
@@ -624,8 +620,6 @@ testPathRelativePrepare(void)
/* some arbitrarily crazy backing chains */
backingchain[8].path = (char *) "/crazy/base/image";
backingchain[8].relPath = (char *) "/crazy/base/image";
backingchain[8].backingRelative = false;
backingchain[9].path = (char *) "/crazy/base/directory/stuff/volumes/garbage/image2";
backingchain[9].relPath = (char *) "directory/stuff/volumes/garbage/image2";