Log the version of libnbd / nbdcopy in virt-v2v output

resolves: RHEL-104018

0001-docs-Move-oo-verify-server-certificate-docs-to-alpha.patch

@@ -1,10 +1,12 @@
-From 378967fc4984af4f06c586886a1148aebede8cff Mon Sep 17 00:00:00 2001
+From 7566e3e433bd6ea44785b08164506fd013fe2b51 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 8 Jul 2025 11:11:48 +0100
 Subject: [PATCH] docs: Move -oo verify-server-certificate docs to alphabetical
  place
 
 This option wasn't in alphabetical order.
+
+(cherry picked from commit 378967fc4984af4f06c586886a1148aebede8cff)
 ---
  docs/virt-v2v.pod | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)

0002-input-input_vddk.ml-Fix-escaping-of-export-.-paramet.patch

@@ -1,4 +1,4 @@
-From 5461976e229873a203062848c0de30e70067b3fb Mon Sep 17 00:00:00 2001
+From c2c829eb22add09de338da065214c9b6aced42e2 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 10 Jul 2025 09:13:54 +0100
 Subject: [PATCH] input/input_vddk.ml: Fix escaping of export=... parameter
@@ -37,15 +37,16 @@ nbdkit >= 1.44 is installed.
 Reported-by: Ming Xie
 Fixes: commit 076727e55f4d4fed246097d3f89ebfe83e3de88f
 Fixes: https://issues.redhat.com/browse/RHEL-102734
+(cherry picked from commit 5461976e229873a203062848c0de30e70067b3fb)
 ---
  input/input_vddk.ml | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/input/input_vddk.ml b/input/input_vddk.ml
-index fc09c532..e88befa2 100644
+index b70d76fb..39356129 100644
 --- a/input/input_vddk.ml
 +++ b/input/input_vddk.ml
