Rebase to stable branch version 2.0.4

Multiple fixes for -o qemu mode
resolves: rhbz#2074805
Work around blocking bug in OpenStack
resolves: rhbz#2074801
If multiple open-vm-tools packages are installed, remove all (2076436)
For -o rhv-upload wait for VM creation task
resolves: rhbz#1985830
For -i vmx add full support for SATA hard disks
resolves: rhbz#1883802
Fix booting of RHEL 9.1 guests after conversion
resolves: rhbz#2076013

0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch

@@ -1,4 +1,4 @@
-From edf4c32464640086c7046d27df969f052e79cffc Mon Sep 17 00:00:00 2001
+From 4c6b1576ba995798a0016c5c4f42fb03b4ce88ac 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] RHEL: v2v: Select correct qemu binary for -o qemu mode
@@ -16,7 +16,7 @@ support cases.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/output/output_qemu.ml b/output/output_qemu.ml
-index f8d2e171..700de058 100644
+index 29adcba9..579defbd 100644
 --- a/output/output_qemu.ml
 +++ b/output/output_qemu.ml
 @@ -137,7 +137,7 @@ module QEMU = struct

0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch

@@ -1,4 +1,4 @@
-From 2fad059b0a6e161c9e0a5a97c7e00bae10c6d3d2 Mon Sep 17 00:00:00 2001
+From 02f1ebdbd7326f80694f121c651d95704dc368d9 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] RHEL: v2v: Disable the --qemu-boot / -oo qemu-boot option
@@ -81,7 +81,7 @@ index 4e912b6c..7d0bafff 100644
  
  =item B<--quiet>
 diff --git a/output/output_qemu.ml b/output/output_qemu.ml
-index 700de058..3ad98a58 100644
+index 579defbd..08c40139 100644
 --- a/output/output_qemu.ml
 +++ b/output/output_qemu.ml
 @@ -63,6 +63,9 @@ module QEMU = struct

0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch

@@ -1,4 +1,4 @@
-From 1e2b73e4629458ba7aec61a0accd78cdb1f016c8 Mon Sep 17 00:00:00 2001
+From f2173a0cf42ede328a3c613ac648380ce86b47dc 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] RHEL: Fix list of supported sound cards to match RHEL qemu

0004-RHEL-Fixes-for-libguestfs-winsupport.patch

@@ -1,4 +1,4 @@
-From 29d999ed093cd3b957f0f375a7c8890c11aa3183 Mon Sep 17 00:00:00 2001
+From 4b4ead25912ee5ade2e628318cc4e1e4d74c027c 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] RHEL: Fixes for libguestfs-winsupport.

0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch

@@ -1,4 +1,4 @@
-From 3868df96a8b18fddb458c5b422fceb5f7c094fd1 Mon Sep 17 00:00:00 2001
+From f197a2bac96aeb6de6a562b5581404ee115abe98 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] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671)

0006-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch

