summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2012-12-13 14:23:50 +0000
committerDaniel P. Berrange <berrange@redhat.com>2012-12-13 15:01:25 +0000
commit24643c780bafdc0997cd3de06e75516fd73e7d87 (patch)
tree0b63b441c19a014789ab611488887535d982abd4
parentdfba37048a6cb684ee6938131d7f557ddf16d53d (diff)
downloadlibvirt-24643c780bafdc0997cd3de06e75516fd73e7d87.tar.gz
Add lots of debugging to storage file probing code
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
-rw-r--r--src/util/storage_file.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/util/storage_file.c b/src/util/storage_file.c
index 4281d90d05..deb79e9b6a 100644
--- a/src/util/storage_file.c
+++ b/src/util/storage_file.c
@@ -628,6 +628,9 @@ virStorageFileMatchesVersion(int format,
(buf[fileTypeInfo[format].versionOffset+2] << 8) |
(buf[fileTypeInfo[format].versionOffset+3]);
}
+
+ VIR_DEBUG("Compare detected version %d vs expected version %d",
+ version, fileTypeInfo[format].versionNumber);
if (version != fileTypeInfo[format].versionNumber)
return false;
@@ -650,6 +653,8 @@ virStorageFileGetMetadataFromBuf(int format,
size_t buflen,
virStorageFileMetadata *meta)
{
+ VIR_DEBUG("path=%s format=%d", path, format);
+
/* XXX we should consider moving virStorageBackendUpdateVolInfo
* code into this method, for non-magic files
*/
@@ -785,6 +790,7 @@ virStorageFileProbeFormatFromBuf(const char *path,
}
cleanup:
+ VIR_DEBUG("format=%d", format);
return format;
}
@@ -963,6 +969,9 @@ virStorageFileGetMetadataRecurse(const char *path, int format,
bool allow_probe, virHashTablePtr cycle)
{
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;
if (virHashLookup(cycle, path)) {
@@ -1027,6 +1036,9 @@ virStorageFileGetMetadata(const char *path, int format,
uid_t uid, gid_t gid,
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);
virStorageFileMetadataPtr ret;