[Libguestfs] [PATCH] v2v: -o rhv-upload: Fix error message disk numbering (RHBZ#1615885).

[Pino Toscano]

On Tuesday, 14 August 2018 15:40:54 CEST Richard W.M. Jones wrote:
> Thanks: Xiaodai Wang
> ---
>  v2v/output_rhv_upload.ml | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml
> index 6260eaac5..df91a117f 100644
> --- a/v2v/output_rhv_upload.ml
> +++ b/v2v/output_rhv_upload.ml
> @@ -361,13 +361,13 @@ If the messages above are not sufficient to diagnose the problem then add the 
>       *)
>      let nr_disks = List.length targets in
>      let image_uuids =
> -      List.map (
> -        fun t ->
> +      List.mapi (
> +        fun i t ->
>            let id = t.target_overlay.ov_source.s_disk_id in
>            let diskid_file = diskid_file_of_id id in
>            if not (wait_for_file diskid_file finalization_timeout) then
>              error (f_"transfer of disk %d/%d failed, see earlier error messages")
> -                  (id+1) nr_disks;
> +                  (i+1) nr_disks;

This works only when the input is based on libvirt, and produce e.g.
"transfer of disk 0/1 failed" when using -i disk, -i ova, and -i vmx.

IMHO the issue is in the libvirt XML parser, which starts to number the
disks from 1.  I'm sending a patch for this.

-- 
Pino Toscano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part.
URL: <http://listman.redhat.com/archives/libguestfs/attachments/20180814/13699079/attachment.sig>