On 04/20/2014 04:13 PM, Peter Krempa wrote:
To allow future change of virStorageFileMetadata to virStorageSource
we
need to store a full path in the "path" variable as rest of the code
expects it to be a full path. Rename the "path" field to "relPath"
to
keep tracking the info but allowing a real "path" field.
---
src/util/virstoragefile.c | 22 +++++++++++-----------
src/util/virstoragefile.h | 2 +-
tests/virstoragetest.c | 6 +++---
3 files changed, 15 insertions(+), 15 deletions(-)
@@ -945,7 +945,7 @@ virStorageFileMetadataNew(const char *path,
ret->format = format;
ret->type = VIR_STORAGE_TYPE_FILE;
- if (VIR_STRDUP(ret->path, path) < 0)
+ if (VIR_STRDUP(ret->relPath, path) < 0)
Obvious merge conflict resolution here with my proposed fixup to 6/18.
Mechanical; ACK.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library
http://libvirt.org