search for: s_disk_id

...line input = if source.s_disks = [] then error (f_"source has no hard disks!"); - List.iter ( - fun disk -> - assert (disk.s_qemu_uri <> ""); - ) source.s_disks; + let () = + let ids = ref IntSet.empty in + List.iter ( + fun { s_qemu_uri; s_disk_id } -> + assert (s_qemu_uri <> ""); + (* Check s_disk_id are all unique. *) + assert (not (IntSet.mem s_disk_id !ids)); + ids := IntSet.add s_disk_id !ids + ) source.s_disks in source -- 2.18.0

On Tuesday, 14 August 2018 16:53:02 CEST Richard W.M. Jones wrote: > On Tue, Aug 14, 2018 at 04:04:10PM +0200, Pino Toscano wrote: > > When parsing the libvirt XML, make sure to assign the IDs for disks > > (s_disk_id) from 0 instead of 1, just like all the other input modes not > > based on libvirt XML. > > --- > > v2v/parse_libvirt_xml.ml | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml >...

When parsing the libvirt XML, make sure to assign the IDs for disks (s_disk_id) from 0 instead of 1, just like all the other input modes not based on libvirt XML. --- v2v/parse_libvirt_xml.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml index 78a6e71c0..dac99511c 100644 --- a/v2v/parse_libvirt_xml.ml...

...5:32:08PM +0200, Pino Toscano wrote: > > On Tuesday, 14 August 2018 16:53:02 CEST Richard W.M. Jones wrote: > > > On Tue, Aug 14, 2018 at 04:04:10PM +0200, Pino Toscano wrote: > > > > When parsing the libvirt XML, make sure to assign the IDs for disks > > > > (s_disk_id) from 0 instead of 1, just like all the other input modes not > > > > based on libvirt XML. > > > > --- > > > > v2v/parse_libvirt_xml.ml | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > diff --git...

On Tue, Aug 14, 2018 at 04:04:10PM +0200, Pino Toscano wrote: > When parsing the libvirt XML, make sure to assign the IDs for disks > (s_disk_id) from 0 instead of 1, just like all the other input modes not > based on libvirt XML. > --- > v2v/parse_libvirt_xml.ml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml > index 78a6e71c0..dac99511c 100...

...e, Aug 14, 2018 at 05:32:08PM +0200, Pino Toscano wrote: > On Tuesday, 14 August 2018 16:53:02 CEST Richard W.M. Jones wrote: > > On Tue, Aug 14, 2018 at 04:04:10PM +0200, Pino Toscano wrote: > > > When parsing the libvirt XML, make sure to assign the IDs for disks > > > (s_disk_id) from 0 instead of 1, just like all the other input modes not > > > based on libvirt XML. > > > --- > > > v2v/parse_libvirt_xml.ml | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/v2v/parse_libvirt_xml.ml b/...

