openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

storage: fs: Drop-in replace use of virStorageFileGetMetadataFromBuf 

Use virStorageFileGetMetadataFromFD instead in
virStorageBackendProbeTarget as it now returns all required data and the
storage file is already open in a filedescriptor.

Also fix improper error code being returned when virFileReadHeaderFD
would fail as virStorageBackendUpdateVolTargetInfoFD would set the
return code to 0.
This commit is contained in:
Peter Krempa 2014-05-28 14:48:36 +02:00
parent 5a1cf6bd16
commit 34d86185ec
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/storage/storage_backend_fs.c
View File

@ -71,8 +71,6 @@ virStorageBackendProbeTarget(virStorageSourcePtr target,
int ret = -1;
virStorageSourcePtr meta = NULL;
struct stat sb;
char *header = NULL;
ssize_t len = VIR_STORAGE_MAX_HEADER;
*backingStore = NULL;
*backingStoreFormat = VIR_STORAGE_FILE_AUTO;
@ -89,22 +87,19 @@ virStorageBackendProbeTarget(virStorageSourcePtr target,
goto error;
}
ret = -1;
if (S_ISDIR(sb.st_mode)) {
target->format = VIR_STORAGE_FILE_DIR;
} else {
if ((len = virFileReadHeaderFD(fd, len, &header)) < 0) {
virReportSystemError(errno, _("cannot read header '%s'"),
target->path);
if (!(meta = virStorageFileGetMetadataFromFD(target->path,
fd,
VIR_STORAGE_FILE_AUTO,
backingStoreFormat)))
goto error;
}
if (!(meta = virStorageFileGetMetadataFromBuf(target->path,
header, len,
backingStore,
backingStoreFormat))) {
ret = -1;
if (VIR_STRDUP(*backingStore, meta->backingStoreRaw) < 0)
goto error;
}
}
VIR_FORCE_CLOSE(fd);
@ -170,7 +165,6 @@ virStorageBackendProbeTarget(virStorageSourcePtr target,
cleanup:
virStorageSourceFree(meta);
VIR_FREE(header);
return ret;
}