@@ -1,4 +1,4 @@
-From c9998b7a257a709bb1c19509037e268cef1189d7 Mon Sep 17 00:00:00 2001
+From 39ffa687155c8128a4f5522bb1fd0f85f7a91709 Mon Sep 17 00:00:00 2001
 From: Pino Toscano <ptoscano@redhat.com>
 Date: Wed, 8 Mar 2017 11:03:40 +0100
 Subject: [PATCH] RHEL: v2v: do not mention SUSE Xen hosts (RHBZ#1430203)

0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch

@@ -1,4 +1,4 @@
-From 83e27ad543d3c5fb3aed514d98a52a8ef17d07a7 Mon Sep 17 00:00:00 2001
+From eabbcf32e4dac9bf98e5b2c6fd8cd1c26b6dcfd0 Mon Sep 17 00:00:00 2001
 From: Pino Toscano <ptoscano@redhat.com>
 Date: Tue, 26 Mar 2019 09:42:25 +0100
 Subject: [PATCH] RHEL: point to KB for supported v2v hypervisors/guests

0008-RHEL-Disable-o-glance.patch

@@ -1,4 +1,4 @@
-From 4bb8bdee09063d20b64b67972a777e5050c06018 Mon Sep 17 00:00:00 2001
+From b0bc2ed33be2e098a4f22d9687be3e11b5c4e0a7 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Wed, 30 Jun 2021 11:15:52 +0100
 Subject: [PATCH] RHEL: Disable -o glance

0009-RHEL-Remove-the-in-place-option.patch

@@ -1,4 +1,4 @@
-From b463db43b01f93d94a9e1d6fb283acadb507802c Mon Sep 17 00:00:00 2001
+From 7f5478bbeb20579634017aedd32bd9414ac12c58 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 2 Dec 2021 11:56:05 +0000
 Subject: [PATCH] RHEL: Remove the --in-place option
@@ -7,8 +7,9 @@ This disables the virt-v2v --in-place option which we do not
 wish to support in RHEL.
 ---
  docs/virt-v2v.pod | 8 --------
+ tests/Makefile.am | 1 -
  v2v/v2v.ml        | 8 --------
- 2 files changed, 16 deletions(-)
+ 3 files changed, 17 deletions(-)
 
 diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
 index 84e049cc..7ad22f00 100644
@@ -43,6 +44,18 @@ index 84e049cc..7ad22f00 100644
  L<virt-customize(1)>,
  L<virt-df(1)>,
  L<virt-filesystems(1)>,
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 03d0be29..e44adaef 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 \
 diff --git a/v2v/v2v.ml b/v2v/v2v.ml
 index 41e020cb..e00f9814 100644
 --- a/v2v/v2v.ml

0010-input-i-vmx-Add-support-for-NVMe-devices.patch

@@ -1,295 +0,0 @@
-From 2bafd4d5019b9354f925fda85f841554547db826 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Mon, 4 Apr 2022 15:26:18 +0100
-Subject: [PATCH] input: -i vmx: Add support for NVMe devices
-
-We model NVMe devices in the source hypervisor.
-
-We currently assume that no one is using the namespaces feature of
-NVMe, ie. that each source device will appear in a Linux guest as
-/dev/nvme0n1, /dev/nvme1n1, etc.  We could fix this if it is a
-problem, but it requires adjusting the current assumption for
-removable devices that slots are simple integers.
-
-The devices are mapped to virtio-blk, so in the target the device name
-has to change from /dev/nvme0 to /dev/vda (etc.)
-
-Reported-by: Ming Xie
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2070530
-Reviewed-by: Laszlo Ersek <lersek@redhat.com>
-(cherry picked from commit 75872bf282d7f2322110caca70963717b43806b1)
----
- convert/convert_linux.ml         |  4 +-
- convert/target_bus_assignment.ml |  4 +-
- input/parse_domain_from_vmx.ml   | 26 +++++++++-
- lib/types.ml                     |  3 +-
- lib/types.mli                    |  2 +-
- tests/test-v2v-i-vmx-6.expected  | 22 +++++++++
- tests/test-v2v-i-vmx-6.vmx       | 84 ++++++++++++++++++++++++++++++++
- tests/test-v2v-i-vmx.sh          |  4 +-
- 8 files changed, 140 insertions(+), 9 deletions(-)
- create mode 100644 tests/test-v2v-i-vmx-6.expected
- create mode 100644 tests/test-v2v-i-vmx-6.vmx
-
-diff --git a/convert/convert_linux.ml b/convert/convert_linux.ml
-index d9397cfa..c2bbce03 100644
---- a/convert/convert_linux.ml
-+++ b/convert/convert_linux.ml
-@@ -1032,7 +1032,9 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ =
-                ide_block_prefix ^ drive_name i
-             | Some (Source_virtio_SCSI | Source_SCSI | Source_SATA) ->
-                "sd" ^ drive_name i
--            | Some Source_virtio_blk -> "vd" ^ drive_name i in
-+            | Some Source_virtio_blk -> "vd" ^ drive_name i
-+            (* For NVMe assume no one is using namespaces. *)
-+            | Some Source_NVME -> sprintf "nvme%dn1" i in
-           let source_dev = device_name_before_conversion i in
-           let target_dev = block_prefix_after_conversion ^ drive_name i in
-           source_dev, target_dev
-diff --git a/convert/target_bus_assignment.ml b/convert/target_bus_assignment.ml
-index 4b56a6e1..f8675cf2 100644
---- a/convert/target_bus_assignment.ml
-+++ b/convert/target_bus_assignment.ml
-@@ -73,8 +73,8 @@ let rec target_bus_assignment source_disks source_removables guestcaps =
-              | None -> ide_bus (* Wild guess, but should be safe. *)
-              | Some Source_virtio_blk -> virtio_blk_bus
-              | Some Source_IDE -> ide_bus
--             | Some (Source_virtio_SCSI | Source_SCSI | Source_SATA) ->
--                scsi_bus in
-+             | Some (Source_virtio_SCSI | Source_SCSI | Source_SATA |
-+                     Source_NVME) -> scsi_bus in
- 
-         match r.s_removable_slot with
-         | None ->
-diff --git a/input/parse_domain_from_vmx.ml b/input/parse_domain_from_vmx.ml
-index 730f1177..b812edeb 100644
---- a/input/parse_domain_from_vmx.ml
-+++ b/input/parse_domain_from_vmx.ml
-@@ -103,6 +103,7 @@ let remote_file_exists uri path =
- 
- let rec find_disks vmx vmx_source =
-   find_scsi_disks vmx vmx_source
-+  @ find_nvme_disks vmx vmx_source
-   @ find_ide_disks vmx vmx_source
- 
- (* Find all SCSI hard disks.
-@@ -129,6 +130,27 @@ and find_scsi_disks vmx vmx_source =
-             get_scsi_controller_target is_scsi_controller_target
-             scsi_device_types scsi_controller
- 
-+(* Find all NVMe hard disks.
-+ *
-+ * In the VMX file:
-+ *   nvme0.pcislotnumber = "192"
-+ *   nvme0:0.fileName = "guest.vmdk"
-+ *)
-+and find_nvme_disks vmx vmx_source =
-+  let get_nvme_controller_target ns =
-+    sscanf ns "nvme%d:%d" (fun c t -> c, t)
-+  in
-+  let is_nvme_controller_target ns =
-+    try ignore (get_nvme_controller_target ns); true
-+    with Scanf.Scan_failure _ | End_of_file | Failure _ -> false
-+  in
-+  let nvme_device_types = [ None ] in
-+  let nvme_controller = Source_NVME in
-+
-+  find_hdds vmx vmx_source
-+            get_nvme_controller_target is_nvme_controller_target
-+            nvme_device_types nvme_controller
-+
- (* Find all IDE hard disks.
-  *
-  * In the VMX file:
-@@ -153,12 +175,12 @@ and find_ide_disks vmx vmx_source =
- and find_hdds vmx vmx_source
-               get_controller_target is_controller_target
-               device_types controller =
--  (* Find namespaces matching '(ide|scsi)X:Y' with suitable deviceType. *)
-+  (* Find namespaces matching '(ide|scsi|nvme)X:Y' with suitable deviceType. *)
-   let hdds =
-     Parse_vmx.select_namespaces (
-       function
-       | [ns] ->
--         (* Check the namespace is '(ide|scsi)X:Y' *)
-+         (* Check the namespace is '(ide|scsi|nvme)X:Y' *)
-          if not (is_controller_target ns) then false
-          else (
-            (* Check the deviceType is one we are looking for. *)
-diff --git a/lib/types.ml b/lib/types.ml
-index 5804c7c7..92ed0e52 100644
---- a/lib/types.ml
-+++ b/lib/types.ml
-@@ -56,7 +56,7 @@ and source_disk = {
-   s_disk_id : int;
-   s_controller : s_controller option;
- }
--and s_controller = Source_IDE | Source_SATA | Source_SCSI |
-+and s_controller = Source_IDE | Source_SATA | Source_SCSI | Source_NVME |
-                    Source_virtio_blk | Source_virtio_SCSI
- and source_removable = {
-   s_removable_type : s_removable_type;
-@@ -194,6 +194,7 @@ and string_of_controller = function
-   | Source_IDE -> "ide"
-   | Source_SATA -> "sata"
-   | Source_SCSI -> "scsi"
-+  | Source_NVME -> "nvme"
-   | Source_virtio_blk -> "virtio-blk"
-   | Source_virtio_SCSI -> "virtio-scsi"
- 
-diff --git a/lib/types.mli b/lib/types.mli
-index dd2fe592..37238cd7 100644
---- a/lib/types.mli
-+++ b/lib/types.mli
-@@ -103,7 +103,7 @@ and source_disk = {
- }
- (** A source disk. *)
- 
--and s_controller = Source_IDE | Source_SATA | Source_SCSI |
-+and s_controller = Source_IDE | Source_SATA | Source_SCSI | Source_NVME |
-                    Source_virtio_blk | Source_virtio_SCSI
- (** Source disk controller. *)
- 
-diff --git a/tests/test-v2v-i-vmx-6.expected b/tests/test-v2v-i-vmx-6.expected
-new file mode 100644
-index 00000000..1793b6b9
---- /dev/null
-+++ b/tests/test-v2v-i-vmx-6.expected
-@@ -0,0 +1,22 @@
-+
-+Source guest information (--print-source option):
-+
-+    source name: esx6.7-rhel8.6-nvme-disk
-+hypervisor type: vmware
-+       VM genid: 
-+         memory: 2147483648 (bytes)
-+       nr vCPUs: 1
-+     CPU vendor: 
-+      CPU model: 
-+   CPU topology: 
-+   CPU features: 
-+       firmware: bios
-+        display: 
-+          sound: 
-+disks:
-+	0 [nvme]
-+removable media:
-+
-+NICs:
-+	Network "VM Network" mac: 00:50:56:ac:cf:51 [vmxnet3]
-+
-diff --git a/tests/test-v2v-i-vmx-6.vmx b/tests/test-v2v-i-vmx-6.vmx
-new file mode 100644
-index 00000000..9203c0cf
---- /dev/null
-+++ b/tests/test-v2v-i-vmx-6.vmx
-@@ -0,0 +1,84 @@
-+.encoding = "UTF-8"
-+config.version = "8"
-+virtualHW.version = "14"
-+nvram = "esx6.7-rhel8.6-nvme-disk.nvram"
-+pciBridge0.present = "TRUE"
-+svga.present = "TRUE"
-+pciBridge4.present = "TRUE"
-+pciBridge4.virtualDev = "pcieRootPort"
-+pciBridge4.functions = "8"
-+pciBridge5.present = "TRUE"
-+pciBridge5.virtualDev = "pcieRootPort"
-+pciBridge5.functions = "8"
-+pciBridge6.present = "TRUE"
-+pciBridge6.virtualDev = "pcieRootPort"
-+pciBridge6.functions = "8"
-+pciBridge7.present = "TRUE"
-+pciBridge7.virtualDev = "pcieRootPort"
-+pciBridge7.functions = "8"
-+vmci0.present = "TRUE"
-+hpet0.present = "TRUE"
-+floppy0.present = "FALSE"
-+svga.vramSize = "8388608"
-+memSize = "2048"
-+powerType.powerOff = "default"
-+powerType.suspend = "default"
-+powerType.reset = "default"
-+tools.upgrade.policy = "manual"
-+sched.cpu.units = "mhz"
-+sched.cpu.affinity = "all"
-+vm.createDate = "1648710632879834"
-+sata0.present = "TRUE"
-+nvme0.present = "TRUE"
-+nvme0:0.fileName = "nvme-disk.vmdk"
-+sched.nvme0:0.shares = "normal"
-+sched.nvme0:0.throughputCap = "off"
-+nvme0:0.present = "TRUE"
-+ethernet0.virtualDev = "vmxnet3"
-+ethernet0.networkName = "VM Network"
-+ethernet0.addressType = "vpx"
-+ethernet0.generatedAddress = "00:50:56:ac:cf:51"
-+ethernet0.uptCompatibility = "TRUE"
-+ethernet0.present = "TRUE"
-+sata0:0.startConnected = "FALSE"
-+sata0:0.deviceType = "cdrom-raw"
-+sata0:0.clientDevice = "TRUE"
-+sata0:0.fileName = "emptyBackingString"
-+sata0:0.present = "TRUE"
-+displayName = "esx6.7-rhel8.6-nvme-disk"
-+guestOS = "rhel8-64"
-+toolScripts.afterPowerOn = "TRUE"
-+toolScripts.afterResume = "TRUE"
-+toolScripts.beforeSuspend = "TRUE"
-+toolScripts.beforePowerOff = "TRUE"
-+uuid.bios = "42 2c 17 6d 0b 31 4e 16-82 97 f0 b4 99 0b 86 09"
-+vc.uuid = "50 2c fc c7 be fb b1 48-fc 7d 4b 39 b3 f5 de b5"
-+migrate.hostLog = "esx6.7-rhel8.6-nvme-disk-7585773e.hlog"
-+sched.cpu.min = "0"
-+sched.cpu.shares = "normal"
-+sched.mem.min = "0"
-+sched.mem.minSize = "0"
-+sched.mem.shares = "normal"
-+migrate.encryptionMode = "opportunistic"
-+numa.autosize.cookie = "10001"
-+numa.autosize.vcpu.maxPerVirtualNode = "1"
-+sched.swap.derivedName = "/vmfs/volumes/02155034-b2df70e7/esx6.7-rhel8.6-nvme-disk/esx6.7-rhel8.6-nvme-disk-34965f24.vswp"
-+uuid.location = "56 4d c5 90 b1 ca f0 32-64 99 32 a7 d8 97 27 3a"
-+nvme0:0.redo = ""
-+pciBridge0.pciSlotNumber = "17"
-+pciBridge4.pciSlotNumber = "21"
-+pciBridge5.pciSlotNumber = "22"
-+pciBridge6.pciSlotNumber = "23"
-+pciBridge7.pciSlotNumber = "24"
-+ethernet0.pciSlotNumber = "160"
-+vmci0.pciSlotNumber = "32"
-+sata0.pciSlotNumber = "33"
-+nvme0.pciSlotNumber = "192"
-+vmci0.id = "-1727298039"
-+monitor.phys_bits_used = "43"
-+vmotion.checkpointFBSize = "8388608"
-+vmotion.checkpointSVGAPrimarySize = "8388608"
-+cleanShutdown = "TRUE"
-+softPowerOff = "TRUE"
-+svga.guestBackedPrimaryAware = "TRUE"
-+tools.syncTime = "FALSE"
-\ No newline at end of file
-diff --git a/tests/test-v2v-i-vmx.sh b/tests/test-v2v-i-vmx.sh
-index db870bea..d74ddfaa 100755
---- a/tests/test-v2v-i-vmx.sh
-+++ b/tests/test-v2v-i-vmx.sh
-@@ -39,14 +39,14 @@ rm -f test-v2v-i-vmx-*.actual
- # For the tests to succeed we need at least the fileName (VMDK input
- # files) to exist.
- 
--fns="BZ1308535_21disks.vmdk Fedora-20.vmdk RHEL-7.1-UEFI.vmdk Windows-7-x64.vmdk MSEdge-Win10_preview.vmdk"
-+fns="BZ1308535_21disks.vmdk Fedora-20.vmdk RHEL-7.1-UEFI.vmdk Windows-7-x64.vmdk MSEdge-Win10_preview.vmdk nvme-disk.vmdk"
- for fn in BZ1308535_21disks_{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20}.vmdk; do
-     fns="$fns $fn"
- done
- 
- for fn in $fns; do qemu-img create -f vmdk $fn 512; done
- 
--for i in 1 2 3 4 5; do
-+for i in 1 2 3 4 5 6; do
-     $VG virt-v2v --debug-gc \
-         -i vmx test-v2v-i-vmx-$i.vmx \
-         --print-source > test-v2v-i-vmx-$i.actual
--- 
-2.31.1
-

0010-output-Remove-o-json-mode.patch

@@ -1,4 +1,4 @@
-From e0e826d902b93c136aa116543a765aede70c389a Mon Sep 17 00:00:00 2001
+From 02894a3140efd40e02ce0f13aa76609e1ed87026 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 11 Apr 2022 11:01:46 +0100
 Subject: [PATCH] output: Remove -o json mode
@@ -991,10 +991,10 @@ index 35b62836..00000000
 -  ignore (run_test_tt_main suite);
 -  Printf.fprintf stderr "\n"
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 4b66cb0d..29afd415 100644
+index e44adaef..549d39e1 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -82,7 +82,6 @@ TESTS = \
+@@ -81,7 +81,6 @@ TESTS = \
  	test-v2v-machine-readable.sh \
  	test-v2v-networks-and-bridges.sh \
  	test-v2v-o-glance.sh \
@@ -1002,7 +1002,7 @@ index 4b66cb0d..29afd415 100644
  	test-v2v-o-libvirt.sh \
  	test-v2v-o-null.sh \
  	test-v2v-o-openstack.sh \
-@@ -228,7 +227,6 @@ EXTRA_DIST += \
+@@ -231,7 +230,6 @@ EXTRA_DIST += \
  	test-v2v-networks-and-bridges.sh \
  	test-v2v-networks-and-bridges-expected.xml \
  	test-v2v-o-glance.sh \

0011-output-Remove-unused-dummy.c.patch

@@ -1,4 +1,4 @@
-From 4844b986e88d00e6372aa38f3dbbbc886c6bfa1f Mon Sep 17 00:00:00 2001
+From d96c489a5866c75de6ffdac20847cc5d194c4ad5 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 12 Apr 2022 11:53:45 +0100
 Subject: [PATCH] output: Remove unused dummy.c

0012-tests-Add-NVMe-test-cases-to-EXTRA_DIST.patch

@@ -1,34 +0,0 @@
-From 0bcbd9783fa0a16fd5f58c01303f6c7dbe491fd6 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Tue, 12 Apr 2022 11:49:51 +0100
-Subject: [PATCH] tests: Add NVMe test cases to EXTRA_DIST
-
-Found by running make dist && make maintainer-check-extra-dist
-
-Fixes: commit 75872bf282d7f2322110caca70963717b43806b1
-(cherry picked from commit 2f6ce86474829974fdda68b1cc03a76c2652878d)
----
- tests/Makefile.am | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 29afd415..f02ac8ee 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -214,11 +214,13 @@ EXTRA_DIST += \
- 	test-v2v-i-vmx-3.expected \
- 	test-v2v-i-vmx-4.expected \
- 	test-v2v-i-vmx-5.expected \
-+	test-v2v-i-vmx-6.expected \
- 	test-v2v-i-vmx-1.vmx \
- 	test-v2v-i-vmx-2.vmx \
- 	test-v2v-i-vmx-3.vmx \
- 	test-v2v-i-vmx-4.vmx \
- 	test-v2v-i-vmx-5.vmx \
-+	test-v2v-i-vmx-6.vmx \
- 	test-v2v-in-place.sh \
- 	test-v2v-it-vddk-io-query.sh \
- 	test-v2v-machine-readable.sh \
--- 
-2.31.1
-

sources

@@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.0.3.tar.gz) = 741ab3557d88ce7e6d5c79ba8e158d6f3cf686cf36462deea875405dfd7a869abde898a8bf532c515b4cff9f4bc7271fa4b6fa2153c4e4196aa0a5b6a891c54d
+SHA512 (virt-v2v-2.0.4.tar.gz) = 7afddad3385af3b0955c2e8c045a1c4dd548d0424ef53a2cb99c5cc97b33c1c0775e46c69b285a529348daf273b71742c49db5e41835543de112d10afbc8ca11
-SHA512 (virt-v2v-2.0.3.tar.gz.sig) = eaedff6e7e827ffd2c42b1495b405ceb53578b09dba75136420b1b114781e200c2812562eb7d09ddc81c41d24debf5293a4d5f9977328b86946934a889e79cea
+SHA512 (virt-v2v-2.0.4.tar.gz.sig) = 23cd37c4ac670528091bd8725cf58800c26dd1520192e1445382b9dec2f6d87bab94f7616813112b638b1a03561e1fc63088d591b9da22763b95fce665a5fc1c

virt-v2v.spec

@@ -15,7 +15,7 @@
 
 Name:          virt-v2v
 Epoch:         1
-Version:       2.0.3
+Version:       2.0.4
 Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
@@ -42,10 +42,8 @@ Patch0006:     0006-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
 Patch0007:     0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
 Patch0008:     0008-RHEL-Disable-o-glance.patch
 Patch0009:     0009-RHEL-Remove-the-in-place-option.patch
-Patch0010:     0010-input-i-vmx-Add-support-for-NVMe-devices.patch
+Patch0010:     0010-output-Remove-o-json-mode.patch
-Patch0011:     0011-output-Remove-o-json-mode.patch
+Patch0011:     0011-output-Remove-unused-dummy.c.patch
-Patch0012:     0012-tests-Add-NVMe-test-cases-to-EXTRA_DIST.patch
-Patch0013:     0013-output-Remove-unused-dummy.c.patch
 
 %if !0%{?rhel}
 # libguestfs hasn't been built on i686 for a while since there is no
@@ -319,8 +317,8 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-in-place.1*
 
 
 %changelog
-* Tue Apr 12 2022 Richard W.M. Jones <rjones@redhat.com> - 1:2.0.3-1
+* Tue Apr 12 2022 Richard W.M. Jones <rjones@redhat.com> - 1:2.0.4-1
-- Rebase to stable branch version 2.0.3
+- Rebase to stable branch version 2.0.4
   resolves: rhbz#2059287, rhbz#1658126, rhbz#1788823, rhbz#1854275
 - Fix openssh-clients dependency
   resolves: rhbz#2064178
@@ -338,6 +336,17 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-in-place.1*
   resolves: rhbz#1658128
 - Document permissions when importing OVA using RHV UI
   resolves: rhbz#2039597
+- Multiple fixes for -o qemu mode
+  resolves: rhbz#2074805
+- Work around blocking bug in OpenStack
+  resolves: rhbz#2074801
+- If multiple open-vm-tools packages are installed, remove all (2076436)
+- For -o rhv-upload wait for VM creation task
+  resolves: rhbz#1985830
+- For -i vmx add full support for SATA hard disks
+  resolves: rhbz#1883802
+- Fix booting of RHEL 9.1 guests after conversion
+  resolves: rhbz#2076013
 
 * Tue Feb 15 2022 Richard W.M. Jones <rjones@redhat.com> - 1:1.45.99-1
 - Rebase to upstream 1.45.99.