-@@ -418,7 +418,7 @@ See also the virt-v2v-input-vmware(1) manual.") libNN
+@@ -446,7 +446,7 @@ See also the virt-v2v-input-vmware(1) manual.") libNN
          let wildcard =
            match files with
            | [] -> assert false (* can't happen, see assert above *)
@@ -54,7 +55,7 @@ index fc09c532..e88befa2 100644
            | files ->
               (* Calculate the longest common prefix across all the files,
                * then set the wildcard to this.
-@@ -426,8 +426,7 @@ See also the virt-v2v-input-vmware(1) manual.") libNN
+@@ -454,8 +454,7 @@ See also the virt-v2v-input-vmware(1) manual.") libNN
                * XXX Is every file we want to read called *.vmdk?
                *)
               let prefix = String.longest_common_prefix files in

0003-Modify-configure_pnputil_install-script-to-check.patch

@@ -1,4 +1,4 @@
-From 594b05d6940c8719167d10c0cdfaa253349060ab Mon Sep 17 00:00:00 2001
+From 5fda965d292bd1b5b62e47d357ddf046dfa007b6 Mon Sep 17 00:00:00 2001
 From: Vadim Rozenfeld <vrozenfe@redhat.com>
 Date: Thu, 10 Jul 2025 10:12:56 +1000
 Subject: [PATCH] Modify configure_pnputil_install script to check pending
@@ -10,6 +10,7 @@ the result of PnPUtil driver installation attempt.
 Related: https://issues.redhat.com/browse/RHEL-100682
 
 Signed-off-by: Vadim Rozenfeld <vrozenfe@redhat.com>
+(cherry picked from commit 594b05d6940c8719167d10c0cdfaa253349060ab)
 ---
  convert/convert_windows.ml | 48 +++++++++++++++++++++++++++++++++++---
  1 file changed, 45 insertions(+), 3 deletions(-)

0004-Update-the-common-submodule.patch

@@ -1,4 +1,4 @@
-From 3e08788aaebf96d86452dc2c88d610dc0b72d02e Mon Sep 17 00:00:00 2001
+From 1162c9c21497e24e3388689fd2c58e8dfa043bc4 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Sun, 13 Jul 2025 12:29:28 +0100
 Subject: [PATCH] Update the common submodule
@@ -16,6 +16,7 @@ configure_pnputil_install script to check pending reboot status and
 report PnPUtil execution status") to work properly.
 
 Updates: commit 594b05d6940c8719167d10c0cdfaa253349060ab
+(cherry picked from commit 3e08788aaebf96d86452dc2c88d610dc0b72d02e)
 ---
  common | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

0005-Ignore-ERROR_NO_MORE_ITEMS-status-from-PnPUtil.patch

@@ -1,4 +1,4 @@
-From 656d7a430e17dc3f4d41f625c056527c576f4381 Mon Sep 17 00:00:00 2001
+From 90376739e05166de15a94637f64e6b2256f5d90a Mon Sep 17 00:00:00 2001
 From: Vadim Rozenfeld <vrozenfe@redhat.com>
 Date: Tue, 15 Jul 2025 18:35:16 +1000
 Subject: [PATCH] Ignore ERROR_NO_MORE_ITEMS status from PnPUtil.
@@ -7,7 +7,7 @@ This status indicates the target device already has a
 better or newer driver installed.
 
 Signed-off-by: Vadim Rozenfeld <vrozenfe@redhat.com>
-(cherry picked from commit e445c45d9c2b0e5411730b3e737e067e03d6316d)
+(cherry picked from commit 523aff28975532a4fe715193c28c2ede21741392)
 ---
  convert/convert_windows.ml | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

0006-v2v-Print-the-version-of-libnbd-nbdcopy-in-debug-out.patch

@@ -0,0 +1,50 @@
+From 4835c9c91cff55f1411a0413c1469e212124ba03 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Wed, 16 Jul 2025 13:10:01 +0100
+Subject: [PATCH] v2v: Print the version of libnbd / nbdcopy in debug output
+
+We didn't previously log the version of libnbd or nbdcopy, and nbdcopy
+itself won't tell us (because we don't use the nbdcopy --verbose
+option).  However this information can be useful to know.  This commit
+enhances the verbose output of virt-v2v to include this.
+
+With current versions of nbdcopy it will look like this:
+
+  info: nbdcopy version:
+  nbdcopy 1.23.4
+  libnbd 1.23.4
+
+Note the second line is the version of the installed library, which in
+some (very unusual, and probably broken) situations might be different
+from the version of the nbdcopy binary, which is why both are logged.
+
+libnbd 1.23.5 will soon enhance the output to include the downstream
+package version (such as the RPM version) which is even more useful.
+In future the output will look like:
+
+  info: nbdcopy version:
+  nbdcopy 1.23.5 (libnbd-1.23.5-1.fc43)
+  libnbd 1.23.5 (libnbd-1.23.5-1.fc43)
+
+See: https://gitlab.com/nbdkit/libnbd/-/merge_requests/28
+(cherry picked from commit a8a0caf54ccaf52db70988494b6f5a397a1af105)
+---
+ v2v/v2v.ml | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/v2v/v2v.ml b/v2v/v2v.ml
+index d32993d4..c780ab1d 100644
+--- a/v2v/v2v.ml
++++ b/v2v/v2v.ml
+@@ -469,6 +469,11 @@ read the man page virt-v2v(1).
+   (* Do the copy. *)
+   with_open_out (v2vdir // "copy") (fun _ -> ());
+ 
++  if verbose () then (
++    eprintf "info: nbdcopy version:\n%!";
++    ignore (Sys.command (sprintf "%s --version >&2" Config.nbdcopy))
++  );
++
+   (* Get the list of disks and corresponding NBD URIs. *)
+   let disks =
+     List.combine input_disks output_disks |>

0007-vddk-Remove-io-vddk-noextents-option.patch

@@ -1,4 +1,4 @@
-From 563c581fd0d68792211edf15632bac3f419888b7 Mon Sep 17 00:00:00 2001
+From ef40dab47ba94ca47e6a268853d415d9311aca04 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Wed, 9 Jul 2025 09:38:50 +0100
 Subject: [PATCH] vddk: Remove -io vddk-noextents option
@@ -33,7 +33,7 @@ index 49082a96..1cdbef15 100644
    + nbdkit-retry-filter
  
 diff --git a/input/input_vddk.ml b/input/input_vddk.ml
-index b70d76fb..ffc844fb 100644
+index 39356129..12f43729 100644
 --- a/input/input_vddk.ml
 +++ b/input/input_vddk.ml
 @@ -58,7 +58,6 @@ All other settings are optional:

0008-curl-ssh-vddk-file-Add-nbdkit-count-filter.patch

@@ -1,4 +1,4 @@
-From df5f8c53e55e08f5468b7606ad499aaf09a34a38 Mon Sep 17 00:00:00 2001
+From cdb7ffa3a378a1832c92f40aef9e7dd6d8d093ff Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Wed, 9 Jul 2025 09:48:35 +0100
 Subject: [PATCH] curl, ssh, vddk, file: Add nbdkit-count-filter
@@ -39,7 +39,7 @@ index 1cdbef15..407869b4 100644
    + nbdkit-multi-conn-filter
    + nbdkit-rate-filter
 diff --git a/input/input_vddk.ml b/input/input_vddk.ml
-index ffc844fb..fc09c532 100644
+index 12f43729..e88befa2 100644
 --- a/input/input_vddk.ml
 +++ b/input/input_vddk.ml
 @@ -313,6 +313,13 @@ See also the virt-v2v-input-vmware(1) manual.") libNN

0009-o-kubevirt-Add-oo-disk-to-allow-disk-names-to-be-ove.patch

@@ -1,4 +1,4 @@
-From 0d65b284930045f112542d9eaf6dd488efd98245 Mon Sep 17 00:00:00 2001
+From 71d68738920971f0216cfe77f6873a518369045f Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 8 Jul 2025 10:40:48 +0100
 Subject: [PATCH] -o kubevirt: Add -oo disk to allow disk names to be

0010-output-Add-optional-create-parameter.patch

@@ -1,4 +1,4 @@
-From fb5722adb2b9336183c866295362b94abf07eb2f Mon Sep 17 00:00:00 2001
+From ab8623d45801d50e0d9450033ba74a31fdb872fc Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 8 Jul 2025 11:08:08 +0100
 Subject: [PATCH] output: Add optional ?create parameter

0011-o-kubevirt-Add-oo-create-false-to-avoid-disk-creatio.patch

@@ -1,4 +1,4 @@
-From 667a69fb8ddd7d27388a1b31af022158c533c0bb Mon Sep 17 00:00:00 2001
+From b0ac37f6c9f6ab8da44e631e9cb6af5649548634 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 8 Jul 2025 11:15:56 +0100
 Subject: [PATCH] -o kubevirt: Add -oo create=false to avoid disk creation

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

@@ -1,4 +1,4 @@
-From af2f0ee226fc824647543f89339db7667291ba67 Mon Sep 17 00:00:00 2001
+From 2cdab0acc99796d9e885697c6d9e50255bb3956b 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.

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

@@ -1,4 +1,4 @@
-From 8d56fe97f76f2f98c3e752435afd77b8a7a81829 Mon Sep 17 00:00:00 2001
+From de879aad4bd0d17e884d571da3348965a9d02756 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

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

@@ -1,4 +1,4 @@
-From 75607a51efa706a1cc6afc1272008ea47e52f9a3 Mon Sep 17 00:00:00 2001
+From 21c7424d64065fe77d4bfd6c05f0ca85e0a08229 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

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

@@ -1,4 +1,4 @@
-From a43b6a7b27aba25bffd67a52660b06d283f0ebf3 Mon Sep 17 00:00:00 2001
+From 04ee519268f9805ac0a9c54fe20e26ccb99c8550 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

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

@@ -1,4 +1,4 @@
-From 3938fddacc27ae3c0fc4a71d8859fd5cf38429d1 Mon Sep 17 00:00:00 2001
+From 4f5301bfa39c09df4ce4368abbafcb53ea139efc 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)

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

