Fix Debian 12 UEFI conversions
resolves: RHEL-144467 Fix import when datastore name has characters like '+' resolves: RHEL-133729 Also reworks: Remove reduce-memory-pressure=on as workaround for Dell Powermax 8000 resolves: RHEL-135617
This commit is contained in:
parent
f2fd6e2c9c
commit
fbac429673
@ -1,4 +1,4 @@
|
||||
From 2d1fbff24a71cab66a3c27e4db383c076eb5f71c Mon Sep 17 00:00:00 2001
|
||||
From 859c43b1eb81cfdcb5f481b571e2c387860f8a27 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Tue, 13 Jan 2026 12:33:11 +0000
|
||||
Subject: [PATCH] docs/virt-v2v.pod: Document Windows vTPM and BitLocker
|
||||
@ -6,16 +6,15 @@ Subject: [PATCH] docs/virt-v2v.pod: Document Windows vTPM and BitLocker
|
||||
|
||||
Reported-by: Ming Xie
|
||||
Fixes: https://issues.redhat.com/browse/RHEL-103915
|
||||
(cherry picked from commit 859c43b1eb81cfdcb5f481b571e2c387860f8a27)
|
||||
---
|
||||
docs/virt-v2v.pod | 23 +++++++++++++++++++++++
|
||||
1 file changed, 23 insertions(+)
|
||||
|
||||
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
|
||||
index 871ca521..9fbc2694 100644
|
||||
index a3cacb82..f751f4e7 100644
|
||||
--- a/docs/virt-v2v.pod
|
||||
+++ b/docs/virt-v2v.pod
|
||||
@@ -1587,6 +1587,29 @@ L<https://issues.redhat.com/browse/RHEL-70840>
|
||||
@@ -1600,6 +1600,29 @@ L<https://issues.redhat.com/browse/RHEL-70840>
|
||||
and
|
||||
L<https://windowstechpro.com/how-to-enable-bitlocker-on-windows-11/>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 439e4547711ab96d2f6948e4a51b6e455057c69b Mon Sep 17 00:00:00 2001
|
||||
From b6d5f9dc47fa57836215a698a1ed9df20f90dabc Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Tue, 13 Jan 2026 14:11:49 +0000
|
||||
Subject: [PATCH] input/ssh.ml: Add debugging around remote_file_exists
|
||||
@ -6,8 +6,6 @@ Subject: [PATCH] input/ssh.ml: Add debugging around remote_file_exists
|
||||
|
||||
It's hard to tell when this function was called and if it returned
|
||||
success or failure, so add some debugging.
|
||||
|
||||
(cherry picked from commit b6d5f9dc47fa57836215a698a1ed9df20f90dabc)
|
||||
---
|
||||
input/ssh.ml | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
@ -1,4 +1,4 @@
|
||||
From f6ab315c4109e055ae8cf739839e40e5a30b3139 Mon Sep 17 00:00:00 2001
|
||||
From 986edd3e609cc33e0004e41447b74b93572bd61e Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Tue, 13 Jan 2026 14:20:18 +0000
|
||||
Subject: [PATCH] input/ssh.ml: Fix Ssh.remote_file_exists
|
||||
@ -20,7 +20,6 @@ Reported-by: Ming Xie
|
||||
Thanks: Ming Xie
|
||||
Updates: commit fb72e059863a60503b6011b8590c25c3a010a58f
|
||||
Reverts: commit 970d7123c2025bc148870f4bc6fa75fa9e95905f
|
||||
(cherry picked from commit 986edd3e609cc33e0004e41447b74b93572bd61e)
|
||||
---
|
||||
input/ssh.ml | 9 ++++++---
|
||||
1 file changed, 6 insertions(+), 3 deletions(-)
|
||||
@ -1,4 +1,4 @@
|
||||
From 980a7236d629d9290062f6e420421a4baf35bea2 Mon Sep 17 00:00:00 2001
|
||||
From aec2e0a6e6861a2b895d27001e009650f6227dfe Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Mon, 26 Jan 2026 16:20:50 +0000
|
||||
Subject: [PATCH] Update common submodule
|
||||
@ -1,4 +1,4 @@
|
||||
From 3078ec343c9bf2f9c6ca67a8eb9fbbbb3fb11b70 Mon Sep 17 00:00:00 2001
|
||||
From 3e60eef83ed072b605a3c34f3bf3acbc89a876bb Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Mon, 26 Jan 2026 16:26:27 +0000
|
||||
Subject: [PATCH] v2v: Enhance inspection with filesystems information
|
||||
@ -1,4 +1,4 @@
|
||||
From c31d266ede968301ea823b3797e20f6e792e68e5 Mon Sep 17 00:00:00 2001
|
||||
From 3eef674a08ca904baff2e4d6a0f871e303d08e6e Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Mon, 26 Jan 2026 16:27:42 +0000
|
||||
Subject: [PATCH] inspector: Enhance virt-v2v-inspector output with filesystems
|
||||
57
0007-convert-convert_linux.ml-Add-debian-12-UEFI.patch
Normal file
57
0007-convert-convert_linux.ml-Add-debian-12-UEFI.patch
Normal file
@ -0,0 +1,57 @@
|
||||
From 3ef1078cd3cf5a56dc8023ed113838533d9cea09 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Necas <mnecas@redhat.com>
|
||||
Date: Tue, 27 Jan 2026 21:56:41 +0900
|
||||
Subject: [PATCH] convert/convert_linux.ml: Add debian 12 UEFI
|
||||
|
||||
When migrating Debian 12 VM with UEFI the VM fails to boot as we don't
|
||||
preserve the UEFI configuration. Debian has similar mechanism as ubuntu
|
||||
so we can reuse it.
|
||||
|
||||
Fixes: https://issues.redhat.com/browse/RHEL-144467
|
||||
|
||||
Signed-off-by: Martin Necas <mnecas@redhat.com>
|
||||
(cherry picked from commit 161679267f2100e3604dca3f5bfa0827e9a5de30)
|
||||
---
|
||||
convert/convert_linux.ml | 12 +++++++-----
|
||||
1 file changed, 7 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/convert/convert_linux.ml b/convert/convert_linux.ml
|
||||
index 6c021efb..ce02b04a 100644
|
||||
--- a/convert/convert_linux.ml
|
||||
+++ b/convert/convert_linux.ml
|
||||
@@ -1324,13 +1324,15 @@ fi
|
||||
g inspect.i_root "fix uefi boot" fix_script)
|
||||
else
|
||||
cant_fix_uefi ()
|
||||
- | "ubuntu", 14 ->
|
||||
+ | ("ubuntu", 14) | ("debian", 12)->
|
||||
(* to make a bootable uefi ubuntu 14 we need to
|
||||
* copy shim<arch>.efi to UEFI fallback path
|
||||
* and rename it to BOOT<arch>.efi, also we copy
|
||||
* grub.efi and grub.cfg to UEFI fallback path without renaming *)
|
||||
let arch_suffix = String.lowercase_ascii suffix in
|
||||
|
||||
+ let distro = inspect.i_distro in
|
||||
+
|
||||
let shim =
|
||||
String.concat "" [grub_path; "/shim"; arch_suffix; ".efi"] in
|
||||
let uefi_grub_name =
|
||||
@@ -1346,14 +1348,14 @@ fi
|
||||
* if not, then just don't clean up and leave the temp loader
|
||||
* at UEFI fallback path for simplicity
|
||||
*)
|
||||
- if String.find shim "/boot/efi/EFI/ubuntu/shim" >= 0 then
|
||||
+ if String.find shim (sprintf "/boot/efi/EFI/%s/shim" distro) >= 0 then
|
||||
let fix_script =
|
||||
sprintf
|
||||
"#!/bin/bash\n\
|
||||
- sudo efibootmgr -c -L ubuntu \
|
||||
- -l \\\\EFI\\\\ubuntu\\\\shim%s.efi\n\
|
||||
+ sudo efibootmgr -c -L %s \
|
||||
+ -l \\\\EFI\\\\%s\\\\shim%s.efi\n\
|
||||
rm -rf %s"
|
||||
- arch_suffix uefi_fallback_path in
|
||||
+ distro distro arch_suffix uefi_fallback_path in
|
||||
Firstboot.add_firstboot_script
|
||||
g inspect.i_root "fix uefi boot" fix_script
|
||||
else
|
||||
45
0008-input-vcenter-double-uri_encode-dcPath-and-dsName.patch
Normal file
45
0008-input-vcenter-double-uri_encode-dcPath-and-dsName.patch
Normal file
@ -0,0 +1,45 @@
|
||||
From c532b2c1d14b22b540cced337ad26473aa5b6648 Mon Sep 17 00:00:00 2001
|
||||
From: Cole Robinson <crobinso@redhat.com>
|
||||
Date: Tue, 27 Jan 2026 09:14:29 -0500
|
||||
Subject: [PATCH] input: vcenter: double uri_encode `dcPath` and `dsName`
|
||||
|
||||
Special characters like `+` in vmware datastore names aren't accessible
|
||||
by expected URLs:
|
||||
|
||||
https://knowledge.broadcom.com/external/article/386368/vcenter-inventory-object-name-with-speci.html
|
||||
|
||||
Turns out they need to passed through URI encoding twice.
|
||||
Libvirt fixed this here:
|
||||
|
||||
https://gitlab.com/libvirt/libvirt/-/commit/6c9d2591c668732eb05cf17d27c9102ef3d40b39
|
||||
|
||||
But we need a similar fix for non-vddk vCenter conversions
|
||||
|
||||
Fixes: https://issues.redhat.com/browse/RHEL-133729
|
||||
|
||||
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
||||
(cherry picked from commit f13e85f9ce3bb51f65c0afbaae009b5a3e6af9c7)
|
||||
---
|
||||
input/vCenter.ml | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/input/vCenter.ml b/input/vCenter.ml
|
||||
index f9b6ab07..fef113cd 100644
|
||||
--- a/input/vCenter.ml
|
||||
+++ b/input/vCenter.ml
|
||||
@@ -137,9 +137,14 @@ and get_https_url dcPath uri server path =
|
||||
(* XXX Need to handle templates. The file is called "-delta.vmdk" in
|
||||
* place of "-flat.vmdk".
|
||||
*)
|
||||
+ (* dcPath and dsName need to be double quoted:
|
||||
+ * https://gitlab.com/libvirt/libvirt/-/commit/6c9d2591c6
|
||||
+ *)
|
||||
sprintf "https://%s%s/folder/%s-flat.vmdk?dcPath=%s&dsName=%s"
|
||||
server port
|
||||
- (uri_quote path) (uri_quote dcPath) (uri_quote datastore)
|
||||
+ (uri_quote path)
|
||||
+ (uri_quote (uri_quote dcPath))
|
||||
+ (uri_quote (uri_quote datastore))
|
||||
)
|
||||
|
||||
(* Fetch the status from a URL. *)
|
||||
112
0009-lib-Replace-nbdkit-file-cache-none-with-reduce-memor.patch
Normal file
112
0009-lib-Replace-nbdkit-file-cache-none-with-reduce-memor.patch
Normal file
@ -0,0 +1,112 @@
|
||||
From 3b6f7752ab8c8879426518c7ab290db79e4f6571 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Tue, 27 Jan 2026 08:56:11 +0000
|
||||
Subject: [PATCH] lib: Replace nbdkit file cache=none with
|
||||
reduce-memory-pressure=on
|
||||
|
||||
nbdkit 1.46 replaced the cache=none option with the
|
||||
same option renamed as 'reduce-memory-pressure', taking a boolean
|
||||
value, see:
|
||||
|
||||
https://gitlab.com/nbdkit/nbdkit/-/commit/98a5ddc835ba520c949b31328aef7b7987462faa
|
||||
|
||||
The old option caused customer confusion. cache=none still works, but
|
||||
to reduce confusion we should also prefer reduce-memory-pressure=on
|
||||
when that option is available.
|
||||
|
||||
(cherry picked from commit 7aab8a85f2f1a6d01d5e62dabe1839483abd0401)
|
||||
---
|
||||
input/input_disk.ml | 2 +-
|
||||
input/input_libvirt.ml | 2 +-
|
||||
lib/nbdkit.ml | 9 +++++++++
|
||||
lib/nbdkit.mli | 8 ++++++++
|
||||
output/output.ml | 4 ++--
|
||||
5 files changed, 21 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/input/input_disk.ml b/input/input_disk.ml
|
||||
index 8a71a3d9..a5291031 100644
|
||||
--- a/input/input_disk.ml
|
||||
+++ b/input/input_disk.ml
|
||||
@@ -110,7 +110,7 @@ module Disk = struct
|
||||
if options.read_only then
|
||||
Nbdkit.add_filter cmd "cow";
|
||||
Nbdkit.add_arg cmd "file" disk;
|
||||
- Nbdkit.add_arg cmd "cache" "none";
|
||||
+ Nbdkit.reduce_memory_pressure cmd;
|
||||
let _, pid = Nbdkit.run_unix socket cmd in
|
||||
|
||||
(* --exit-with-parent should ensure nbdkit is cleaned
|
||||
diff --git a/input/input_libvirt.ml b/input/input_libvirt.ml
|
||||
index f566ff5c..4c1a6eef 100644
|
||||
--- a/input/input_libvirt.ml
|
||||
+++ b/input/input_libvirt.ml
|
||||
@@ -129,7 +129,7 @@ and setup_servers options dir disks =
|
||||
if options.read_only then
|
||||
Nbdkit.add_filter cmd "cow";
|
||||
Nbdkit.add_arg cmd "file" filename;
|
||||
- Nbdkit.add_arg cmd "cache" "none";
|
||||
+ Nbdkit.reduce_memory_pressure cmd;
|
||||
let _, pid = Nbdkit.run_unix socket cmd in
|
||||
|
||||
(* --exit-with-parent should ensure nbdkit is cleaned
|
||||
diff --git a/lib/nbdkit.ml b/lib/nbdkit.ml
|
||||
index 9e42b607..e975bddf 100644
|
||||
--- a/lib/nbdkit.ml
|
||||
+++ b/lib/nbdkit.ml
|
||||
@@ -134,6 +134,15 @@ let add_env cmd name value = cmd.env <- (name, value) :: cmd.env
|
||||
let add_filter_if_available cmd filter =
|
||||
if probe_filter filter then add_filter cmd filter
|
||||
|
||||
+let reduce_memory_pressure cmd =
|
||||
+ assert (cmd.plugin = "file");
|
||||
+ if probe_plugin_parameter cmd.plugin "reduce-memory-pressure=" then
|
||||
+ add_arg cmd "reduce-memory-pressure" "on"
|
||||
+ else if probe_plugin_parameter cmd.plugin "cache=" then
|
||||
+ add_arg cmd "cache" "none"
|
||||
+ else
|
||||
+ assert false
|
||||
+
|
||||
let run_unix socket cmd =
|
||||
(* Create a temporary directory where we place the PID file. *)
|
||||
let piddir = Mkdtemp.temp_dir "v2vnbdkit." in
|
||||
diff --git a/lib/nbdkit.mli b/lib/nbdkit.mli
|
||||
index ea40b612..eaf65f05 100644
|
||||
--- a/lib/nbdkit.mli
|
||||
+++ b/lib/nbdkit.mli
|
||||
@@ -109,6 +109,14 @@ val add_args : cmd -> (string * string) list -> unit
|
||||
|
||||
The arguments are added left to right. *)
|
||||
|
||||
+val reduce_memory_pressure : cmd -> unit
|
||||
+(** This is short-hand for detecting if the file plugin supports the
|
||||
+ [reduce-memory-pressure=on] option, and adding it to the nbdkit
|
||||
+ command line. Otherwise it adds the old, confusing [cache=none]
|
||||
+ option instead.
|
||||
+
|
||||
+ Only use this with the file plugin. *)
|
||||
+
|
||||
val add_env : cmd -> string -> string -> unit
|
||||
(** Add name=value environment variable. *)
|
||||
|
||||
diff --git a/output/output.ml b/output/output.ml
|
||||
index 3067b920..7e096278 100644
|
||||
--- a/output/output.ml
|
||||
+++ b/output/output.ml
|
||||
@@ -102,7 +102,7 @@ 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";
|
||||
+ Nbdkit.reduce_memory_pressure cmd;
|
||||
if verbose () then Nbdkit.add_filter_if_available cmd "count";
|
||||
let _, pid = Nbdkit.run_unix socket cmd in
|
||||
pid
|
||||
@@ -205,7 +205,7 @@ 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";
|
||||
+ Nbdkit.reduce_memory_pressure cmd;
|
||||
if verbose () then Nbdkit.add_filter_if_available cmd "count";
|
||||
let _, pid = Nbdkit.run_unix socket cmd in
|
||||
On_exit.kill pid;
|
||||
@ -1,4 +1,4 @@
|
||||
From 72b3c62beef8edb39c95e89f28c35ac6ca0104c1 Mon Sep 17 00:00:00 2001
|
||||
From c49860353a89f90e2a062a2821cef640c83dec0d 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.
|
||||
@ -1,4 +1,4 @@
|
||||
From 00f6b5abfdbd500c855a2ffd1b8e7f08409572a8 Mon Sep 17 00:00:00 2001
|
||||
From c57049e4582c745c7b278a65e7396f2e03dc9cf8 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
|
||||
@ -1,4 +1,4 @@
|
||||
From 2a2a6aeea212fd5659b0b567c1fa94f873508040 Mon Sep 17 00:00:00 2001
|
||||
From f9574ba72d0d095c6f0d5db181acea4af15f5d4a 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
|
||||
@ -43,7 +43,7 @@ index 49f00754..bdf12c5d 100644
|
||||
=item B<-o null>
|
||||
|
||||
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
|
||||
index a3cacb82..871ca521 100644
|
||||
index f751f4e7..9fbc2694 100644
|
||||
--- a/docs/virt-v2v.pod
|
||||
+++ b/docs/virt-v2v.pod
|
||||
@@ -169,11 +169,6 @@ Since F<guest-domain.xml> contains the path(s) to the guest disk
|
||||
@ -1,4 +1,4 @@
|
||||
From ad349c5f50b8dcdb82aa013a0ca0df48ea66922e Mon Sep 17 00:00:00 2001
|
||||
From 89b5b4f822206dcee3f86d8429e334d5a6a3b10c 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
|
||||
@ -1,4 +1,4 @@
|
||||
From a2980cacdf00c3b084221eb68e650baba3968fed Mon Sep 17 00:00:00 2001
|
||||
From 3bd5746d11bcd4200c85d286d656c5be5b582942 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)
|
||||
@ -9,7 +9,7 @@ The SDL output mode is not supported in RHEL's qemu-kvm.
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/input/input_disk.ml b/input/input_disk.ml
|
||||
index 8a71a3d9..1022ca2c 100644
|
||||
index a5291031..599436f9 100644
|
||||
--- a/input/input_disk.ml
|
||||
+++ b/input/input_disk.ml
|
||||
@@ -77,7 +77,7 @@ module Disk = struct
|
||||
@ -1,4 +1,4 @@
|
||||
From 8a30bcc814beb241afbbdb648823062b4d193ae0 Mon Sep 17 00:00:00 2001
|
||||
From 689f03c0a2dd2c1c681508b11d6dd0ccb199b816 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
|
||||
@ -1,4 +1,4 @@
|
||||
From a3957a346947d7ce27c696248978dbd1d2e6e74a Mon Sep 17 00:00:00 2001
|
||||
From 071f53595a88089703f37457223666edc015bb4b 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
|
||||
@ -1,4 +1,4 @@
|
||||
From 8327cde7c2dd27883cbcb517ace6808d9bbde7b1 Mon Sep 17 00:00:00 2001
|
||||
From fa581c0b05264277227e04e96a1fc8deb5c42c8f 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
|
||||
@ -1,17 +1,18 @@
|
||||
From 7850f0c47d365579fda8da4b76263542ae05ae4f Mon Sep 17 00:00:00 2001
|
||||
From 9697013edc694618d2731a201ed2517749273811 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
|
||||
Subject: [PATCH] RHEL: output/output.ml: Remove reduce-memory-pressure=on
|
||||
(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.
|
||||
reduce-memory-pressure=on option (previously 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.
|
||||
As this is only an advisory setting, remove it for now.
|
||||
|
||||
Fixes: https://issues.redhat.com/browse/RHEL-135617
|
||||
---
|
||||
@ -19,14 +20,14 @@ Fixes: https://issues.redhat.com/browse/RHEL-135617
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/output/output.ml b/output/output.ml
|
||||
index 3067b920..35dc5156 100644
|
||||
index 7e096278..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";
|
||||
- Nbdkit.reduce_memory_pressure cmd;
|
||||
if verbose () then Nbdkit.add_filter_if_available cmd "count";
|
||||
let _, pid = Nbdkit.run_unix socket cmd in
|
||||
pid
|
||||
@ -34,7 +35,7 @@ index 3067b920..35dc5156 100644
|
||||
(* 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";
|
||||
- Nbdkit.reduce_memory_pressure cmd;
|
||||
if verbose () then Nbdkit.add_filter_if_available cmd "count";
|
||||
let _, pid = Nbdkit.run_unix socket cmd in
|
||||
On_exit.kill pid;
|
||||
@ -45,7 +45,7 @@ ExclusiveArch: x86_64
|
||||
Name: virt-v2v
|
||||
Epoch: 1
|
||||
Version: 2.10.0
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: Convert a virtual machine to run on KVM
|
||||
|
||||
License: GPL-2.0-or-later AND LGPL-2.0-or-later
|
||||
@ -65,21 +65,24 @@ Source3: copy-patches.sh
|
||||
# https://github.com/libguestfs/virt-v2v/commits/rhel-10.2
|
||||
|
||||
# Patches.
|
||||
Patch0001: 0001-RHEL-Fixes-for-libguestfs-winsupport.patch
|
||||
Patch0002: 0002-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
|
||||
Patch0003: 0003-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
|
||||
Patch0004: 0004-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
|
||||
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
|
||||
Patch0010: 0010-docs-virt-v2v.pod-Document-Windows-vTPM-and-BitLocke.patch
|
||||
Patch0011: 0011-input-ssh.ml-Add-debugging-around-remote_file_exists.patch
|
||||
Patch0012: 0012-input-ssh.ml-Fix-Ssh.remote_file_exists.patch
|
||||
Patch0013: 0013-Update-common-submodule.patch
|
||||
Patch0014: 0014-v2v-Enhance-inspection-with-filesystems-information.patch
|
||||
Patch0015: 0015-inspector-Enhance-virt-v2v-inspector-output-with-fil.patch
|
||||
Patch0001: 0001-docs-virt-v2v.pod-Document-Windows-vTPM-and-BitLocke.patch
|
||||
Patch0002: 0002-input-ssh.ml-Add-debugging-around-remote_file_exists.patch
|
||||
Patch0003: 0003-input-ssh.ml-Fix-Ssh.remote_file_exists.patch
|
||||
Patch0004: 0004-Update-common-submodule.patch
|
||||
Patch0005: 0005-v2v-Enhance-inspection-with-filesystems-information.patch
|
||||
Patch0006: 0006-inspector-Enhance-virt-v2v-inspector-output-with-fil.patch
|
||||
Patch0007: 0007-convert-convert_linux.ml-Add-debian-12-UEFI.patch
|
||||
Patch0008: 0008-input-vcenter-double-uri_encode-dcPath-and-dsName.patch
|
||||
Patch0009: 0009-lib-Replace-nbdkit-file-cache-none-with-reduce-memor.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-tests-Remove-btrfs-test.patch
|
||||
Patch0017: 0017-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch
|
||||
Patch0018: 0018-RHEL-output-output.ml-Remove-reduce-memory-pressure-.patch
|
||||
|
||||
BuildRequires: autoconf, automake, libtool
|
||||
BuildRequires: make
|
||||
@ -384,7 +387,7 @@ done
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jan 26 2026 Richard W.M. Jones <rjones@redhat.com> - 1:2.10.0-3
|
||||
* Tue Jan 27 2026 Richard W.M. Jones <rjones@redhat.com> - 1:2.10.0-4
|
||||
- Rebase to virt-v2v 2.10.0
|
||||
resolves: RHEL-111241
|
||||
- Synchronize spec file with Fedora.
|
||||
@ -410,7 +413,7 @@ done
|
||||
resolves: RHEL-125116
|
||||
- Use AV and GPO information from inspection instead of open coding
|
||||
resolves: RHEL-125956
|
||||
- Remove cache=none
|
||||
- Remove reduce-memory-pressure=on as workaround for Dell Powermax 8000
|
||||
resolves: RHEL-135617
|
||||
- Hard depend on libnbd 1.24
|
||||
resolves: RHEL-140894
|
||||
@ -420,6 +423,10 @@ done
|
||||
resolves: RHEL-102938
|
||||
- Expose XFS version in virt-v2v-inspector
|
||||
resolves: RHEL-144075
|
||||
- Fix Debian 12 UEFI conversions
|
||||
resolves: RHEL-144467
|
||||
- Fix import when datastore name has characters like '+'
|
||||
resolves: RHEL-133729
|
||||
|
||||
* Thu Aug 21 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.8.1-9
|
||||
- Rebase to virt-v2v 2.8.1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user