Add downstream (RHEL-only) patches (RHBZ#1931724).

2021-03-30 12:07:53 +01:00 · 2021-03-30 12:07:53 +01:00 · 6be9aa8e5f
commit 6be9aa8e5f
parent 65fcab520f
10 changed files with 816 additions and 1 deletions
--- a/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
+++ b/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
@ -0,0 +1,33 @@
 From 9918c857eca2ce4efddb4ed9f17dccfc6144471f Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sun, 28 Sep 2014 19:14:43 +0100
 Subject: [PATCH 1/9] RHEL: v2v: Select correct qemu binary for -o qemu mode
 (RHBZ#1147313).
 RHEL does not have qemu-system-x86_64 (etc), and in addition the
 qemu binary is located in /usr/libexec.  Encode the path to this
 binary directly in the script.
 Note that we don't support people running qemu directly like this.
 It's just for quick testing of converted VMs, and to help us with
 support cases.
 ---
 v2v/output_qemu.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/v2v/output_qemu.ml b/v2v/output_qemu.ml
 index d6d70c23..490576e9 100644
 --- a/v2v/output_qemu.ml
 +++ b/v2v/output_qemu.ml
@@ -81,7 +81,7 @@ object
      * module deals with shell and qemu comma quoting.
      *)
     let cmd = Qemuopts.create () in
 -    Qemuopts.set_binary_by_arch cmd (Some guestcaps.gcaps_arch);
 +    Qemuopts.set_binary cmd "/usr/libexec/qemu-kvm";
     let flag = Qemuopts.flag cmd
     and arg = Qemuopts.arg cmd
 -- 
 2.30.1
--- a/0002-RHEL-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch
+++ b/0002-RHEL-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch
@ -0,0 +1,105 @@
 From 51d18cc8da56f5b8395ae2f5edd6b11cda5c84df Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 30 Sep 2014 10:50:27 +0100
 Subject: [PATCH 2/9] RHEL: v2v: Disable the --qemu-boot option (RHBZ#1147313).
 This cannot work because there is no Gtk or SDL output mode
 in RHEL's qemu-kvm.
 In addition you will have to edit the -display option in the
 qemu script.
 ---
 docs/virt-v2v-output-local.pod |  6 ++----
 docs/virt-v2v.pod              | 13 -------------
 v2v/cmdline.ml                 |  3 ++-
 3 files changed, 4 insertions(+), 18 deletions(-)
 diff --git a/docs/virt-v2v-output-local.pod b/docs/virt-v2v-output-local.pod
 index a5f155cb..3a2e6238 100644
 --- a/docs/virt-v2v-output-local.pod
 +++ b/docs/virt-v2v-output-local.pod
@@ -9,7 +9,7 @@ or libvirt
  virt-v2v [-i* options] -o local -os DIRECTORY
 - virt-v2v [-i* options] -o qemu -os DIRECTORY [--qemu-boot]
 + virt-v2v [-i* options] -o qemu -os DIRECTORY
  virt-v2v [-i* options] -o json -os DIRECTORY
                         [-oo json-disks-pattern=PATTERN]
@@ -50,12 +50,10 @@ where C<NAME> is the guest name.
 =item B<-o qemu -os> C<DIRECTORY>
 -=item B<-o qemu -os> C<DIRECTORY> B<--qemu-boot>
 -
 This converts the guest to files in C<DIRECTORY>.  Unlike I<-o local>
 above, a shell script is created which contains the raw qemu command
 you would need to boot the guest.  However the shell script is not
 -run, I<unless> you also add the I<--qemu-boot> option.
 +run.
 =item B<-o json -os> C<DIRECTORY>
 diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
 index 9323ff52..06ddd781 100644
 --- a/docs/virt-v2v.pod
 +++ b/docs/virt-v2v.pod
@@ -144,11 +144,6 @@ Since F<guest-domain.xml> contains the path(s) to the guest disk
 image(s) you do not need to specify the name of the disk image on the
 command line.
 -To convert a local disk image and immediately boot it in local
 -qemu, do:
 -
 - virt-v2v -i disk disk.img -o qemu -os /var/tmp --qemu-boot
 -
 =head1 OPTIONS
 =over 4
@@ -537,9 +532,6 @@ This is similar to I<-o local>, except that a shell script is written
 which you can use to boot the guest in qemu.  The converted disks and
 shell script are written to the directory specified by I<-os>.
 -When using this output mode, you can also specify the I<--qemu-boot>
 -option which boots the guest under qemu immediately.
 -
 =item B<-o> B<rhev>
 This is the same as I<-o rhv>.
@@ -815,11 +807,6 @@ Print information about the source guest and stop.  This option is
 useful when you are setting up network and bridge maps.
 See L</Networks and bridges>.
 -=item B<--qemu-boot>
 -
 -When using I<-o qemu> only, this boots the guest immediately after
 -virt-v2v finishes.
 -
 =item B<-q>
 =item B<--quiet>
 diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml
 index 3b74f307..df69e2e0 100644
 --- a/v2v/cmdline.ml
 +++ b/v2v/cmdline.ml
@@ -284,7 +284,6 @@ let parse_cmdline () =
                                     s_"Estimate size of source and stop";
     [ L"print-source" ], Getopt.Set print_source,
                                     s_"Print source and stop";
 -    [ L"qemu-boot" ], Getopt.Set qemu_boot, s_"Boot in qemu (-o qemu only)";
     [ L"root" ],     Getopt.String ("ask|... ", set_root_choice),
                                     s_"How to choose root filesystem";
     [ L"vddk-config" ], Getopt.String ("filename", set_input_option_compat "vddk-config"),
@@ -668,6 +667,8 @@ read the man page virt-v2v(1).
         | Some d when not (is_directory d) ->
            error (f_"-os %s: output directory does not exist or is not a directory") d
         | Some d -> d in
 +      if qemu_boot then
 +        error (f_"-o qemu: the --qemu-boot option cannot be used in RHEL");
       Output_qemu.output_qemu os qemu_boot,
       output_format, output_alloc
 -- 
 2.30.1
--- a/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
+++ b/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
@ -0,0 +1,34 @@
 From e51db3fdf2b3abde05235f6c14c396eae0048320 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 24 Apr 2015 09:45:41 -0400
 Subject: [PATCH 3/9] RHEL: Fix list of supported sound cards to match RHEL
 qemu (RHBZ#1176493).
 ---
 v2v/utils.ml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 diff --git a/v2v/utils.ml b/v2v/utils.ml
 index 7136e4be..a6c359f0 100644
 --- a/v2v/utils.ml
 +++ b/v2v/utils.ml
@@ -59,13 +59,14 @@ let kvm_arch = function
 (* Does qemu support the given sound card? *)
 let qemu_supports_sound_card = function
   | Types.AC97
 -  | Types.ES1370
   | Types.ICH6
   | Types.ICH9
   | Types.PCSpeaker
 +    -> true
 +  | Types.ES1370
   | Types.SB16
   | Types.USBAudio
 -    -> true
 +    -> false
 (* Find the UEFI firmware. *)
 let find_uefi_firmware guest_arch =
 -- 
 2.30.1
--- a/0004-RHEL-Fix-tests-for-libguestfs-winsupport.patch
+++ b/0004-RHEL-Fix-tests-for-libguestfs-winsupport.patch
@ -0,0 +1,66 @@
 From 709e21ab98a6d207301161e6463dab8a77c87749 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sun, 30 Aug 2015 03:21:57 -0400
 Subject: [PATCH 4/9] RHEL: Fix tests for libguestfs-winsupport.
 It doesn't let us use guestfish for arbitrary Windows edits.
 ---
 tests/test-v2v-virtio-win-iso.sh     | 8 +++++++-
 tests/test-v2v-windows-conversion.sh | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)
 diff --git a/tests/test-v2v-virtio-win-iso.sh b/tests/test-v2v-virtio-win-iso.sh
 index 6e99f0f1..a8e572c5 100755
 --- a/tests/test-v2v-virtio-win-iso.sh
 +++ b/tests/test-v2v-virtio-win-iso.sh
@@ -79,6 +79,12 @@ mktest ()
 :> "$script"
 :> "$expected"
 +cat >> "$script" <<EOF
 +  set-program virt-testing
 +  run
 +  mount /dev/sda2 /
 +EOF
 +
 firstboot_dir="/Program Files/Guestfs/Firstboot"
 mktest "is-dir \"$firstboot_dir\"" true
 mktest "is-file \"$firstboot_dir/firstboot.bat\"" true
@@ -91,7 +97,7 @@ for drv in netkvm vioscsi viostor; do
     done
 done
 -guestfish --ro -a "$d/windows-sda" -i < "$script" > "$response"
 +guestfish --ro -a "$d/windows-sda" < "$script" > "$response"
 diff -u "$expected" "$response"
 rm -r $d
 diff --git a/tests/test-v2v-windows-conversion.sh b/tests/test-v2v-windows-conversion.sh
 index f1da222a..ff94fe39 100755
 --- a/tests/test-v2v-windows-conversion.sh
 +++ b/tests/test-v2v-windows-conversion.sh
@@ -73,6 +73,12 @@ mktest ()
 :> "$script"
 :> "$expected"
 +cat >> "$script" <<EOF
 +  set-program virt-testing
 +  run
 +  mount /dev/sda2 /
 +EOF
 +
 firstboot_dir="/Program Files/Guestfs/Firstboot"
 mktest "is-dir \"$firstboot_dir\"" true
 mktest "is-file \"$firstboot_dir/firstboot.bat\"" true
@@ -85,7 +91,7 @@ for drv in netkvm qxl vioscsi viostor; do
     done
 done
 -guestfish --ro -a "$d/windows-sda" -i < "$script" > "$response"
 +guestfish --ro -a "$d/windows-sda" < "$script" > "$response"
 diff -u "$expected" "$response"
 # We also update the Registry several times, for firstboot, and (ONLY
 -- 
 2.30.1
--- a/0005-RHEL-v2v-Disable-the-virt-v2v-in-place-option.patch
+++ b/0005-RHEL-v2v-Disable-the-virt-v2v-in-place-option.patch
@ -0,0 +1,288 @@
 From 4773fdcb0be3517e658c8bf08ed65537851e43dc Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 14 Jan 2016 11:53:42 -0500
 Subject: [PATCH 5/9] 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 dd2b1233..8fef46cc 100755
 --- a/docs/test-v2v-docs.sh
 +++ b/docs/test-v2v-docs.sh
@@ -27,6 +27,7 @@ $top_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 06ddd781..50b0bc8e 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</In-place conversion>
 -below.)
 =head2 Other virt-v2v topics
@@ -301,20 +294,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</In-place conversion> below.
 -
 -Conflicts with all I<-o *> options.
 -
 =item B<-io> OPTION=VALUE
 Set input option(s) related to the current input mode or transport.
@@ -1332,8 +1311,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
@@ -1471,31 +1450,6 @@ that instead.
    </devices>
  </domain>
 -=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<converted_vm> in the
 -C<qemu:///system> 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 871dc3c9..eee4e1af 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
@@ -76,7 +76,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 \
@@ -225,7 +224,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 6f7d78f3..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
 -
 -$TEST_FUNCTIONS
 -skip_if_skipped
 -skip_if_backend uml
 -skip_unless_phony_guest windows.img
 -
 -img_base="$abs_top_builddir/test-data/phony-guests/windows.img"
 -
 -export VIRT_TOOLS_DATA_DIR="$top_srcdir/test-data/fake-virt-tools"
 -export VIRTIO_WIN="$top_srcdir/test-data/fake-virtio-win"
 -
 -d=$PWD/test-v2v-in-place.d
 -rm -rf $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 <<EOF
 -<node>
 -  <domain type='test'>
 -    <name>$n</name>
 -    <memory>1048576</memory>
 -    <os>
 -      <type>hvm</type>
 -      <boot dev='hd'/>
 -    </os>
 -    <devices>
 -      <disk type='file' device='disk'>
 -        <driver name='qemu' type='qcow2'/>
 -        <source file='$img'/>
 -        <target dev='vda' bus='virtio'/>
 -      </disk>
 -    </devices>
 -  </domain>
 -</node>
 -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)"
 -
 -# Clean up.
 -rm -r $d
 diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml
 index df69e2e0..7b79d462 100644
 --- a/v2v/cmdline.ml
 +++ b/v2v/cmdline.ml
