提交 24643c78 编写于 作者: D Daniel P. Berrange

Add lots of debugging to storage file probing code

Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
上级 dfba3704
...@@ -628,6 +628,9 @@ virStorageFileMatchesVersion(int format, ...@@ -628,6 +628,9 @@ virStorageFileMatchesVersion(int format,
(buf[fileTypeInfo[format].versionOffset+2] << 8) | (buf[fileTypeInfo[format].versionOffset+2] << 8) |
(buf[fileTypeInfo[format].versionOffset+3]); (buf[fileTypeInfo[format].versionOffset+3]);
} }
VIR_DEBUG("Compare detected version %d vs expected version %d",
version, fileTypeInfo[format].versionNumber);
if (version != fileTypeInfo[format].versionNumber) if (version != fileTypeInfo[format].versionNumber)
return false; return false;
...@@ -650,6 +653,8 @@ virStorageFileGetMetadataFromBuf(int format, ...@@ -650,6 +653,8 @@ virStorageFileGetMetadataFromBuf(int format,
size_t buflen, size_t buflen,
virStorageFileMetadata *meta) virStorageFileMetadata *meta)
{ {
VIR_DEBUG("path=%s format=%d", path, format);
/* XXX we should consider moving virStorageBackendUpdateVolInfo /* XXX we should consider moving virStorageBackendUpdateVolInfo
* code into this method, for non-magic files * code into this method, for non-magic files
*/ */
...@@ -785,6 +790,7 @@ virStorageFileProbeFormatFromBuf(const char *path, ...@@ -785,6 +790,7 @@ virStorageFileProbeFormatFromBuf(const char *path,
} }
cleanup: cleanup:
VIR_DEBUG("format=%d", format);
return format; return format;
} }
...@@ -963,6 +969,9 @@ virStorageFileGetMetadataRecurse(const char *path, int format, ...@@ -963,6 +969,9 @@ virStorageFileGetMetadataRecurse(const char *path, int format,
bool allow_probe, virHashTablePtr cycle) bool allow_probe, virHashTablePtr cycle)
{ {
int fd; int fd;
VIR_DEBUG("path=%s format=%d uid=%d gid=%d probe=%d",
path, format, (int)uid, (int)gid, allow_probe);
virStorageFileMetadataPtr ret = NULL; virStorageFileMetadataPtr ret = NULL;
if (virHashLookup(cycle, path)) { if (virHashLookup(cycle, path)) {
...@@ -1027,6 +1036,9 @@ virStorageFileGetMetadata(const char *path, int format, ...@@ -1027,6 +1036,9 @@ virStorageFileGetMetadata(const char *path, int format,
uid_t uid, gid_t gid, uid_t uid, gid_t gid,
bool allow_probe) bool allow_probe)
{ {
VIR_DEBUG("path=%s format=%d uid=%d gid=%d probe=%d",
path, format, (int)uid, (int)gid, allow_probe);
virHashTablePtr cycle = virHashCreate(5, NULL); virHashTablePtr cycle = virHashCreate(5, NULL);
virStorageFileMetadataPtr ret; virStorageFileMetadataPtr ret;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册