[libvirt] [PATCH 1/4] Allow probing of image formats without version information

[Eric Blake]

On 11/19/2010 09:18 AM, Adam Litke wrote:
> 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 at us.ibm.com>
> ---
>  src/util/storage_file.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/src/util/storage_file.c b/src/util/storage_file.c
> index 4098383..f8ab168 100644
> --- a/src/util/storage_file.c
> +++ b/src/util/storage_file.c
> @@ -478,7 +478,7 @@ virStorageFileMatchesVersion(int format,
>  
>      /* Validate version number info */
>      if (fileTypeInfo[format].versionOffset == -1)
> -        return false;
> +        return true;

ACK.

-- 
Eric Blake   eblake at redhat.com    +1-801-349-2682
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 619 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20101119/6fe3ba95/attachment-0001.sig>