This option was added in error. It never had any effect and now the nbdkit VDDK plugin ignores it. Virt-v2v users shouldn't have been using it. This removes the option completely (so if anyone was using it they will now get an error). --- v2v/cmdline.ml | 2 -- v2v/input_libvirt_vddk.ml | 4 +--- v2v/test-v2v-docs.sh | 1 - v2v/virt-v2v.pod | 7 ++----- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index cd2d279e9..6ec076151 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -259,8 +259,6 @@ let parse_cmdline () = s_"Same as ‘-io vddk-thumbprint=thumbprint’"; [ L"vddk-transports" ], Getopt.String ("transports", set_input_option_compat "vddk-transports"), s_"Same as ‘-io vddk-transports=transports’"; - [ L"vddk-vimapiver" ], Getopt.String ("apiver", set_input_option_compat "vddk-vimapiver"), - s_"Same as ‘-io vddk-vimapiver=apiver’"; [ L"vdsm-compat" ], Getopt.String ("0.10|1.1", set_output_option_compat "vdsm-compat"), s_"Same as ‘-oo vdsm-compat=0.10|1.1’"; [ L"vdsm-image-uuid" ], Getopt.String ("uuid", set_output_option_compat "vdsm-image-uuid"), diff --git a/v2v/input_libvirt_vddk.ml b/v2v/input_libvirt_vddk.ml index f74ca05af..2ca0ef1e0 100644 --- a/v2v/input_libvirt_vddk.ml +++ b/v2v/input_libvirt_vddk.ml @@ -44,8 +44,7 @@ let vddk_option_keys = "port"; "snapshot"; "thumbprint"; - "transports"; - "vimapiver" ] + "transports" ] let print_input_options () = printf (f_"Input options (-io) which can be used with -it vddk: @@ -64,7 +63,6 @@ All other settings are optional: VDDK snapshot moref -io vddk-transports=MODE:MODE:.. VDDK transports - -io vddk-vimapiver=APIVER VDDK vimapiver Refer to nbdkit-vddk-plugin(1) and the VDDK documentation for further information on these settings. diff --git a/v2v/test-v2v-docs.sh b/v2v/test-v2v-docs.sh index 64dfe5492..dfb12bb14 100755 --- a/v2v/test-v2v-docs.sh +++ b/v2v/test-v2v-docs.sh @@ -46,7 +46,6 @@ $top_srcdir/podcheck.pl virt-v2v.pod virt-v2v \ --vddk-snapshot,\ --vddk-thumbprint,\ --vddk-transports,\ ---vddk-vimapiver,\ --vdsm-compat,\ --vdsm-image-uuid,\ --vdsm-ovf-flavour,\ diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod index e028540e2..fbc5733a6 100644 --- a/v2v/virt-v2v.pod +++ b/v2v/virt-v2v.pod @@ -437,8 +437,6 @@ See L</INPUT FROM VDDK> below for details. =item B<-io vddk-transports=>MODE:MODE:... -=item B<-io vddk-vimapiver=>APIVER - When using VDDK mode, these options are passed unmodified to the L<nbdkit(1)> VDDK plugin. Please refer to L<nbdkit-vddk-plugin(1)>. These are all optional. @@ -1894,9 +1892,8 @@ SSL thumbprint: Other options that you might need to add in rare circumstances include I<-io vddk-config>, I<-io vddk-cookie>, I<-io vddk-nfchostport>, -I<-io vddk-port>, I<-io vddk-snapshot>, I<-io vddk-transports> and -I<-io vddk-vimapiver>, which are all explained in the -L<nbdkit-vddk-plugin(1)> documentation. +I<-io vddk-port>, I<-io vddk-snapshot>, and I<-io vddk-transports>, +which are all explained in the L<nbdkit-vddk-plugin(1)> documentation. =head2 VDDK: DEBUGGING VDDK FAILURES -- 2.19.0.rc0