From: Adam Litke <agl@us.ibm.com>
Date: Fri, 19 Nov 2010 16:18:15 +0000 (-0600)
Subject: Allow probing of image formats without version information
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5a2a474ee8e7f3c3fc62abaa41943da13dfc2f76;p=libvirt.git

Allow probing of image formats without version information

Disk image formats that wish to opt-out of version validation are supposed to
set versionOffset to -1 in their fileTypeInfo entry.

By unconditionally returning False for these formats,
virStorageFileMatchesVersion() incorrectly reports a version mismatch when the
test was actually skipped.  The correct behavior is to return True so these
formats can be successfully probed using the magic bytes alone.

Signed-off-by: Adam Litke <agl@us.ibm.com>
---

diff --git a/src/util/storage_file.c b/src/util/storage_file.c
index f1a445a56d..b17187695b 100644
--- a/src/util/storage_file.c
+++ b/src/util/storage_file.c
@@ -479,7 +479,7 @@ virStorageFileMatchesVersion(int format,
 
     /* Validate version number info */
     if (fileTypeInfo[format].versionOffset == -1)
-        return false;
+        return true;
 
     if ((fileTypeInfo[format].versionOffset + 4) > buflen)
         return false;