...ions(+), 5 deletions(-) >> >> diff --git a/v2v/create_libvirt_xml.ml b/v2v/create_libvirt_xml.ml >> index 55e83e8bc1b9..180f3768792b 100644 >> --- a/v2v/create_libvirt_xml.ml >> +++ b/v2v/create_libvirt_xml.ml >> @@ -34,8 +34,102 @@ let find_target_disk targets { s_disk_id = id } = >> try List.find (fun t -> t.target_overlay.ov_source.s_disk_id = id) targets >> with Not_found -> assert false >> >> +let get_osinfo_id = function >> + | { i_type = "linux"; i_distro = "rhel"; >> + i_major_version =...

...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;...

...local.ml | 4 +- 4 files changed, 113 insertions(+), 5 deletions(-) diff --git a/v2v/create_libvirt_xml.ml b/v2v/create_libvirt_xml.ml index 55e83e8bc1b9..180f3768792b 100644 --- a/v2v/create_libvirt_xml.ml +++ b/v2v/create_libvirt_xml.ml @@ -34,8 +34,102 @@ let find_target_disk targets { s_disk_id = id } = try List.find (fun t -> t.target_overlay.ov_source.s_disk_id = id) targets with Not_found -> assert false +let get_osinfo_id = function + | { i_type = "linux"; i_distro = "rhel"; + i_major_version = major; i_minor_version = minor } -> + Some (s...

When parsing the libvirt XML, make sure to assign the IDs for disks (s_disk_id) from 0 instead of 1. This does not change the actual behaviour, just makes the IDs like in all the other input modes not based on libvirt XML. --- v2v/parse_libvirt_xml.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2v/parse_libvirt_xml.ml b/v2v/parse_libvirt_xml.ml inde...

...the UUID of the disk image. This file is written + * out by the nbdkit plugin on successful finalization of the * transfer. *) - let nr_disks = List.length targets in - let image_uuids = - 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") - (i+1) nr_disks; - let diskid = read_whole_file dis...

...gt; >> > >>diff --git a/v2v/create_libvirt_xml.ml b/v2v/create_libvirt_xml.ml > >>index 55e83e8bc1b9..180f3768792b 100644 > >>--- a/v2v/create_libvirt_xml.ml > >>+++ b/v2v/create_libvirt_xml.ml > >>@@ -34,8 +34,102 @@ let find_target_disk targets { s_disk_id = id } = > >> try List.find (fun t -> t.target_overlay.ov_source.s_disk_id = id) targets > >> with Not_found -> assert false > >> > >>+let get_osinfo_id = function > >>+ | { i_type = "linux"; i_distro = "rhel"; > >&gt...

...les changed, 113 insertions(+), 5 deletions(-) > > diff --git a/v2v/create_libvirt_xml.ml b/v2v/create_libvirt_xml.ml > index 55e83e8bc1b9..180f3768792b 100644 > --- a/v2v/create_libvirt_xml.ml > +++ b/v2v/create_libvirt_xml.ml > @@ -34,8 +34,102 @@ let find_target_disk targets { s_disk_id = id } = > try List.find (fun t -> t.target_overlay.ov_source.s_disk_id = id) targets > with Not_found -> assert false > > +let get_osinfo_id = function > + | { i_type = "linux"; i_distro = "rhel"; > + i_major_version = major; i_minor_versio...

...v-i-ova.xml | 5 ++ 5 files changed, 128 insertions(+), 5 deletions(-) diff --git a/v2v/create_libvirt_xml.ml b/v2v/create_libvirt_xml.ml index 55e83e8bc1b9..6b2fb874a5a6 100644 --- a/v2v/create_libvirt_xml.ml +++ b/v2v/create_libvirt_xml.ml @@ -34,8 +34,112 @@ let find_target_disk targets { s_disk_id = id } = try List.find (fun t -> t.target_overlay.ov_source.s_disk_id = id) targets with Not_found -> assert false +let get_osinfo_id = function + | { i_type = "linux"; i_distro = "rhel"; + i_major_version = major; i_minor_version = minor } -> + Some (s...

...; >>diff --git a/v2v/create_libvirt_xml.ml b/v2v/create_libvirt_xml.ml >> >>index 55e83e8bc1b9..180f3768792b 100644 >> >>--- a/v2v/create_libvirt_xml.ml >> >>+++ b/v2v/create_libvirt_xml.ml >> >>@@ -34,8 +34,102 @@ let find_target_disk targets { s_disk_id = id } = >> >> try List.find (fun t -> t.target_overlay.ov_source.s_disk_id = id) targets >> >> with Not_found -> assert false >> >> >> >>+let get_osinfo_id = function >> >>+ | { i_type = "linux"; i_distro = "rhel...

...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; > +...

...ame) (quote new_filename) in + if shell_command cmd <> 0 then + error (f_"error uncompressing %s, see earlier error messages") + filename; + new_filename + ) + else filename in let disk = { s_disk_id = i; diff --git a/v2v/test-v2v-i-ova-gz.ovf b/v2v/test-v2v-i-ova-gz.ovf index e10ad2b..4a03e85 100644 --- a/v2v/test-v2v-i-ova-gz.ovf +++ b/v2v/test-v2v-i-ova-gz.ovf @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <Envelope vmw:buildId="build-1750787"...

...new_filename) in - if shell_command cmd <> 0 then - error (f_"error uncompressing %s, see earlier error messages") - filename; - new_filename - ) - else filename in - let disk = { s_disk_id = i; s_qemu_uri = filename; diff --git a/v2v/test-v2v-i-ova-gz.ovf b/v2v/test-v2v-i-ova-gz.ovf index e10ad2b..4a03e85 100644 --- a/v2v/test-v2v-i-ova-gz.ovf +++ b/v2v/test-v2v-i-ova-gz.ovf @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <Envelope v...

This patch series fixes various issues in the rhv-upload output mode: - properly find and use RHV resources - cleanup orphan disks, and possibly the current disk transfer on failure In reality, the first 4 patches deal with resources, and the other 4 with cleanups. The latter block can be theoretically sent alone -- I just happened to start working on it as part of my "let's fix

...ot;: { \"driver\":\"raw\", \"offset\":\"%Ld\", \"size\":\"%Ld\", \"file\": { \"filename\":\"%s\" } } }" + offset size ova + ) + in let disk = { s_disk_id = i; - s_qemu_uri = filename; + s_qemu_uri = qemu_uri; s_format = Some "vmdk"; s_controller = controller; } in -- 2.10.1