search for: set_input_mode

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

...; ], Getopt.String ("driver", set_string_option_once "--block-driver" block_driver), + s_"Prefer 'virtio-blk' or 'virtio-scsi'"; [ S 'i' ], Getopt.String ("disk|libvirt|libvirtxml|ova|vmx", set_input_mode), s_"Set input mode (default: libvirt)"; [ M"ic" ], Getopt.String ("uri", set_string_option_once "-ic" input_conn), @@ -211,6 +214,12 @@ read the man page virt-v2v-in-place(1). (* Dereference the arguments....

...; ], Getopt.String ("driver", set_string_option_once "--block-driver" block_driver), + s_"Prefer 'virtio-blk' or 'virtio-scsi'"; [ S 'i' ], Getopt.String ("disk|libvirt|libvirtxml|ova|vmx", set_input_mode), s_"Set input mode (default: libvirt)"; [ M"ic" ], Getopt.String ("uri", set_string_option_once "-ic" input_conn), @@ -211,6 +214,12 @@ read the man page virt-v2v-in-place(1). (* Dereference the arguments....

...t;--dcpath" dcpath), s_"Override dcPath (for vCenter)"; [ L"debug-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 "-...

...t;--dcpath" dcpath), s_"Override dcPath (for vCenter)"; [ L"debug-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_op...

Extend Modules_list to handle also aliases for input and output modules, and use this to register the existing aliases. --- v2v/input_disk.ml | 2 +- v2v/modules_list.ml | 25 +++++++++++++++++++++---- v2v/modules_list.mli | 8 ++++---- v2v/output_local.ml | 2 +- v2v/output_rhev.ml | 2 +- 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/v2v/input_disk.ml

Shahar: This is the same patch as you posted, but I have rebased it on top of current HEAD. You'll have to do save the next email to a file, and do: git reset --hard HEAD^ git pull git am /path/to/saved_email There are no changes in this patch, except what is needed to make it compile. Will follow-up with comments. Rich.

Discussion on v1: https://listman.redhat.com/archives/libguestfs/2023-February/030849.html https://listman.redhat.com/archives/libguestfs/2023-March/030917.html v1 -> v2: * Adapt the patch suggested by Richard, splitting it up into 3: https://listman.redhat.com/archives/libguestfs/2023-March/030975.html Now we have "--block-driver" command line option which regulates the

On Thu, Aug 21, 2014 at 01:50:18PM +0100, Richard W.M. Jones wrote: > + (* extract ova (tar) file *) > + let cmd = sprintf ("tar -xf %s -C %s") (ova) (dir) in Lots of extra parentheses here :-) The same command can be written more naturally without any of them: let cmd = sprintf "tar -xf %s -C %s" ova dir in However I think what you might have meant is to call

This is just an outline patch, only compile tested. It doesn't make changes to virt-v2v-in-place, but those would be the same as made in v2v/v2v.ml. It reuses the existing Types.guestcaps_block_type which is a bit ugly but fairly practical. I've made the change to the documentation, but it needs a test. Rich.

Discussion on v2: https://listman.redhat.com/archives/libguestfs/2023-March/030987.html v2 -> v3: * Patch 2/6 ("convert_windows: add Inject_virtio_win.Virtio_SCSI as a possible block type"): omit "Inject_virtio_win." prefix in favor of type inference. Add a short commit message body; * Add tests/test-v2v-block-driver.sh testing the new "--block-driver"

...t;--dcpath" dcpath), - s_"Override dcPath (for vCenter)"; [ L"debug-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)"; [ M"ic" ], Getopt.String ("uri", set_string_option_once "-ic" input_conn), @@ -270,7 +267,6 @@ read the man page virt-v2v(1). (* Dereference the arguments. *) let args = List.rev !args in let compre...

...s_"Save overlay files"; + [ L"force-interface" ], Getopt.String ("mac,ip[,gw[,len[,ns,ns,...]]]", add_force_interface), + s_"Force interface to IP address"; [ S 'i' ], Getopt.String (i_options, set_input_mode), s_"Set input mode (default: libvirt)"; [ M"ic" ], Getopt.String ("uri", set_string_option_once "-ic" input_conn), @@ -319,6 +342,7 @@ read the man page virt-v2v(1). let compressed = !compressed in let de...

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

...-dcpath" dcpath), s_"Override dcPath (for vCenter)"; - [ "--debug-overlay"; "--debug-overlays" ], Getopt.Set debug_overlays, s_"Save overlay files"; - [ "-i" ], Getopt.String (i_options, set_input_mode), s_"Set input mode (default: libvirt)"; - [ "-ic" ], Getopt.String ("uri", set_string_option_once "-ic" input_conn), + [ L"debug-overlay"; L"debug-overlays" ], Getopt.Set debug_overlays, s_"Save overlay files"; +...

...path), - "path " ^ ditto; - "--debug-overlay",Arg.Set debug_overlays, - " " ^ s_"Save overlay files"; - "--debug-overlays",Arg.Set debug_overlays, - ditto; - "-i", Arg.String set_input_mode, i_options ^ " " ^ s_"Set input mode (default: libvirt)"; - "-ic", Arg.String (set_string_option_once "-ic" input_conn), - "uri " ^ s_"Libvirt URI"; - "-if", Arg.String...

v1 -> v2: - Further fixes to Getopt int parsing. - Completed the L/S changes. - Fixed the test suite so it passes now. Also we don't need the special-case tests for 64 bit arch. Rich.

v3 -> v4: - Pushed the first patch upstream since it was ACKed. - Prevent use of M except for the special virt-v2v options. - Sort the options after added --help etc. - Make corresponding fixes to the tests. Rich.

v2 -> v3: - Add M variant and test it. Rich.

..."path " ^ ditto; > - "--debug-overlay",Arg.Set debug_overlays, > - " " ^ s_"Save overlay files"; > - "--debug-overlays",Arg.Set debug_overlays, > - ditto; > - "-i", Arg.String set_input_mode, i_options ^ " " ^ s_"Set input mode (default: libvirt)"; > - "-ic", Arg.String (set_string_option_once "-ic" input_conn), > - "uri " ^ s_"Libvirt URI"; > - "-if",...