search for: no_trim

...nn with "" -> None | s -> Some s in let input_format = match !input_format with "" -> None | s -> Some s in let input_mode = !input_mode in + let in_place = !in_place in let machine_readable = !machine_readable in let network_map = !network_map in let no_trim = !no_trim in @@ -305,6 +308,8 @@ read the man page virt-v2v(1). Input_ova.input_ova filename in (* Parse the output mode. *) + if output_mode <> `Not_set && in_place then + error (f_"-o and --in-place cannot be used at the same time"); let output =...

The first two patches implement the change discussed here: https://www.redhat.com/archives/libguestfs/2016-April/msg00178.html The third patch fixes the mapping of inspection data to OVF VmType which was inherited directly from old virt-v2v and had never been changed. It had a number of problems. The fourth patch is only slightly related to the others. It adds an extra slow test to ensure that

...t " ^ ditto; @@ -224,6 +226,7 @@ read the man page virt-v2v(1). let input_conn = !input_conn in let input_format = !input_format in let input_mode = !input_mode in + let in_place = !in_place in let machine_readable = !machine_readable in let network_map = !network_map in let no_trim = !no_trim in @@ -313,6 +316,8 @@ read the man page virt-v2v(1). Input_ova.input_ova filename in (* Parse the output mode. *) + if output_mode <> `Not_set && in_place then + error (f_"-o and --in-place cannot be used at the same time"); let output = m...

I'm interested to hear opinions on whether this makes the code clearer, or not. This is virt-v2v, but many other virt-* tools work the same way, and analogous changes could be made. Currently when command line argument parsing is done in 'cmdline.ml' the list of parsed parameters is passed to the main program in a very long tuple. Each parameter is strongly typed, but not named (so

...ressed in let dcpath = !dcpath in let debug_overlays = !debug_overlays in let do_copy = !do_copy in @@ -414,6 +417,6 @@ read the man page virt-v2v(1). Output_vdsm.output_vdsm os vdsm_params vmtype output_alloc in input, output, - debug_overlays, do_copy, in_place, network_map, no_trim, + compressed, debug_overlays, do_copy, in_place, network_map, no_trim, output_alloc, output_format, output_name, print_source, root_choice diff --git a/v2v/v2v.ml b/v2v/v2v.ml index dabec7f..f1ebb45 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -50,7 +50,7 @@ let () = Random.self_init () let...

This series is an attempt to add a mode of virt-v2v operation where it leaves the config and disk image conversion, rollback on errors, registering with the destination hypervisor, etc. to a third-party toolset, and performs only tuning of the guest OS to run in the KVM-based hypervisor. Roman Kagan (3): v2v: add --in-place mode v2v: document --in-place v2v: add test for --in-place ---

This series is a second attempt to add a mode of virt-v2v operation where it leaves the config and disk image conversion, rollback on errors, registering with the destination hypervisor, etc. to a third-party toolset, and performs only tuning of the guest OS to run in the KVM-based hypervisor. The first 14 patches are just refactoring and rearrangement of the code, factoring the implementation

...in this series. And I think the in-place/copying stuff can be made type-safe as above. Rich. ---------------------------------------------------------------------- let main () = (* Handle the command line. *) let input, output, debug_gc, debug_overlays, do_copy, in_place, network_map, no_trim, output_alloc, output_format, output_name, print_source, root_choice = Cmdline.parse_cmdline () in (* Print the version, easier than asking users to tell us. *) if verbose () then printf "%s: %s %s (%s)\n%!" prog Config.package_name Config.package_version Config.hos...

...-) diff --git a/v2v/v2v.ml b/v2v/v2v.ml index cc36422..c28905d 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -87,8 +87,6 @@ let rec main () = let keep_serial_console = output#keep_serial_console in let guestcaps = do_convert g inspect source keep_serial_console in - g#umount_all (); - if no_trim <> ["*"] && (do_copy || debug_overlays) then ( (* Doing fstrim on all the filesystems reduces the transfer size * because unused blocks are marked in the overlay and thus do @@ -99,8 +97,6 @@ let rec main () = ); message (f_"Closing the overlay")...

...0cbf0 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -144,40 +144,7 @@ let create_overlays src_disks = ov_virtual_size = vsize; ov_source = source } ) src_disks -let rec main () = - (* Handle the command line. *) - let input, output, - debug_gc, debug_overlays, do_copy, network_map, no_trim, - output_alloc, output_format, output_name, print_source, root_choice = - Cmdline.parse_cmdline () in - - (* Print the version, easier than asking users to tell us. *) - if verbose () then - printf "%s: %s %s (%s)\n%!" - prog Config.package_name Config.package_version Con...

