search for: input_modules

...er_input_module "disk" +let () = Modules_list.register_input_module ~alias:"local" "disk" diff --git a/v2v/modules_list.ml b/v2v/modules_list.ml index 36a08c0..5649b02 100644 --- a/v2v/modules_list.ml +++ b/v2v/modules_list.ml @@ -21,11 +21,28 @@ open Common_utils let input_modules = ref [] and output_modules = ref [] -let register_input_module name = push_front name input_modules -and register_output_module name = push_front name output_modules +let rec register_input_module ?alias name = register ?alias name input_modules +and register_output_module ?alias name = registe...

...put:((?:[-\\w])+)", 0); COMPILE (portfwd_re, "Allocated port ((?:\\d)+) for remote forward", 0); } diff --git a/v2v/modules_list.ml b/v2v/modules_list.ml index 91b029b07..b7accc4f9 100644 --- a/v2v/modules_list.ml +++ b/v2v/modules_list.ml @@ -21,8 +21,15 @@ open Std_utils let input_modules = ref [] and output_modules = ref [] -let register_input_module name = List.push_front name input_modules -and register_output_module name = List.push_front name output_modules +(* Must match the regular expressions in p2v/ssh.c *) +let module_name_re = PCRE.compile ~anchored:true "[-\\w]+&...

v1 was here: https://www.redhat.com/archives/libguestfs/2018-June/msg00047.html v1 -> v2: - Add a regular expression in the virt-v2v modules code too. - - - I was planning a much more ambitious second version of this patch (half written too) which had: virt-v2v --describe-modules that listed a big chunk of XML which virt-p2v would parse. These would include the names of the

...virt_tools_data_dir = try Sys.getenv "VIRT_TOOLS_DATA_DIR" diff --git a/v2v/modules_list.ml b/v2v/modules_list.ml index 13dfee2..3b3cf2e 100644 --- a/v2v/modules_list.ml +++ b/v2v/modules_list.ml @@ -27,9 +27,10 @@ and register_output_module name = push_front name output_modules let input_modules () = List.sort compare !input_modules and output_modules () = List.sort compare !output_modules +type inspection_fn = Types.inspect -> bool + type conversion_fn = - keep_serial_console:bool -> - Guestfs.guestfs -> Types.inspect -> Types.source -> + Guestfs.guestfs -> Types....

...2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -347,6 +347,7 @@ read the man page virt-v2v(1). printf "vdsm-compat-option\n"; printf "in-place\n"; printf "io/oo\n"; + printf "mac-option\n"; List.iter (printf "input:%s\n") (Modules_list.input_modules ()); List.iter (printf "output:%s\n") (Modules_list.output_modules ()); List.iter (printf "convert:%s\n") (Modules_list.convert_modules ()); -- 2.18.0

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

This makes them visible in the help text of -i and -o. --- v2v/input_disk.ml | 5 ++++- v2v/output_local.ml | 5 ++++- v2v/output_rhev.ml | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml index 17ad61d..508f16a 100644 --- a/v2v/input_disk.ml +++ b/v2v/input_disk.ml @@ -101,4 +101,7 @@ class input_disk input_format disk = object

...sh\n"; - printf "vddk\n"; - printf "colours-option\n"; - printf "vdsm-compat-option\n"; - printf "in-place\n"; - printf "io/oo\n"; - printf "mac-option\n"; - List.iter (printf "input:%s\n") (Modules_list.input_modules ()); - List.iter (printf "output:%s\n") (Modules_list.output_modules ()); - List.iter (printf "convert:%s\n") (Modules_list.convert_modules ()); - List.iter (printf "ovf:%s\n") Create_ovf.ovf_flavours; + machine_readable_printf "virt-v2v\n"; +...

...overlay"; L"debug-overlays" ], Getopt.Set debug_overlays, s_"Save overlay files"; - [ S 'i' ], Getopt.String (i_options, set_input_mode), s_"Set input mode (default: libvirt)"; + [ S 'i' ], Getopt.Symbol (i_options, Modules_list.input_modules (), set_input_mode), s_"Set input mode (default: libvirt)"; [ M"ic" ], Getopt.String ("uri", set_string_option_once "-ic" input_conn), s_"Libvirt URI"; [ M"if" ], Getopt.St...

