[Libguestfs] [PATCH] v2v: ova: Don't rely on qemu-img version, test "offset" and "size" features.

[Eric Blake]

On 02/06/2017 09:40 AM, Richard W.M. Jones wrote:
> See:
> 
> https://www.redhat.com/archives/libguestfs/2017-February/msg00064.html
> ---
>  v2v/input_ova.ml |  5 ++---
>  v2v/utils.ml     | 51 +++++++++++++++++++++++++++++++--------------------
>  v2v/utils.mli    |  7 +++----
>  3 files changed, 36 insertions(+), 27 deletions(-)
> 
> diff --git a/v2v/input_ova.ml b/v2v/input_ova.ml
> index 3c11cd0..3beaffc 100644
> --- a/v2v/input_ova.ml
> +++ b/v2v/input_ova.ml
> @@ -90,9 +90,8 @@ object
>          match detect_file_type ova with
>          | `Tar ->
>            (* Normal ovas are tar file (not compressed). *)
> -          let qmajor, qminor = qemu_img_version () in
> -          if qmajor > 2 || (qmajor == 2 && qminor >= 8) then (
> -            (* If QEMU is 2.8 or newer we don't have to extract everything.
> +          if qemu_img_supports_offset_and_size () then (
> +            (* In newe QEMU we don't have to extract everything.

s/newe/newer/

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 604 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libguestfs/attachments/20170206/f0bea2be/attachment.sig>