search for: print_estim

...2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -33,10 +33,12 @@ type cmdline = { debug_overlays : bool; do_copy : bool; in_place : bool; + machine_readable : bool; network_map : Networks.t; output_alloc : output_allocation; output_format : string option; output_name : string option; + print_estimate : bool; print_source : bool; root_choice : root_choice; } @@ -49,6 +51,7 @@ let parse_cmdline () = let debug_overlays = ref false in let do_copy = ref true in let machine_readable = ref false in + let print_estimate = ref false in let print_source = ref false in let qemu_b...

...2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -33,10 +33,12 @@ type cmdline = { debug_overlays : bool; do_copy : bool; in_place : bool; + machine_readable : bool; network_map : Networks.t; output_alloc : output_allocation; output_format : string option; output_name : string option; + print_estimate : bool; print_source : bool; root_choice : root_choice; } @@ -49,6 +51,7 @@ let parse_cmdline () = let debug_overlays = ref false in let do_copy = ref true in let machine_readable = ref false in + let print_estimate = ref false in let print_source = ref false in let qemu_b...

...ce.sh \ test-v2v-print-source.xml \ diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index c61d83f66..a5c125361 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -37,6 +37,7 @@ type cmdline = { output_alloc : output_allocation; output_format : string option; output_name : string option; + print_estimate : bool; print_source : bool; root_choice : root_choice; } @@ -48,6 +49,7 @@ let parse_cmdline () = let compressed = ref false in let debug_overlays = ref false in let do_copy = ref true in + let print_estimate = ref false in let print_source = ref false in let qemu_boot =...

...ce.sh \ test-v2v-print-source.xml \ diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index c61d83f66..a5c125361 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -37,6 +37,7 @@ type cmdline = { output_alloc : output_allocation; output_format : string option; output_name : string option; + print_estimate : bool; print_source : bool; root_choice : root_choice; } @@ -48,6 +49,7 @@ let parse_cmdline () = let compressed = ref false in let debug_overlays = ref false in let do_copy = ref true in + let print_estimate = ref false in let print_source = ref false in let qemu_boot =...

...+33,12 @@ type cmdline = { > debug_overlays : bool; > do_copy : bool; > in_place : bool; > + machine_readable : bool; > network_map : Networks.t; > output_alloc : output_allocation; > output_format : string option; > output_name : string option; > + print_estimate : bool; > print_source : bool; > root_choice : root_choice; > } > @@ -49,6 +51,7 @@ let parse_cmdline () = > let debug_overlays = ref false in > let do_copy = ref true in > let machine_readable = ref false in > + let print_estimate = ref false in >...

v6: - Make the text output a bit nicer. - Changes as suggested to Measure_disk module temp file & json parsing. - Use jq to test JSON output. - Retest.

v5: - Normal output modified approx as suggested in previous email. - Machine readable output uses JSON.

...ce.sh \ test-v2v-print-source.xml \ diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index 10cbb90e6..da525de44 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -37,6 +37,7 @@ type cmdline = { output_alloc : output_allocation; output_format : string option; output_name : string option; + print_estimate : bool; print_source : bool; root_choice : root_choice; } @@ -48,6 +49,7 @@ let parse_cmdline () = let compressed = ref false in let debug_overlays = ref false in let do_copy = ref true in + let print_estimate = ref false in let print_source = ref false in let qemu_boot =...

...ce.sh \ test-v2v-print-source.xml \ diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index 5b2df3555..005a58ad5 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -37,6 +37,7 @@ type cmdline = { output_alloc : output_allocation; output_format : string option; output_name : string option; + print_estimate : bool; print_source : bool; root_choice : root_choice; } @@ -49,6 +50,7 @@ let parse_cmdline () = let debug_overlays = ref false in let do_copy = ref true in let machine_readable = ref false in + let print_estimate = ref false in let print_source = ref false in let qemu_b...

v4: - Same as v3, but depends on and uses new --machine-readable work. Rich.