@@ -1,4 +1,4 @@
-From 3fd0b3841fdd3fad3700486668a821b08bd1f6eb Mon Sep 17 00:00:00 2001
+From a3ca5d7c85f44c55bccc8b964e00e4937a54a3b4 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

0018-RHEL-Remove-input-from-Xen.patch

@@ -1,4 +1,4 @@
-From 950dddbd2b40c9354b5276c6899f4b0b58b5aeb9 Mon Sep 17 00:00:00 2001
+From ef4fb3f73251ee72eb2c2c2e1f20a4392dc8a299 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 8 Jul 2024 09:35:54 +0100
 Subject: [PATCH] RHEL: Remove input from Xen
@@ -530,7 +530,7 @@ index a5eb1433..bbf0180f 100644
           * deliberately not supporting this in new virt-v2v.  Don't
           * use virt-v2v if a guest already runs on KVM.
 diff --git a/v2v/v2v.ml b/v2v/v2v.ml
-index d32993d4..fe9ed756 100644
+index c780ab1d..1811f9e6 100644
 --- a/v2v/v2v.ml
 +++ b/v2v/v2v.ml
 @@ -335,7 +335,6 @@ read the man page virt-v2v(1).

0019-RHEL-Remove-o-glance.patch

@@ -1,4 +1,4 @@
-From 86ca9c403ba8884b18718e9741b748a005566d73 Mon Sep 17 00:00:00 2001
+From 5c5d4163dfa7cbdd10450d677a85aeaf87e1a14b 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: Remove -o glance
@@ -225,7 +225,7 @@ index 9e32d2bf..632579ee 100755
  set -e
  set -x
 diff --git a/v2v/v2v.ml b/v2v/v2v.ml
