提交 5a1cf6bd 编写于 作者: P Peter Krempa

storage: Return backing format from virStorageFileGetMetadataFromFD

Add argument to return backing file format of a file probed by
virStorageFileGetMetadataFromFD so that it can be used in place of
virStorageFileGetMetadataFromBuf.
上级 e6bcbcd3
...@@ -10364,7 +10364,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom, ...@@ -10364,7 +10364,7 @@ qemuDomainGetBlockInfo(virDomainPtr dom,
} }
} }
if (!(meta = virStorageFileGetMetadataFromFD(path, fd, format))) if (!(meta = virStorageFileGetMetadataFromFD(path, fd, format, NULL)))
goto cleanup; goto cleanup;
/* Get info for normal formats */ /* Get info for normal formats */
......
...@@ -1091,14 +1091,16 @@ virStorageFileGetMetadataFromFDInternal(virStorageSourcePtr meta, ...@@ -1091,14 +1091,16 @@ virStorageFileGetMetadataFromFDInternal(virStorageSourcePtr meta,
virStorageSourcePtr virStorageSourcePtr
virStorageFileGetMetadataFromFD(const char *path, virStorageFileGetMetadataFromFD(const char *path,
int fd, int fd,
int format) int format,
int *backingFormat)
{ {
virStorageSourcePtr ret = NULL; virStorageSourcePtr ret = NULL;
if (!(ret = virStorageFileMetadataNew(path, format))) if (!(ret = virStorageFileMetadataNew(path, format)))
goto cleanup; goto cleanup;
if (virStorageFileGetMetadataFromFDInternal(ret, fd, NULL) < 0) { if (virStorageFileGetMetadataFromFDInternal(ret, fd, backingFormat) < 0) {
virStorageSourceFree(ret); virStorageSourceFree(ret);
ret = NULL; ret = NULL;
} }
......
...@@ -271,7 +271,8 @@ int virStorageFileGetMetadata(virStorageSourcePtr src, ...@@ -271,7 +271,8 @@ int virStorageFileGetMetadata(virStorageSourcePtr src,
ATTRIBUTE_NONNULL(1); ATTRIBUTE_NONNULL(1);
virStorageSourcePtr virStorageFileGetMetadataFromFD(const char *path, virStorageSourcePtr virStorageFileGetMetadataFromFD(const char *path,
int fd, int fd,
int format); int format,
int *backingFormat);
virStorageSourcePtr virStorageFileGetMetadataFromBuf(const char *path, virStorageSourcePtr virStorageFileGetMetadataFromBuf(const char *path,
char *buf, char *buf,
size_t len, size_t len,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册