...9 +++++ v2v/v2v.ml | 7 ++-- v2v/virt-v2v.pod | 18 ++++++++++ 10 files changed, 149 insertions(+), 16 deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index 641eed017..82f9a7da6 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -41,11 +41,12 @@ type cmdline = { print_estimate : bool; print_source : bool; root_choice : root_choice; + static_ips : static_ip list; ks : Tools_utils.key_store; } (* Matches --mac command line parameters. *) -let mac_re = PCRE.compile ~anchored:true "([[:xdigit:]]{2}:[[:xdigit:]]{2}:[[:xdigit:]]{2}:[[:xdigit:]]{2}:[[:xdig...

Patch v2 was here: https://www.redhat.com/archives/libguestfs/2019-April/thread.html#00114 There's no change here except that I've rebased it against the latest master branch and retested. There was a comment by Pino (https://www.redhat.com/archives/libguestfs/2019-April/msg00117.html) which isn't incorporated into this patch. Rich.

I rethought this again, as I think that it's a dangerous assumption to bake qemu-img measure output into our API. This patch series runs qemu-img measure behind the scenes, but then parses the output and sums it to a single number which we print. Doing that required a bit of reworking, moving the Jansson [JSON parser] bindings from virt-builder into the common directory and a couple of other

Essentially identical to v1 except that it now uses (overloads?) the --mac option to supply this data. Rich.

...phrase from F<FILENAME>. + +=back + =item B<--keys-from-stdin> Read key or passphrase parameters from stdin. The default is diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index 29c3e5d4f..cd2d279e9 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -40,6 +40,7 @@ type cmdline = { print_estimate : bool; print_source : bool; root_choice : root_choice; + ks : Tools_utils.key_store; } (* Matches --mac command line parameters. *) @@ -658,5 +659,6 @@ read the man page virt-v2v(1). compressed; debug_overlays; do_copy; in_place; network_map; output_alloc; output_format; ou...

...+721,8 @@ read the man page virt-v2v(1). output_format, output_alloc in { - bandwidth; compressed; debug_overlays; do_copy; in_place; + bandwidth; compressed; debug_overlays; do_copy; + force_interfaces; in_place; network_map; output_alloc; output_format; output_name; print_estimate; print_source; root_choice; ks = opthandle.ks; diff --git a/v2v/cmdline.mli b/v2v/cmdline.mli index 1c9e6c258..a43adb142 100644 --- a/v2v/cmdline.mli +++ b/v2v/cmdline.mli @@ -23,6 +23,7 @@ type cmdline = { compressed : bool; debug_overlays : bool; do_copy : bool; + force_interfac...

--- v2v/windows.ml | 24 ++++++++++++++++++++++++ v2v/windows.mli | 6 ++++++ 2 files changed, 30 insertions(+) diff --git a/v2v/windows.ml b/v2v/windows.ml index 23d589b00..dde64e677 100644 --- a/v2v/windows.ml +++ b/v2v/windows.ml @@ -19,6 +19,7 @@ open Printf open Common_gettext.Gettext +open Std_utils open Tools_utils open Utils @@ -45,3 +46,26 @@ and check_app { Guestfs.app2_name

Hi, the following series adds a --key option in the majority of tools: this makes it possible to pass LUKS credentials programmatically, avoid the need to manually input them, or unsafely pass them via stdin. Thanks, Pino Toscano (2): mltools: create a cmdline_options struct Introduce a --key option in tools that accept keys builder/cmdline.ml | 2 +-

This is built on top of the following patch series: https://www.redhat.com/archives/libguestfs/2019-April/msg00054.html Rich.

v2 was posted here: https://www.redhat.com/archives/libguestfs/2019-July/msg00115.html This also has links to earlier versions. v3: - The 01/11 patch in v2 included a bunch of unnecessary plus one necessary change to how input_password is passed around. I moved the necessary change into the final patch (implementing SSH password authentication) and dropped the rest. - The 01/11