search for: 2d0a10a

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

Use Getopt.Symbol for options with a fixed list of choices, so there is no need to check them on our own. --- v2v/cmdline.ml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index 2d0a10a..ddf5858 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -136,8 +136,7 @@ let parse_cmdline () = match mode with | "sparse" -> output_alloc := `Sparse | "preallocated" -> output_alloc := `Preallocated - | s -> - error (f_"unknown -oa opti...

Use Getopt.Symbol for options with a fixed list of choices, so there is no need to check them on our own. --- v2v/cmdline.ml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index 2d0a10a..96e0509 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -83,8 +83,7 @@ let parse_cmdline () = | "libvirt" -> input_mode := `Libvirt | "libvirtxml" -> input_mode := `LibvirtXML | "ova" -> input_mode := `OVA - | s -> - error (f_&qu...

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

...v Kaul, Michal Skrivanek. --- v2v/cmdline.ml | 5 +++++ v2v/output_rhev.ml | 4 ---- v2v/output_vdsm.ml | 11 ++++++++--- v2v/output_vdsm.mli | 1 + v2v/virt-v2v.pod | 11 ++++++++++- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index 2d0a10a..9a56d60 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -65,6 +65,7 @@ let parse_cmdline () = let password_file = ref None in let vdsm_vm_uuid = ref None in let vdsm_ovf_output = ref None in (* default "." *) + let vdsm_compat_11 = ref false in let set_string_option_on...

...v2v/output_vdsm.ml | 11 ++++++++--- v2v/output_vdsm.mli | 1 + v2v/test-v2v-o-vdsm-options.sh | 11 +++++++++-- v2v/virt-v2v.pod | 21 ++++++++++++++++++++- 6 files changed, 45 insertions(+), 10 deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index 2d0a10a..1d325af 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -66,6 +66,9 @@ let parse_cmdline () = let vdsm_vm_uuid = ref None in let vdsm_ovf_output = ref None in (* default "." *) + let vdsm_compat = ref "0.10" in + let set_vdsm_compat s = vdsm_compat := s in + le...

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.

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.