@@ -252,8 +252,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),
@@ -396,7 +395,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";
@@ -572,6 +570,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.30.1
--- a/0006-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
+++ b/0006-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
@ -0,0 +1,26 @@
 From a128631fded7e2c4e45fcf4304945ca430296944 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 2 Mar 2017 14:21:37 +0100
 Subject: [PATCH 6/9] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671)
 The SDL output mode is not supported in RHEL's qemu-kvm.
 ---
 v2v/input_disk.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml
 index d146e84c..4e403003 100644
 --- a/v2v/input_disk.ml
 +++ b/v2v/input_disk.ml
@@ -89,7 +89,7 @@ class input_disk input_format disk = object
       s_features = [ "acpi"; "apic"; "pae" ];
       s_firmware = UnknownFirmware;       (* causes virt-v2v to autodetect *)
       s_display =
 -        Some { s_display_type = Window; s_keymap = None; s_password = None;
 +        Some { s_display_type = VNC; s_keymap = None; s_password = None;
                s_listen = LNoListen; s_port = None };
       s_video = None;
       s_sound = None;
 -- 
 2.30.1
--- a/0007-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
+++ b/0007-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
@ -0,0 +1,26 @@
 From c72bbcd9b22408023c686e64040db2693dd70467 Mon Sep 17 00:00:00 2001
 From: Pino Toscano <ptoscano@redhat.com>
 Date: Wed, 8 Mar 2017 11:03:40 +0100
 Subject: [PATCH 7/9] RHEL: v2v: do not mention SUSE Xen hosts (RHBZ#1430203)
 They are not supported in RHEL.
 ---
 docs/virt-v2v-input-xen.pod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/docs/virt-v2v-input-xen.pod b/docs/virt-v2v-input-xen.pod
 index 3b3cf0f0..32da2848 100644
 --- a/docs/virt-v2v-input-xen.pod
 +++ b/docs/virt-v2v-input-xen.pod
@@ -12,7 +12,7 @@ virt-v2v-input-xen - Using virt-v2v to convert guests from Xen
 =head1 DESCRIPTION
 This page documents how to use L<virt-v2v(1)> to convert guests from
 -RHEL 5 Xen, or SLES and OpenSUSE Xen hosts.
 +RHEL 5 Xen hosts.
 =head1 INPUT FROM XEN
 -- 
 2.30.1
--- a/0008-RHEL-v2v-rhv-upload-Remove-restriction-on-oa-sparse.patch
+++ b/0008-RHEL-v2v-rhv-upload-Remove-restriction-on-oa-sparse.patch
@ -0,0 +1,89 @@
 From 4663022f13c209260341b4586ef8787cfe158ea5 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 14 May 2018 10:16:58 +0100
 Subject: [PATCH 8/9] RHEL: v2v: rhv-upload: Remove restriction on -oa sparse.
 See: https://bugzilla.redhat.com/show_bug.cgi?id=1565681
 and the v2v-devel private thread "Do we already support migration using FC?"
 ---
 docs/virt-v2v-output-rhv.pod |  8 +-------
 v2v/output_rhv_upload.ml     | 10 +---------
 v2v/rhv-upload-plugin.py     |  4 +---
 3 files changed, 3 insertions(+), 19 deletions(-)
 diff --git a/docs/virt-v2v-output-rhv.pod b/docs/virt-v2v-output-rhv.pod
 index 7c9b478a..36c3676f 100644
 --- a/docs/virt-v2v-output-rhv.pod
 +++ b/docs/virt-v2v-output-rhv.pod
@@ -5,7 +5,7 @@ virt-v2v-output-rhv - Using virt-v2v to convert guests to oVirt or RHV
 =head1 SYNOPSIS
  virt-v2v [-i* options] -o rhv-upload [-oc ENGINE_URL] -os STORAGE
 -                        [-op PASSWORD] [-of raw]
 +                        [-op PASSWORD]
                         [-oo rhv-cafile=FILE]
                         [-oo rhv-cluster=CLUSTER]
                         [-oo rhv-direct]
@@ -79,12 +79,6 @@ username is not specified then virt-v2v defaults to using
 C<admin@internal> which is the typical superuser account for oVirt
 instances.
 -=item I<-of raw>
 -
 -Currently you must use I<-of raw> and you cannot use I<-oa preallocated>.
 -
 -These restrictions will be loosened in a future version.
 -
 =item I<-op> F<password-file>
 A file containing a password to be used when connecting to the oVirt
 diff --git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml
 index dbef7011..27925d7d 100644
 --- a/v2v/output_rhv_upload.ml
 +++ b/v2v/output_rhv_upload.ml
@@ -135,17 +135,10 @@ let error_unless_nbdkit_compiled_with_selinux config =
       error (f_"nbdkit was compiled without SELinux support.  You will have to recompile nbdkit with libselinux-devel installed, or else set SELinux to Permissive mode while doing the conversion.")
   )
 -(* Output sparse must be sparse.  We may be able to
 - * lift this limitation in future, but it requires changes on the
 - * RHV side.  See TODO file for details.  XXX
 - *)
 +(* Output format must be raw. *)
 let error_current_limitation required_param =
   error (f_"rhv-upload: currently you must use ‘%s’.  This restriction will be loosened in a future version.") required_param
 -let error_unless_output_alloc_sparse output_alloc =
 -  if output_alloc <> Sparse then
 -    error_current_limitation "-oa sparse"
 -
 let json_optstring = function
   | Some s -> JSON.String s
   | None -> JSON.Null
@@ -253,7 +246,6 @@ object
     error_unless_nbdkit_min_version config;
     error_unless_nbdkit_python_plugin_working plugin_script;
     error_unless_nbdkit_compiled_with_selinux config;
 -    error_unless_output_alloc_sparse output_alloc;
     (* Python code prechecks. *)
     let precheck_fn = tmpdir // "v2vprecheck.json" in
 diff --git a/v2v/rhv-upload-plugin.py b/v2v/rhv-upload-plugin.py
 index 2b0178a9..d817d915 100644
 --- a/v2v/rhv-upload-plugin.py
 +++ b/v2v/rhv-upload-plugin.py
@@ -491,10 +491,8 @@ def create_disk(connection):
             # size, based on qemu-img measure of the overlay.
             initial_size=params['disk_size'],
             provisioned_size=params['disk_size'],
 -            # XXX Ignores params['output_sparse'].
 -            # Handling this properly will be complex, see:
             # https://www.redhat.com/archives/libguestfs/2018-March/msg00177.html
 -            sparse=True,
 +            sparse=params['output_sparse'],
             storage_domains=[
                 types.StorageDomain(
                     name=params['output_storage'],
 -- 
 2.30.1
--- a/0009-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
+++ b/0009-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
@ -0,0 +1,127 @@
 From 3fcf10ae7beaaf2de969b732afb35c9a5c36f52b Mon Sep 17 00:00:00 2001
 From: Pino Toscano <ptoscano@redhat.com>
 Date: Tue, 26 Mar 2019 09:42:25 +0100
 Subject: [PATCH 9/9] RHEL: point to KB for supported v2v hypervisors/guests
 ---
 docs/virt-v2v-support.pod | 104 ++------------------------------------
 1 file changed, 4 insertions(+), 100 deletions(-)
 diff --git a/docs/virt-v2v-support.pod b/docs/virt-v2v-support.pod
 index 9815f51f..1ffc0f9d 100644
 --- a/docs/virt-v2v-support.pod
 +++ b/docs/virt-v2v-support.pod
@@ -8,106 +8,10 @@ systems and guests in virt-v2v
 This page documents which foreign hypervisors, virtualization
 management systems and guest types that L<virt-v2v(1)> can support.
 -Note this page applies to upstream virt-v2v from
 -L<http://libguestfs.org> and in downstream distributions of virt-v2v
 -sometimes features are intentionally removed, or are present but not
 -supported.
 -
 -=head2 Hypervisors (Input)
 -
 -=over 4
 -
 -=item VMware ESXi
 -
 -Must be managed by VMware vCenter E<ge> 5.0 unless VDDK is available.
 -
 -=item OVA exported from VMware
 -
 -OVAs from other hypervisors will not work.
 -
 -=item VMX from VMware
 -
 -VMX files generated by other hypervisors will not work.
 -
 -=item RHEL 5 Xen
 -
 -=item SUSE Xen
 -
 -=item Citrix Xen
 -
 -Citrix Xen has not been recently tested.
 -
 -=item Hyper-V
 -
 -Not recently tested.  Requires that you export the disk or use
 -L<virt-p2v(1)> on Hyper-V.
 -
 -=item Direct from disk images
 -
 -Only disk images exported from supported hypervisors, and using
 -container formats supported by qemu.
 -
 -=item Physical machines
 -
 -Using the L<virt-p2v(1)> tool.
 -
 -=back
 -
 -=head2 Hypervisors (Output)
 -
 -QEMU and KVM only.
 -
 -=head2 Virtualization management systems (Output)
 -
 -=over 4
 -
 -=item OpenStack
 -
 -=item Red Hat Virtualization (RHV) 4.1 and up
 -
 -=item Local libvirt
 -
 -And hence L<virsh(1)>, L<virt-manager(1)>, and similar tools.
 -
 -=item Local disk
 -
 -=back
 -
 -=head2 Guests
 -
 -=over 4
 -
 -=item Red Hat Enterprise Linux 3, 4, 5, 6, 7
 -
 -=item CentOS 3, 4, 5, 6, 7
 -
 -=item Scientific Linux 3, 4, 5, 6, 7
 -
 -=item Oracle Linux
 -
 -=item Fedora
 -
 -=item SLES 10 and up
 -
 -=item OpenSUSE 10 and up
 -
 -=item ALT Linux 9 and up
 -
 -=item Debian 6 and up
 -
 -=item Ubuntu 10.04, 12.04, 14.04, 16.04, and up
 -
 -=item Windows XP to Windows 10 / Windows Server 2016
 -
 -We use Windows internal version numbers, see
 -L<https://en.wikipedia.org/wiki/List_of_Microsoft_Windows_versions>
 -
 -Currently NT 5.2 to NT 6.3 are supported.
 -
 -See L</WINDOWS> below for additional notes on converting Windows
 -guests.
 -
 -=back
 +For more information on supported hypervisors, and guest types in
 +RHEL, please consult the following Knowledgebase article on these
 +Red Hat Customer Portal:
 +L<https://access.redhat.com/articles/1351473>.
 =head2 Guest firmware
 -- 
 2.30.1
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@ -2,7 +2,12 @@
 %global verify_tarball_signature 1
 # If there are patches which touch autotools files, set this to 1.
 %if !0%{?rhel}
 %global patches_touch_autotools %{nil}
 %else
 # On RHEL the downstream patches always touch autotools files.
 %global patches_touch_autotools 1
 %endif
 # The source directory.
 %global source_directory 1.43-development
@ -10,7 +15,7 @@
 Name:          virt-v2v
 Epoch:         1
 Version:       1.43.4
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 License:       GPLv2+
@ -43,6 +48,19 @@ ExcludeArch:   %{ix86}
 ExclusiveArch: x86_64
 %endif
 # Downstream (RHEL-only) patches.
 %if 0%{?rhel}
 Patch9001:     0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
 Patch9002:     0002-RHEL-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch
 Patch9003:     0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
 Patch9004:     0004-RHEL-Fix-tests-for-libguestfs-winsupport.patch
 Patch9005:     0005-RHEL-v2v-Disable-the-virt-v2v-in-place-option.patch
 Patch9006:     0006-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
 Patch9007:     0007-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
 Patch9008:     0008-RHEL-v2v-rhv-upload-Remove-restriction-on-oa-sparse.patch
 Patch9009:     0009-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
 %endif
 %if 0%{patches_touch_autotools}
 BuildRequires: autoconf, automake, libtool
 %endif
@ -265,6 +283,9 @@ rm $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/virt-v2v-copy-to-local
 %changelog
 * Tue Mar 30 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.43.4-3
 - Add downstream (RHEL-only) patches (RHBZ#1931724).
 * Mon Mar  8 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.43.4-2
 - Bump and rebuild for ocaml-gettext update.