search for: rcaps_from_sourc

...net_bus = None; - rcaps_video = None; - } in + let rcaps = + match conversion_mode with + | Copying (_, _) -> + { + rcaps_block_bus = None; + rcaps_net_bus = None; + rcaps_video = None; + } + | In_place -> + rcaps_from_source source + in let guestcaps = do_convert g inspect source keep_serial_console rcaps in g#umount_all (); @@ -974,4 +980,43 @@ and preserve_overlays overlays src_name = printf (f_"Overlay saved as %s [--debug-overlays]\n") saved_filename ) overlays +and rcaps_from_source...

...net_bus = None; - rcaps_video = None; - } in + let rcaps = + match conversion_mode with + | Copying (_, _) -> + { + rcaps_block_bus = None; + rcaps_net_bus = None; + rcaps_video = None; + } + | In_place -> + rcaps_from_source source + in let guestcaps = do_convert g inspect source keep_serial_console rcaps in g#umount_all (); @@ -974,4 +980,43 @@ and preserve_overlays overlays src_name = printf (f_"Overlay saved as %s [--debug-overlays]\n") saved_filename ) overlays +and rcaps_from_source...

...match conversion_mode with > + | Copying (_, _) -> You can just write this: | Copying _ -> > + { > + rcaps_block_bus = None; > + rcaps_net_bus = None; > + rcaps_video = None; > + } > + | In_place -> > + rcaps_from_source source > + in > let guestcaps = do_convert g inspect source keep_serial_console rcaps in > > g#umount_all (); > @@ -974,4 +980,43 @@ and preserve_overlays overlays src_name = > printf (f_"Overlay saved as %s [--debug-overlays]\n") saved_filename >...

...ring "data"; + "data", JSON.Dict [ + "saved_overlays", + JSON.List (List.map (fun s -> JSON.String s) filenames); + ] + ] in + pr "%s\n" (JSON.string_of_doc json) (* Request guest caps based on source configuration. *) and rcaps_from_source source = -- 2.23.0

So far v2v did not read the model of network interfaces, resulting in "virtio" as the model for such interfaces. Start reading the model, if available, mapping only E1000 for now. There are also other models, e.g. PCNet32 or VmxNet3, but they are ignored for now: reading them as Source_other_nic would result in v2v rejecting OVAs previously converted. --- v2v/parse_ovf_from_ova.ml

...e outside entity. So in that > > case v2v needs to look it up in the source configuraion, and try to > > follow. > > > > For that, the source configuration is used to populate requested caps > > object which is then passed to the convert routine. [...] > > +and rcaps_from_source source = > > + (* Request guest caps based on source configuration. *) > > + > > + (* rely on s_controller enum being in ascending preference order, and None > > + * being smaller than Some anything *) > > + let best_block_type = > > + List.fold_left max...

...drives with bus='scsi' it differentiates between > Source_virtio_SCSI and Source_SCSI. Oh I see, target_bus is consulted for each drive. So this is right (except for the scsi/virtio-scsi case, but who knows about that). > The place where we make up a single disk type is > v2v.ml:rcaps_from_source, but there I explicitly error out if the guest > has multiple disk types (which may be too harsh but simplifies things > for now). Yup. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpres...

...", JSON.Dict [ > + "saved_overlays", > + JSON.List (List.map (fun s -> JSON.String s) filenames); > + ] > + ] in > + pr "%s\n" (JSON.string_of_doc json) > > (* Request guest caps based on source configuration. *) > and rcaps_from_source source = > -- > 2.23.0 -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, d...

...Curl.Curl_failed (code, url) -> + error (f_"curl error: failed to download ‘%s’, error code %d") url code + in + run_main_and_handle_errors main_wrap diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 277d8f2c7..1b3ec0b6c 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -870,4 +870,11 @@ and rcaps_from_source source = rcaps_video = video; } -let () = run_main_and_handle_errors main +let () = + let main_wrap () = + try main () + with + | Curl.Curl_failed (code, url) -> + error (f_"curl error: failed to download ‘%s’, error code %d") url code + in + run_main_and_ha...

...v2v/v2v.ml @@ -103,7 +103,6 @@ let rec main () = (* Conversion. *) let guestcaps = - let keep_serial_console = output#keep_serial_console in let rcaps = match conversion_mode with | Copying _ -> @@ -111,7 +110,7 @@ let rec main () = | In_place -> rcaps_from_source source in - do_convert g inspect source keep_serial_console rcaps in + do_convert g inspect source output rcaps in g#umount_all (); @@ -549,7 +548,7 @@ and check_target_free_space mpstats source targets output = output#check_target_free_space source targets (* Conversion. *) -...

