mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-22 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
The output method used the s_disk_id field assuming it was a unique,
monotonically increasing number counting from 0.  However this is not
the case, the input method simply has to set s_disk_id to be unique
for each disk.

Fixes commit cc04573927.

Thanks: Xiaodai Wang
(cherry picked from commit 90c9c12258)
This commit is contained in:
Richard W.M. Jones
2018-08-14 12:50:07 +01:00
committed by Pino Toscano
parent bb804081e9
commit 6f116349a2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
v2v/output_rhv_upload.ml
View File

@@ -383,13 +383,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;
let diskid = read_whole_file diskid_file in
diskid
) targets in