-index fe9ed756..11ac7a2e 100644
+index 1811f9e6..5d3a9dbb 100644
 --- a/v2v/v2v.ml
 +++ b/v2v/v2v.ml
 @@ -267,8 +267,6 @@ virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp

0020-RHEL-tests-Remove-btrfs-test.patch

@@ -1,4 +1,4 @@
-From 9532140d99bb5ec20d04440c24e54fdc5fcae6dc Mon Sep 17 00:00:00 2001
+From 867666d94ada861146fcd0ae6643c0d69c2e4513 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 5 Jul 2022 11:58:09 +0100
 Subject: [PATCH] RHEL: tests: Remove btrfs test

0021-RHEL-Remove-block-driver-option.patch

@@ -1,4 +1,4 @@
-From 4b5b05d707211f70e28ac0e0b156708a3e7e64b6 Mon Sep 17 00:00:00 2001
+From 0c2aebab2d1c3cf7a02c16dd6a5af4ae55a69995 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 28 Apr 2023 12:28:19 +0100
 Subject: [PATCH] RHEL: Remove --block-driver option
@@ -113,7 +113,7 @@ index f9c748ed..c0aa8498 100644
  	test-checksum-bad.sh \
  	test-checksum-good-qcow2.sh \
 diff --git a/v2v/v2v.ml b/v2v/v2v.ml
-index 11ac7a2e..46df3e26 100644
+index 5d3a9dbb..2e8071db 100644
 --- a/v2v/v2v.ml
 +++ b/v2v/v2v.ml
 @@ -48,7 +48,6 @@ let rec main () =

0022-RHEL-Remove-o-ovirt-o-ovirt-upload-and-o-vdsm-modes.patch

@@ -1,4 +1,4 @@
-From 6b6297167e8676b65befaaaa1c75fe6b98d37e0b Mon Sep 17 00:00:00 2001
+From 089fcc5c95211ba3100a622326cba2da859141ce Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Mon, 8 Jul 2024 09:56:54 +0100
 Subject: [PATCH] RHEL: Remove -o ovirt, -o ovirt-upload and -o vdsm modes
@@ -4681,7 +4681,7 @@ index a8c5b208..00000000
 -diff -u "$srcdir/test-o-vdsm-options.ovf.expected" \
 -  "$OVF"
 diff --git a/v2v/v2v.ml b/v2v/v2v.ml
-index 46df3e26..f7db0a97 100644
+index 2e8071db..c274baa0 100644
 --- a/v2v/v2v.ml
 +++ b/v2v/v2v.ml
 @@ -257,9 +257,6 @@ let rec main () =

0023-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch

@@ -1,4 +1,4 @@
-From 50e40ccab96a5cb498ac18246df20d9f163ffed3 Mon Sep 17 00:00:00 2001
+From 40333a5f19e6442d0765e11c5b7f8cc4adb8b090 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 9 Jul 2024 11:30:09 +0100
 Subject: [PATCH] RHEL: Add warning about virt-v2v-in-place not being supported

virt-v2v.spec

@@ -7,7 +7,7 @@
 Name:          virt-v2v
 Epoch:         1
 Version:       2.8.1
-Release:       5%{?dist}
+Release:       6%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
 License:       GPL-2.0-or-later AND LGPL-2.0-or-later
@@ -27,28 +27,29 @@ Source3:       copy-patches.sh
 # https://github.com/libguestfs/virt-v2v/commits/rhel-10.1
 
 # Patches.
