From 3b69cfa365c7b014ca81b09e857ab294cff04914 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 14 Jan 2016 11:53:42 -0500 Subject: [PATCH 07/12] RHEL: v2v: Disable the virt-v2v --in-place option. This disables the virt-v2v --in-place option which we do not wish to support in RHEL. (See commit d0069559a939e47e5f29973ed9a69a13f0b58301). --- docs/test-v2v-docs.sh | 1 + docs/virt-v2v.pod | 50 +---------------- tests/Makefile.am | 2 - tests/test-v2v-in-place.sh | 108 ------------------------------------- v2v/cmdline.ml | 8 +-- 5 files changed, 8 insertions(+), 161 deletions(-) delete mode 100755 tests/test-v2v-in-place.sh diff --git a/docs/test-v2v-docs.sh b/docs/test-v2v-docs.sh index 465df26f..ae1a6c68 100755 --- a/docs/test-v2v-docs.sh +++ b/docs/test-v2v-docs.sh @@ -30,6 +30,7 @@ $srcdir/../podcheck.pl virt-v2v.pod virt-v2v \ --debug-overlay,\ --ic,\ --if,\ +--in-place,\ --io,\ --ip,\ --it,\ diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod index 83f6fd4d..719a95b5 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod @@ -8,10 +8,6 @@ virt-v2v - Convert a guest to use KVM [-o mode] [other -o* options] [guest|filename] - virt-v2v --in-place - [-i mode] [other -i* options] - [guest|filename] - =head1 DESCRIPTION Virt-v2v converts a single guest from a foreign hypervisor to run on @@ -39,9 +35,6 @@ these sides of virt-v2v are documented separately in this manual. Virt-v2v normally copies from the input to the output, called "copying mode". In this case the source guest is always left unchanged. -In-place conversion (I<--in-place>) only uses the I<-i*> options and -modifies the source guest in-place. (See L -below.) =head2 Other virt-v2v topics @@ -292,20 +285,6 @@ For I<-i disk> only, this specifies the format of the input disk image. For other input methods you should specify the input format in the metadata. -=item B<--in-place> - -Do not create an output virtual machine in the target hypervisor. -Instead, adjust the guest OS in the source VM to run in the input -hypervisor. - -This mode is meant for integration with other toolsets, which take the -responsibility of converting the VM configuration, providing for -rollback in case of errors, transforming the storage, etc. - -See L below. - -Conflicts with all I<-o *> options. - =item B<-io> OPTION=VALUE Set input option(s) related to the current input mode or transport. @@ -1298,8 +1277,8 @@ have at least 100 available inodes. =head3 Minimum free space check in the host You must have sufficient free space in the host directory used to -store large temporary overlays (except in I<--in-place> mode). To -find out which directory this is, use: +store large temporary overlays. To find out +which directory this is, use: $ df -h "`guestfish get-cachedir`" Filesystem Size Used Avail Use% Mounted on @@ -1437,31 +1416,6 @@ that instead. -=head2 In-place conversion - -It is also possible to use virt-v2v in scenarios where a foreign VM -has already been imported into a KVM-based hypervisor, but still needs -adjustments in the guest to make it run in the new virtual hardware. - -In that case it is assumed that a third-party tool has created the -target VM in the supported KVM-based hypervisor based on the source VM -configuration and contents, but using virtual devices more appropriate -for KVM (e.g. virtio storage and network, etc.). - -Then, to make the guest OS boot and run in the changed environment, -one can use: - - virt-v2v -ic qemu:///system converted_vm --in-place - -Virt-v2v will analyze the configuration of C in the -C libvirt instance, and apply various fixups to the -guest OS configuration to make it match the VM configuration. This -may include installing virtio drivers, configuring the bootloader, the -mountpoints, the network interfaces, and so on. - -Should an error occur during the operation, virt-v2v exits with an -error code leaving the VM in an undefined state. - =head2 Machine readable output The I<--machine-readable> option can be used to make the output more diff --git a/tests/Makefile.am b/tests/Makefile.am index 41d38d30..9bbd86d6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -77,7 +77,6 @@ TESTS = \ test-v2v-floppy.sh \ test-v2v-i-disk.sh \ test-v2v-i-ova.sh \ - test-v2v-in-place.sh \ test-v2v-mac.sh \ test-v2v-machine-readable.sh \ test-v2v-networks-and-bridges.sh \ @@ -226,7 +225,6 @@ EXTRA_DIST += \ test-v2v-i-vmx-3.vmx \ test-v2v-i-vmx-4.vmx \ test-v2v-i-vmx-5.vmx \ - test-v2v-in-place.sh \ test-v2v-it-vddk-io-query.sh \ test-v2v-machine-readable.sh \ test-v2v-mac-expected.xml \ diff --git a/tests/test-v2v-in-place.sh b/tests/test-v2v-in-place.sh deleted file mode 100755 index 9da8fa63..00000000 --- a/tests/test-v2v-in-place.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/bash - -# libguestfs virt-v2v test script -# Copyright (C) 2014 Red Hat Inc. -# Copyright (C) 2015 Parallels IP Holdings GmbH. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -# Test --in-place. - -unset CDPATH -export LANG=C -set -e - -source ./functions.sh -set -e -set -x - -skip_if_skipped -requires test -f ../test-data/phony-guests/windows.img - -img_base="$abs_top_builddir/test-data/phony-guests/windows.img" - -export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools" -export VIRTIO_WIN="$srcdir/../test-data/fake-virtio-win" - -d=$PWD/test-v2v-in-place.d -rm -rf $d -cleanup_fn rm -r $d -mkdir $d - -img="$d/test.qcow2" -rm -f $img -qemu-img create -f qcow2 -b $img_base -o compat=1.1,backing_fmt=raw $img -md5="$(do_md5 $img_base)" - -libvirt_xml="$d/test.xml" -rm -f $libvirt_xml -n=windows-overlay -cat > $libvirt_xml < - - $n - 1048576 - - hvm - - - - - - - - - - - -EOF - -$VG virt-v2v --debug-gc -i libvirt -ic "test://$libvirt_xml" $n --in-place - -# Test that the drivers have been copied over into the guest -script="$d/test.fish" -expected="$d/expected" -response="$d/response" - -mktest () -{ - local cmd="$1" exp="$2" - - echo "echo '$cmd'" >> "$script" - echo "$cmd" >> "$expected" - - echo "$cmd" >> "$script" - echo "$exp" >> "$expected" -} - -:> "$script" -:> "$expected" - -firstboot_dir="/Program Files/Guestfs/Firstboot" -mktest "is-dir \"$firstboot_dir\"" true -mktest "is-file \"$firstboot_dir/firstboot.bat\"" true -mktest "is-dir \"$firstboot_dir/scripts\"" true -virtio_dir="/Windows/Drivers/VirtIO" -mktest "is-dir \"$virtio_dir\"" true -for drv in netkvm qxl vioscsi viostor; do - for sfx in cat inf sys; do - mktest "is-file \"$virtio_dir/$drv.$sfx\"" true - done -done - -guestfish --ro -a "$img" -i < "$script" > "$response" -diff -u "$expected" "$response" - -# Test the base image remained untouched -test "$md5" = "$(do_md5 $img_base)" diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index ac10ec31..01314580 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -246,8 +246,7 @@ let parse_cmdline () = s_"Use password from file to connect to input hypervisor"; [ M"it" ], Getopt.String ("transport", set_string_option_once "-it" input_transport), s_"Input transport"; - [ L"in-place" ], Getopt.Set in_place, - s_"Only tune the guest in the input VM"; + [ L"in-place" ], Getopt.Set in_place, Getopt.hidden_option_description; [ L"mac" ], Getopt.String ("mac:network|bridge|ip:out", add_mac), s_"Map NIC to network or bridge or assign static IP"; [ S 'n'; L"network" ], Getopt.String ("in:out", add_network), @@ -386,7 +385,6 @@ read the man page virt-v2v(1). pr "vddk\n"; pr "colours-option\n"; pr "vdsm-compat-option\n"; - pr "in-place\n"; pr "io/oo\n"; pr "mac-option\n"; pr "bandwidth-option\n"; @@ -556,6 +554,10 @@ read the man page virt-v2v(1). error (f_"only ‘-it ssh’ can be used here") in Input_vmx.input_vmx input_password input_transport arg in + (* Prevent use of --in-place option in RHEL. *) + if in_place then + error (f_"--in-place cannot be used in RHEL"); + (* Common error message. *) let error_option_cannot_be_used_in_output_mode mode opt = error (f_"-o %s: %s option cannot be used in this output mode") mode opt -- 2.31.1