...overlays = !debug_overlays in let do_copy = !do_copy in let input_conn = match !input_conn with "" -> None | s -> Some s in @@ -385,6 +383,6 @@ read the man page virt-v2v(1). vmtype output_alloc in input, output, - debug_gc, debug_overlays, do_copy, network_map, no_trim, + debug_overlays, do_copy, network_map, no_trim, output_alloc, output_format, output_name, print_source, root_choice diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 4c41ed5..f6ebdd5 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -46,7 +46,7 @@ let () = Random.self_init () let rec main () = (* H...

...index 9cb4a27..a2cf249 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -43,21 +43,7 @@ let print_mpstat chan { mp_dev = dev; mp_path = path; let () = Random.self_init () -let rec main () = - (* Handle the command line. *) - let input, output, - debug_gc, debug_overlays, do_copy, network_map, no_trim, - output_alloc, output_format, output_name, print_source, root_choice = - Cmdline.parse_cmdline () in - - (* Print the version, easier than asking users to tell us. *) - if verbose () then - printf "%s: %s %s (%s)\n%!" - prog Config.package_name Config.package_version Con...

On Tue, Aug 11, 2015 at 08:00:34PM +0300, Roman Kagan wrote: > + let overlays = > + if not in_place then create_overlays source.s_disks > + else [] in > + let targets = > + if not in_place then init_targets overlays source output output_format > + else [] in This doesn't solve the problem I raised before which is that overlays and targets should never be empty

...g option + let compare = Pervasives.compare +end +module NetworkMap = Map.Make (NetTypeAndName) + type cmdline = { compressed : bool; debug_overlays : bool; do_copy : bool; in_place : bool; - network_map : ((vnet_type * string) * string) list; + network_map : string NetworkMap.t; no_trim : string list; output_alloc : output_allocation; output_format : string option; @@ -81,16 +87,25 @@ let parse_cmdline () = error (f_"unknown -i option: %s") s in - let network_map = ref [] in + let network_map = ref NetworkMap.empty in let add_network, add_bridge =...

..._uuid = vdsm_vm_uuid; ovf_output = vdsm_ovf_output; } in - Output_vdsm.output_vdsm verbose output_storage vdsm_params + Output_vdsm.output_vdsm output_storage vdsm_params vmtype output_alloc in input, output, debug_gc, debug_overlays, do_copy, network_map, no_trim, output_alloc, output_format, output_name, - print_source, quiet, root_choice, trace, verbose + print_source, quiet, root_choice diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml index a24a7fa..7967c0f 100644 --- a/v2v/convert_linux.ml +++ b/v2v/convert_linux.ml @@ -59,7 +59,7 @@ let st...

...Not_set && in_place then + error (f_"-o and --in-place cannot be used at the same time"); let output = match output_mode with | `Glance -> @@ -386,5 +391,5 @@ read the man page virt-v2v(1). input, output, debug_gc, debug_overlays, do_copy, network_map, no_trim, - output_alloc, output_format, output_name, + output_alloc, output_format, output_name, in_place, print_source, root_choice diff --git a/v2v/test-v2v-in-place.sh b/v2v/test-v2v-in-place.sh new file mode 100755 index 0000000..c19707e --- /dev/null +++ b/v2v/test-v2v-in-place.sh @@ -0,0 +1,81 @...

...error (f_"-o and --in-place cannot be used at the same time"); > let output = > match output_mode with > | `Glance -> > @@ -386,5 +391,5 @@ read the man page virt-v2v(1). > > input, output, > debug_gc, debug_overlays, do_copy, network_map, no_trim, > - output_alloc, output_format, output_name, > + output_alloc, output_format, output_name, in_place, > print_source, root_choice > diff --git a/v2v/test-v2v-in-place.sh b/v2v/test-v2v-in-place.sh > new file mode 100755 > index 0000000..c19707e > --- /dev/null > +++ b/...

.. and a lot of refactoring. https://bugzilla.redhat.com/show_bug.cgi?id=1167623 Rich.

https://bugzilla.redhat.com/show_bug.cgi?id=1167623

...rror (f_"invalid --bridge or --network parameter") | out, "" | "", out -> network_map := ((t, ""), out) :: !network_map | in_, out -> network_map := ((t, in_), out) :: !network_map @@ -86,7 +86,7 @@ let parse_cmdline () = *) no_trim := ["*"] | mps -> - let mps = string_nsplit "," mps in + let mps = String.nsplit "," mps in List.iter ( fun mp -> if String.length mp = 0 then @@ -126,7 +126,7 @@ let parse_cmdline () = | "ask" -> root_c...