search for: output_modul

...uot; +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 = register ?alias name output_module...

...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]+" + +let register_input...

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

...e output rcaps = (* Get the data directory. *) let 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.inspec...

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

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

...root current_cs rcaps and disable_services root current_cs = (* Disable miscellaneous services. *) diff --git a/v2v/modules_list.ml b/v2v/modules_list.ml index ec964c1..fd7b2ff 100644 --- a/v2v/modules_list.ml +++ b/v2v/modules_list.ml @@ -29,7 +29,8 @@ and output_modules () = List.sort compare !output_modules type conversion_fn = keep_serial_console:bool -> - Guestfs.guestfs -> Types.inspect -> Types.source -> Types.guestcaps + Guestfs.guestfs -> Types.inspect -> Types.source -> + Types.requested_guestcaps -> Types.guestcaps le...

...root current_cs rcaps and disable_services root current_cs = (* Disable miscellaneous services. *) diff --git a/v2v/modules_list.ml b/v2v/modules_list.ml index ec964c1..fd7b2ff 100644 --- a/v2v/modules_list.ml +++ b/v2v/modules_list.ml @@ -29,7 +29,8 @@ and output_modules () = List.sort compare !output_modules type conversion_fn = keep_serial_console:bool -> - Guestfs.guestfs -> Types.inspect -> Types.source -> Types.guestcaps + Guestfs.guestfs -> Types.inspect -> Types.source -> + Types.requested_guestcaps -> Types.guestcaps le...

...ister_input_module "local" diff --git a/v2v/output_local.ml b/v2v/output_local.ml index 47da929..f2945ec 100644 --- a/v2v/output_local.ml +++ b/v2v/output_local.ml @@ -61,4 +61,7 @@ class output_local dir = object end let output_local = new output_local -let () = Modules_list.register_output_module "local" +let () = + Modules_list.register_output_module "local"; + (* Alias *) + Modules_list.register_output_module "disk" diff --git a/v2v/output_rhev.ml b/v2v/output_rhev.ml index e45043b..bec5f44 100644 --- a/v2v/output_rhev.ml +++ b/v2v/output_rhev.ml @@ -282,...

...ot;; - 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"; + machine_readable_printf "libguestfs-rewrite\n"; + machine_readable_...

...uot;; - [ S 'o' ], Getopt.String (o_options, set_output_mode), s_"Set output mode (default: libvirt)"; - [ M"oa" ], Getopt.String ("sparse|preallocated", set_output_alloc), + [ S 'o' ], Getopt.Symbol (o_options, Modules_list.output_modules (), set_output_mode), s_"Set output mode (default: libvirt)"; + [ M"oa" ], Getopt.Symbol (s_"mode", [ "sparse"; "preallocated" ], set_output_alloc), s_"Set output allocation mode";...

...uot;; - [ S 'o' ], Getopt.String (o_options, set_output_mode), s_"Set output mode (default: libvirt)"; - [ M"oa" ], Getopt.String ("sparse|preallocated", set_output_alloc), + [ S 'o' ], Getopt.Symbol (o_options, Modules_list.output_modules ~with_alias:true (), set_output_mode), s_"Set output mode (default: libvirt)"; + [ M"oa" ], Getopt.Symbol (s_"mode", [ "sparse"; "preallocated" ], set_output_alloc), s_"Set output allocati...

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

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

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

...ot;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; ovf_output = vdsm_ovf_output; + compat_11 = vdsm_compat_11; } in...

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

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