...overlay"; L"debug-overlays" ], Getopt.Set debug_overlays, s_"Save overlay files"; - [ S 'i' ], Getopt.String (i_options, set_input_mode), s_"Set input mode (default: libvirt)"; + [ S 'i' ], Getopt.Symbol (i_options, Modules_list.input_modules ~with_alias:true (), set_input_mode), s_"Set input mode (default: libvirt)"; [ M"ic" ], Getopt.String ("uri", set_string_option_once "-ic" input_conn), s_"Libvirt URI"; [ M"if" ]...

...cmdline.ml +++ b/v2v/cmdline.ml @@ -328,6 +328,7 @@ read the man page virt-v2v(1). printf "vddk\n"; printf "colours-option\n"; printf "vdsm-compat-option\n"; + printf "in-place\n"; List.iter (printf "input:%s\n") (Modules_list.input_modules ()); List.iter (printf "output:%s\n") (Modules_list.output_modules ()); List.iter (printf "convert:%s\n") (Modules_list.convert_modules ()); -- 2.13.6

v2 -> v3: - Changes to the Curl API suggested by Pino.

v1 -> v2: - Fixed the bug with precedence of if / @. - Add some imperative list operators inspired by Perl, and use those for constructing the Curl arguments, and more. Rich.

...dsm_vm_uuid in @@ -272,6 +275,7 @@ read the man page virt-v2v(1). printf "virt-v2v\n"; printf "libguestfs-rewrite\n"; printf "colours-option\n"; + printf "vdsm-compat-11-option\n"; List.iter (printf "input:%s\n") (Modules_list.input_modules ()); List.iter (printf "output:%s\n") (Modules_list.output_modules ()); List.iter (printf "convert:%s\n") (Modules_list.convert_modules ()); @@ -415,6 +419,7 @@ read the man page virt-v2v(1). vol_uuids = vdsm_vol_uuids; vm_uuid = vdsm_vm_uuid;...

v2 -> v3: - Renamed List.assoc_ -> List.assoc_lbl. - Rebased on top of current master branch. Rich.

...!vdsm_vm_uuid in @@ -272,6 +277,7 @@ read the man page virt-v2v(1). printf "virt-v2v\n"; printf "libguestfs-rewrite\n"; printf "colours-option\n"; + printf "vdsm-compat-option\n"; List.iter (printf "input:%s\n") (Modules_list.input_modules ()); List.iter (printf "output:%s\n") (Modules_list.output_modules ()); List.iter (printf "convert:%s\n") (Modules_list.convert_modules ()); @@ -415,6 +421,7 @@ read the man page virt-v2v(1). vol_uuids = vdsm_vol_uuids; vm_uuid = vdsm_vm_uuid;...

Hi, this is a first approach (hence RFC, since it misses tests & documentation) in selecting the output for --machine-readable. The possible choices are: * --machine-readable: to stdout, like before * --machine-readable=file:name-of-file: to the specified file * --machine-readable=stream:stdout: explicitly to stdout * --machine-readable=stream:stderr: explicitly to stderr This makes it

...sh\n"; - printf "vddk\n"; - printf "colours-option\n"; - printf "vdsm-compat-option\n"; - printf "in-place\n"; - printf "io/oo\n"; - printf "mac-option\n"; - List.iter (printf "input:%s\n") (Modules_list.input_modules ()); - List.iter (printf "output:%s\n") (Modules_list.output_modules ()); - List.iter (printf "convert:%s\n") (Modules_list.convert_modules ()); - List.iter (printf "ovf:%s\n") Create_ovf.ovf_flavours; + (match args, machine_readable () with + | [], Some { p...

v3: Change the flag from --vdsm-compat-11 to --vdsm-compat=1.1 Also the --machine-readable output has changed. I have also added a test. Rich.

...rmat in let input_mode = !input_mode in @@ -364,6 +388,7 @@ read the man page virt-v2v(1). pr "io/oo\n"; pr "mac-option\n"; pr "bandwidth-option\n"; + pr "force-interface-option\n"; List.iter (pr "input:%s\n") (Modules_list.input_modules ()); List.iter (pr "output:%s\n") (Modules_list.output_modules ()); List.iter (pr "convert:%s\n") (Modules_list.convert_modules ()); @@ -696,7 +721,8 @@ read the man page virt-v2v(1). output_format, output_alloc in { - bandwidth; compressed; debug_overla...