https://bugzilla.redhat.com/show_bug.cgi?id=1508874 Also avoids a warning. Rich.

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

...0 for now. Looks sensible, ACK. > There are also other models, e.g. PCNet32 or VmxNet3, but they are > ignored for now: reading them as Source_other_nic would result in v2v > rejecting OVAs previously converted. -i vmx and -i libvirt(xml) does parse them as Source_other_nic. Apart from rcaps_from_source which is only used by --in-place conversions the NIC model is basically ignored everywhere. So I think it would be safe to modify this patch to map them to Source_other_nic unless I've missed something else. Rich. > v2v/parse_ovf_from_ova.ml | 7 ++++++- > v2v/test-v2v-...

...E -> ide_bus - | Some Source_SCSI -> scsi_bus in + | Some Source_virtio_SCSI | Some Source_SCSI -> scsi_bus in match r.s_removable_slot with | None -> ignore (insert_after bus 0 (BusSlotRemovable r)) | Some desired_slot_nr -> @@ -992,6 +994,7 @@ and rcaps_from_source source = let block_type = match source_block_type with | Some Source_virtio_blk -> Some Virtio_blk + | Some Source_virtio_SCSI -> Some Virtio_SCSI | Some Source_IDE -> Some IDE | Some t -> error (f_"source has unsupported hard disk type '%s'"...

The bug is: https://bugzilla.redhat.com/show_bug.cgi?id=1161019 This makes a few other minor refactorings to the code. Rich.

...E -> ide_bus - | Some Source_SCSI -> scsi_bus in + | Some Source_virtio_SCSI | Some Source_SCSI -> scsi_bus in match r.s_removable_slot with | None -> ignore (insert_after bus 0 (BusSlotRemovable r)) | Some desired_slot_nr -> @@ -992,6 +994,7 @@ and rcaps_from_source source = let block_type = match source_block_type with | Some Source_virtio_blk -> Some Virtio_blk + | Some Source_virtio_SCSI -> Some Virtio_SCSI | Some Source_IDE -> Some IDE | Some t -> error (f_"source has unsupported hard disk type '%s'"...

...E -> ide_bus - | Some Source_SCSI -> scsi_bus in + | Some Source_virtio_SCSI | Some Source_SCSI -> scsi_bus in match r.s_removable_slot with | None -> ignore (insert_after bus 0 (BusSlotRemovable r)) | Some desired_slot_nr -> @@ -992,6 +994,7 @@ and rcaps_from_source source = let block_type = match source_block_type with | Some Source_virtio_blk -> Some Virtio_blk + | Some Source_virtio_SCSI -> Some Virtio_SCSI | Some Source_IDE -> Some IDE | Some t -> error (f_"source has unsupported hard disk type '%s'"...

...+(** [--force-interface] option. *) + (** {2 Input object} This is subclassed for the various input [-i] options. diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 5fb85bb38..e36eab2d4 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -133,7 +133,7 @@ let rec main () = | In_place -> rcaps_from_source source in - do_convert g inspect source output rcaps in + do_convert g inspect source output rcaps cmdline.force_interfaces in g#umount_all (); @@ -557,7 +557,7 @@ and estimate_target_size mpstats overlays = ) (* Conversion. *) -and do_convert g inspect source output rcaps = +...

The decision on which device type to use for disks, network and video cards on output used to be taken deep inside the converting functions. This is not always desirable. In particular, there are scenarios when this decision is made before the convertion takes place. E.g. in in-place mode, the decisions are taken and the output VM configuration is created outside of v2v tool. This patchset

...+} +(** [--mac ..:ip:..] option. *) + (** {2 Input object} This is subclassed for the various input [-i] options. diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 5fb85bb38..a748ae162 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -133,7 +133,7 @@ let rec main () = | In_place -> rcaps_from_source source in - do_convert g inspect source output rcaps in + do_convert g inspect source output rcaps cmdline.static_ips in g#umount_all (); @@ -557,7 +557,7 @@ and estimate_target_size mpstats overlays = ) (* Conversion. *) -and do_convert g inspect source output rcaps = +and do...