External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: storage: Rename "path" to "relPath" in virStorageFileMetadata

Browse Source 
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.
This commit is contained in:
Peter Krempa 2014-04-17 13:36:59 +02:00
parent 66d92473fa
commit f34b829692
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/util/virstoragefile.c
View File

@ -802,11 +802,11 @@ virStorageFileGetMetadataInternal(virStorageFileMetadataPtr meta,
{ {
int ret = -1; int ret = -1;
VIR_DEBUG("path=%s, buf=%p, len=%zu, meta->format=%d", VIR_DEBUG("relPath=%s, buf=%p, len=%zu, meta->format=%d",
meta->path, buf, len, meta->format); meta->relPath, buf, len, meta->format);
if (meta->format == VIR_STORAGE_FILE_AUTO) if (meta->format == VIR_STORAGE_FILE_AUTO)
meta->format = virStorageFileProbeFormatFromBuf(meta->path, buf, len); meta->format = virStorageFileProbeFormatFromBuf(meta->relPath, buf, len);
if (meta->format <= VIR_STORAGE_FILE_NONE || if (meta->format <= VIR_STORAGE_FILE_NONE ||
meta->format >= VIR_STORAGE_FILE_LAST) { meta->format >= VIR_STORAGE_FILE_LAST) {
@ -945,7 +945,7 @@ virStorageFileMetadataNew(const char *path,
ret->format = format; ret->format = format;
ret->type = VIR_STORAGE_TYPE_FILE; ret->type = VIR_STORAGE_TYPE_FILE;
if (VIR_STRDUP(ret->path, path) < 0) if (VIR_STRDUP(ret->relPath, path) < 0)
goto error; goto error;
if (virStorageIsFile(path)) { if (virStorageIsFile(path)) {
@ -1038,7 +1038,7 @@ virStorageFileGetMetadataFromFDInternal(virStorageFileMetadataPtr meta,
if (fstat(fd, &sb) < 0) { if (fstat(fd, &sb) < 0) {
virReportSystemError(errno, virReportSystemError(errno,
_("cannot stat file '%s'"), _("cannot stat file '%s'"),
meta->path); meta->relPath);
return -1; return -1;
} }
@ -1055,12 +1055,12 @@ virStorageFileGetMetadataFromFDInternal(virStorageFileMetadataPtr meta,
} }
if (lseek(fd, 0, SEEK_SET) == (off_t)-1) { if (lseek(fd, 0, SEEK_SET) == (off_t)-1) {
virReportSystemError(errno, _("cannot seek to start of '%s'"), meta->path); virReportSystemError(errno, _("cannot seek to start of '%s'"), meta->relPath);
goto cleanup; goto cleanup;
} }
if ((len = virFileReadHeaderFD(fd, len, &buf)) < 0) { if ((len = virFileReadHeaderFD(fd, len, &buf)) < 0) {
virReportSystemError(errno, _("cannot read header '%s'"), meta->path); virReportSystemError(errno, _("cannot read header '%s'"), meta->relPath);
goto cleanup; goto cleanup;
} }
@ -1138,7 +1138,7 @@ virStorageFileGetMetadataRecurse(const char *path, const char *canonPath,
return -1; return -1;
if (virStorageIsFile(path)) { if (virStorageIsFile(path)) {
if (VIR_STRDUP(meta->path, path) < 0) if (VIR_STRDUP(meta->relPath, path) < 0)
return -1; return -1;
if (VIR_STRDUP(meta->canonPath, canonPath) < 0) if (VIR_STRDUP(meta->canonPath, canonPath) < 0)
return -1; return -1;
@ -1159,7 +1159,7 @@ virStorageFileGetMetadataRecurse(const char *path, const char *canonPath,
/* FIXME: when the proper storage drivers are compiled in, it /* FIXME: when the proper storage drivers are compiled in, it
* would be nice to read metadata from the network storage to * would be nice to read metadata from the network storage to
* allow for non-raw images. */ * allow for non-raw images. */
if (VIR_STRDUP(meta->path, path) < 0) if (VIR_STRDUP(meta->relPath, path) < 0)
return -1; return -1;
if (VIR_STRDUP(meta->canonPath, path) < 0) if (VIR_STRDUP(meta->canonPath, path) < 0)
return -1; return -1;
@ -1321,7 +1321,7 @@ virStorageFileFreeMetadata(virStorageFileMetadata *meta)
if (!meta) if (!meta)
return; return;
VIR_FREE(meta->path); VIR_FREE(meta->relPath);
VIR_FREE(meta->canonPath); VIR_FREE(meta->canonPath);
VIR_FREE(meta->relDir); VIR_FREE(meta->relDir);
@ -1553,7 +1553,7 @@ virStorageFileChainLookup(virStorageFileMetadataPtr chain,
if (!chain->backingMeta) if (!chain->backingMeta)
break; break;
} else { } else {
if (STREQ(name, chain->path)) if (STREQ(name, chain->relPath))
break; break;
if (nameIsFile && (chain->type == VIR_STORAGE_TYPE_FILE || if (nameIsFile && (chain->type == VIR_STORAGE_TYPE_FILE ||
chain->type == VIR_STORAGE_TYPE_BLOCK)) { chain->type == VIR_STORAGE_TYPE_BLOCK)) {

2
src/util/virstoragefile.h
View File

@ -121,7 +121,7 @@ typedef virStorageFileMetadata *virStorageFileMetadataPtr;
struct _virStorageFileMetadata { struct _virStorageFileMetadata {
/* Name of the current file as spelled by the user (top level) or /* Name of the current file as spelled by the user (top level) or
* metadata of the overlay (if this is a backing store). */ * metadata of the overlay (if this is a backing store). */
char *path; char *relPath;
/* Canonical name of the current file, used to detect loops in the /* Canonical name of the current file, used to detect loops in the
* backing store chain. */ * backing store chain. */
char *canonPath; char *canonPath;

6
tests/virstoragetest.c
View File

@ -323,7 +323,7 @@ testStorageChain(const void *args)
: data->files[i]->relDirRel; : data->files[i]->relDirRel;
if (virAsprintf(&expect, if (virAsprintf(&expect,
"store:%s\nraw:%s\nother:%lld %d\n" "store:%s\nraw:%s\nother:%lld %d\n"
"path:%s\ncanon:%s\nrelDir:%s\ntype:%d %d\n", "relPath:%s\ncanon:%s\nrelDir:%s\ntype:%d %d\n",
NULLSTR(data->files[i]->expBackingStore), NULLSTR(data->files[i]->expBackingStore),
NULLSTR(data->files[i]->expBackingStoreRaw), NULLSTR(data->files[i]->expBackingStoreRaw),
data->files[i]->expCapacity, data->files[i]->expCapacity,
@ -335,11 +335,11 @@ testStorageChain(const void *args)
data->files[i]->format) < 0 || data->files[i]->format) < 0 ||
virAsprintf(&actual, virAsprintf(&actual,
"store:%s\nraw:%s\nother:%lld %d\n" "store:%s\nraw:%s\nother:%lld %d\n"
"path:%s\ncanon:%s\nrelDir:%s\ntype:%d %d\n", "relPath:%s\ncanon:%s\nrelDir:%s\ntype:%d %d\n",
NULLSTR(elt->backingStore), NULLSTR(elt->backingStore),
NULLSTR(elt->backingStoreRaw), NULLSTR(elt->backingStoreRaw),
elt->capacity, !!elt->encryption, elt->capacity, !!elt->encryption,
NULLSTR(elt->path), NULLSTR(elt->relPath),
NULLSTR(elt->canonPath), NULLSTR(elt->canonPath),
NULLSTR(elt->relDir), NULLSTR(elt->relDir),
elt->type, elt->format) < 0) { elt->type, elt->format) < 0) {