From ddf753676f4d958bb24d31a17bea6f0a56e72a4c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 12 Dec 2025 16:24:18 +0000
Subject: [PATCH] Remove cache=none resolves: RHEL-135617

---
 ...L-output-output.ml-Remove-cache-none.patch | 40 +++++++++++++++++++
 virt-v2v.spec                                 |  7 +++-
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 0009-RHEL-output-output.ml-Remove-cache-none.patch

diff --git a/0009-RHEL-output-output.ml-Remove-cache-none.patch b/0009-RHEL-output-output.ml-Remove-cache-none.patch
new file mode 100644
index 0000000..79606bb
--- /dev/null
+++ b/0009-RHEL-output-output.ml-Remove-cache-none.patch
@@ -0,0 +1,40 @@
+From 30c03c7e308b063843a7848d15890871566bbbc0 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Fri, 12 Dec 2025 16:18:15 +0000
+Subject: [PATCH] RHEL: output/output.ml: Remove cache=none
+
+Virt-v2v tries to reduce the amount of page cache used when writing
+out the disk image to the target storage. It does this by enabling the
+cache=none option in nbdkit-file-plugin.
+
+However, use of nbdkit-file-plugin cache=none option causes data
+corruption with Dell PowerMax 8000 storage (only).
+
+As this is only an advisory setting, remove it.  Use of the page cache
+can be limited instead using cgroupsv2 memory settings.
+
+Fixes: https://issues.redhat.com/browse/RHEL-135617
+---
+ output/output.ml | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/output/output.ml b/output/output.ml
+index 3067b920..35dc5156 100644
+--- a/output/output.ml
++++ b/output/output.ml
+@@ -102,7 +102,6 @@ let output_to_local_file ?name
+     | "raw" ->
+        let cmd = Nbdkit.create ?name "file" in
+        Nbdkit.add_arg cmd "file" filename;
+-       Nbdkit.add_arg cmd "cache" "none";
+        if verbose () then Nbdkit.add_filter_if_available cmd "count";
+        let _, pid = Nbdkit.run_unix socket cmd in
+        pid
+@@ -205,7 +204,6 @@ let create_local_output_disks dir
+     (* Create the single nbdkit-file-plugin instance. *)
+     let cmd = Nbdkit.create ~name:"out" "file" in
+     Nbdkit.add_arg cmd "dir" output_storage;
+-    Nbdkit.add_arg cmd "cache" "none";
+     if verbose () then Nbdkit.add_filter_if_available cmd "count";
+     let _, pid = Nbdkit.run_unix socket cmd in
+     On_exit.kill pid;
diff --git a/virt-v2v.spec b/virt-v2v.spec
index b0b0eba..480afdc 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -45,7 +45,7 @@ ExclusiveArch: x86_64
 Name:          virt-v2v
 Epoch:         1
 Version:       2.9.10
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
 License:       GPL-2.0-or-later AND LGPL-2.0-or-later
@@ -73,6 +73,7 @@ Patch0005:     0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
 Patch0006:     0006-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
 Patch0007:     0007-RHEL-tests-Remove-btrfs-test.patch
 Patch0008:     0008-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch
+Patch0009:     0009-RHEL-output-output.ml-Remove-cache-none.patch
 
 BuildRequires: autoconf, automake, libtool
 BuildRequires: make
@@ -377,7 +378,7 @@ done
 
 
 %changelog
-* Wed Nov 05 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.9.10-1
+* Fri Dec 12 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.9.10-2
 - Rebase to virt-v2v 2.9.10
   resolves: RHEL-111241
 - Synchronize spec file with Fedora.
@@ -403,6 +404,8 @@ done
   resolves: RHEL-125116
 - Use AV and GPO information from inspection instead of open coding
   resolves: RHEL-125956
+- Remove cache=none
+  resolves: RHEL-135617
 
 * Thu Aug 21 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.8.1-9
 - Rebase to virt-v2v 2.8.1