-Patch0001:     0001-vddk-Remove-io-vddk-noextents-option.patch
-Patch0002:     0002-curl-ssh-vddk-file-Add-nbdkit-count-filter.patch
-Patch0003:     0003-docs-Move-oo-verify-server-certificate-docs-to-alpha.patch
-Patch0004:     0004-o-kubevirt-Add-oo-disk-to-allow-disk-names-to-be-ove.patch
-Patch0005:     0005-output-Add-optional-create-parameter.patch
-Patch0006:     0006-o-kubevirt-Add-oo-create-false-to-avoid-disk-creatio.patch
-Patch0007:     0007-input-input_vddk.ml-Fix-escaping-of-export-.-paramet.patch
-Patch0008:     0008-Modify-configure_pnputil_install-script-to-check.patch
-Patch0009:     0009-Update-the-common-submodule.patch
-Patch0010:     0010-RHEL-Fixes-for-libguestfs-winsupport.patch
-Patch0011:     0011-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
-Patch0012:     0012-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
-Patch0013:     0013-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
-Patch0014:     0014-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
-Patch0015:     0015-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
-Patch0016:     0016-RHEL-Remove-input-from-Xen.patch
-Patch0017:     0017-RHEL-Remove-o-glance.patch
-Patch0018:     0018-RHEL-tests-Remove-btrfs-test.patch
-Patch0019:     0019-RHEL-Remove-block-driver-option.patch
-Patch0020:     0020-RHEL-Remove-o-ovirt-o-ovirt-upload-and-o-vdsm-modes.patch
-Patch0021:     0021-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch
-Patch0022:     0022-Ignore-ERROR_NO_MORE_ITEMS-status-from-PnPUtil.patch
+Patch0001:     0001-docs-Move-oo-verify-server-certificate-docs-to-alpha.patch
+Patch0002:     0002-input-input_vddk.ml-Fix-escaping-of-export-.-paramet.patch
+Patch0003:     0003-Modify-configure_pnputil_install-script-to-check.patch
+Patch0004:     0004-Update-the-common-submodule.patch
+Patch0005:     0005-Ignore-ERROR_NO_MORE_ITEMS-status-from-PnPUtil.patch
+Patch0006:     0006-v2v-Print-the-version-of-libnbd-nbdcopy-in-debug-out.patch
+Patch0007:     0007-vddk-Remove-io-vddk-noextents-option.patch
+Patch0008:     0008-curl-ssh-vddk-file-Add-nbdkit-count-filter.patch
+Patch0009:     0009-o-kubevirt-Add-oo-disk-to-allow-disk-names-to-be-ove.patch
+Patch0010:     0010-output-Add-optional-create-parameter.patch
+Patch0011:     0011-o-kubevirt-Add-oo-create-false-to-avoid-disk-creatio.patch
+Patch0012:     0012-RHEL-Fixes-for-libguestfs-winsupport.patch
+Patch0013:     0013-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
+Patch0014:     0014-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
+Patch0015:     0015-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
+Patch0016:     0016-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
+Patch0017:     0017-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
+Patch0018:     0018-RHEL-Remove-input-from-Xen.patch
+Patch0019:     0019-RHEL-Remove-o-glance.patch
+Patch0020:     0020-RHEL-tests-Remove-btrfs-test.patch
+Patch0021:     0021-RHEL-Remove-block-driver-option.patch
+Patch0022:     0022-RHEL-Remove-o-ovirt-o-ovirt-upload-and-o-vdsm-modes.patch
+Patch0023:     0023-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch
 
 %if !0%{?rhel}
 # libguestfs hasn't been built on i686 for a while since there is no
@@ -339,7 +340,7 @@ done
 
 
 %changelog
-* Tue Jul 15 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.8.1-5
+* Wed Jul 16 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.8.1-6
 - Rebase to virt-v2v 2.8.1
   related: RHEL-81735
 - Fix virt-v2v -v --install dnf5 error
@@ -378,6 +379,8 @@ done
   resolves: RHEL-102734
 - Fix installation of drivers on firstboot with pending reboots
   resolves: RHEL-103356
+- Log the version of libnbd / nbdcopy in virt-v2v output
+  resolves: RHEL-104018
 
 * Tue Feb 11 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.1-4
 - Rebase to virt-v2v 2.7.1