From 6335af7d4c098f2815d40b253cc992fd7e4858ad Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 23 Apr 2026 18:23:57 +0100 Subject: [PATCH] Fix CHS geometry error for Veritas/Sun partitions resolves: RHEL-165220 --- ...Enhance-inspection-with-filesystems-.patch | 2 +- ...RHEL-Fixes-for-libguestfs-winsupport.patch | 4 +- ...correct-qemu-binary-for-o-qemu-mode-.patch | 2 +- ...-the-qemu-boot-oo-qemu-boot-option-R.patch | 8 +-- ...-supported-sound-cards-to-match-RHEL.patch | 2 +- ...sk-force-VNC-as-display-RHBZ-1372671.patch | 6 +-- ...-for-supported-v2v-hypervisors-guest.patch | 2 +- 0008-RHEL-tests-Remove-btrfs-test.patch | 4 +- ...-about-virt-v2v-in-place-not-being-s.patch | 2 +- ...ut.ml-Remove-reduce-memory-pressure-.patch | 2 +- ...top-using-maxmem-xfs_repair-m-option.patch | 52 ------------------- sources | 4 +- virt-v2v.spec | 9 ++-- 13 files changed, 24 insertions(+), 75 deletions(-) delete mode 100644 0011-convert-Stop-using-maxmem-xfs_repair-m-option.patch diff --git a/0001-RHEL-Update-v2v-Enhance-inspection-with-filesystems-.patch b/0001-RHEL-Update-v2v-Enhance-inspection-with-filesystems-.patch index 240622a..e080cd4 100644 --- a/0001-RHEL-Update-v2v-Enhance-inspection-with-filesystems-.patch +++ b/0001-RHEL-Update-v2v-Enhance-inspection-with-filesystems-.patch @@ -1,4 +1,4 @@ -From ad61f699fe3e730d47069007a2e6e3a838cf3f31 Mon Sep 17 00:00:00 2001 +From e4d213c7dcc941b3a1f68280a74d2bfe6415add2 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 26 Jan 2026 16:26:27 +0000 Subject: [PATCH] RHEL: Update v2v: Enhance inspection with filesystems diff --git a/0002-RHEL-Fixes-for-libguestfs-winsupport.patch b/0002-RHEL-Fixes-for-libguestfs-winsupport.patch index e62645f..c232c8b 100644 --- a/0002-RHEL-Fixes-for-libguestfs-winsupport.patch +++ b/0002-RHEL-Fixes-for-libguestfs-winsupport.patch @@ -1,4 +1,4 @@ -From efba4ab8bad8980598834d43e13e3af44afc5dce Mon Sep 17 00:00:00 2001 +From 65b3a6e92294ad0e864bb1c134d3f6c5017708c7 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 30 Aug 2015 03:21:57 -0400 Subject: [PATCH] RHEL: Fixes for libguestfs-winsupport. @@ -19,7 +19,7 @@ https://bugzilla.redhat.com/show_bug.cgi?id=2187961#c1 7 files changed, 40 insertions(+), 5 deletions(-) diff --git a/convert/convert.ml b/convert/convert.ml -index f077e1f6..2150abb7 100644 +index bab2b23c..3740a764 100644 --- a/convert/convert.ml +++ b/convert/convert.ml @@ -56,6 +56,7 @@ let rec convert input_disks options source = diff --git a/0003-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch b/0003-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch index 50a5389..f54dd7e 100644 --- a/0003-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch +++ b/0003-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch @@ -1,4 +1,4 @@ -From 84f190814e0277647adc42946bfeb0ed3881c16e Mon Sep 17 00:00:00 2001 +From d5557e6eba7421b47bdb785f7aa47d720dab04d9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 28 Sep 2014 19:14:43 +0100 Subject: [PATCH] RHEL: v2v: Select correct qemu binary for -o qemu mode diff --git a/0004-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch b/0004-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch index 852dd8a..268882e 100644 --- a/0004-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch +++ b/0004-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch @@ -1,4 +1,4 @@ -From cc667070c19d8ff55ebdeaa50263911d220d9c11 Mon Sep 17 00:00:00 2001 +From 9c4fd441d42369d7cb0052b75053d9d2551a5558 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" 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 432611e5..fa0c674a 100644 +index 9aede74f..6b90cbe7 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod @@ -170,11 +170,6 @@ Since F contains the path(s) to the guest disk @@ -58,7 +58,7 @@ index 432611e5..fa0c674a 100644 =head1 OPTIONS =over 4 -@@ -587,9 +582,6 @@ This is similar to I<-o local>, except that a shell script is written +@@ -590,9 +585,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>. @@ -68,7 +68,7 @@ index 432611e5..fa0c674a 100644 ifelse(ENABLE_OVIRT, yes, ` =item B<-o> B -@@ -663,11 +655,6 @@ For I<-o openstack> (L) only, set a guest ID +@@ -666,11 +658,6 @@ For I<-o openstack> (L) only, set a guest ID which is saved on each Cinder volume in the C volume property. diff --git a/0005-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch b/0005-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch index 165636b..fa31d08 100644 --- a/0005-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch +++ b/0005-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch @@ -1,4 +1,4 @@ -From 6b45fe15284f0660554c1d1f38b69453e08e2c4d Mon Sep 17 00:00:00 2001 +From 83d7be6e5a69984f3829ce6bd6a46faac1f866ee Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 24 Apr 2015 09:45:41 -0400 Subject: [PATCH] RHEL: Fix list of supported sound cards to match RHEL qemu diff --git 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 index 9619ca5..da380b2 100644 --- 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 @@ -1,4 +1,4 @@ -From 3f52a3f1d7874759f27f914e8ce2dae10ce44dff Mon Sep 17 00:00:00 2001 +From b4978bf26407fdd0479392ba80c39471686e2478 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 2 Mar 2017 14:21:37 +0100 Subject: [PATCH] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671) @@ -9,10 +9,10 @@ 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 a5291031..599436f9 100644 +index 20cd8214..b998a89d 100644 --- a/input/input_disk.ml +++ b/input/input_disk.ml -@@ -77,7 +77,7 @@ module Disk = struct +@@ -188,7 +188,7 @@ module Disk = struct s_firmware = UnknownFirmware; (* causes virt-v2v to autodetect *) s_uefi_secureboot = false; s_display = diff --git a/0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch b/0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch index 936c3c7..3a599f2 100644 --- a/0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch +++ b/0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch @@ -1,4 +1,4 @@ -From 76e5a264a578f40917e4afb96069de97e8141c23 Mon Sep 17 00:00:00 2001 +From 85b4b04ef3a9b57ec0711cb39af12bc718f5f2b6 Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 26 Mar 2019 09:42:25 +0100 Subject: [PATCH] RHEL: point to KB for supported v2v hypervisors/guests diff --git a/0008-RHEL-tests-Remove-btrfs-test.patch b/0008-RHEL-tests-Remove-btrfs-test.patch index a507e01..b89c855 100644 --- a/0008-RHEL-tests-Remove-btrfs-test.patch +++ b/0008-RHEL-tests-Remove-btrfs-test.patch @@ -1,4 +1,4 @@ -From 679424f25440deafed4be23c4bd6e4752e897cf0 Mon Sep 17 00:00:00 2001 +From 502bde113b738a0e35f654e5e77a7c18e9127cd0 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 5 Jul 2022 11:58:09 +0100 Subject: [PATCH] RHEL: tests: Remove btrfs test @@ -9,7 +9,7 @@ RHEL does not have btrfs so this test always fails. 1 file changed, 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 19bdbe51..be6e1cd5 100644 +index 43d785a1..702edb39 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -64,7 +64,6 @@ TESTS = \ diff --git a/0009-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch b/0009-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch index 7c65367..6a90bb3 100644 --- a/0009-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch +++ b/0009-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch @@ -1,4 +1,4 @@ -From 2683e8b2544180fec8ce0ebde667132031647704 Mon Sep 17 00:00:00 2001 +From 21b655aa86c1e8ffaaa0f3516c854342f3decdb0 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 9 Jul 2024 11:30:09 +0100 Subject: [PATCH] RHEL: Add warning about virt-v2v-in-place not being supported diff --git a/0010-RHEL-output-output.ml-Remove-reduce-memory-pressure-.patch b/0010-RHEL-output-output.ml-Remove-reduce-memory-pressure-.patch index a8b3cd4..5de24ce 100644 --- a/0010-RHEL-output-output.ml-Remove-reduce-memory-pressure-.patch +++ b/0010-RHEL-output-output.ml-Remove-reduce-memory-pressure-.patch @@ -1,4 +1,4 @@ -From 5009d5dec647b1081645c543b513020fdb225f19 Mon Sep 17 00:00:00 2001 +From 4382b8ab6033d23b1df35ddcc35e0632aa4081c9 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 12 Dec 2025 16:18:15 +0000 Subject: [PATCH] RHEL: output/output.ml: Remove reduce-memory-pressure=on diff --git a/0011-convert-Stop-using-maxmem-xfs_repair-m-option.patch b/0011-convert-Stop-using-maxmem-xfs_repair-m-option.patch deleted file mode 100644 index 214e1ff..0000000 --- a/0011-convert-Stop-using-maxmem-xfs_repair-m-option.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5427fc17700fe250d0c95fe991d0040d81a1cf8e Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Wed, 15 Apr 2026 11:22:34 +0100 -Subject: [PATCH] convert: Stop using maxmem (xfs_repair -m option) - -We originally introduced this option in commit dba4f0d3ba ("convert: -Limit the amount of memory used by xfs_repair"). In the same commit -we also started to use noprefetch (xfs_repair -P). This was to avoid -xfs_repair taking too much memory, causing OOM errors. - -However the -m option turns out to be deprecated. It has a number of -problems and sharp edges, including that it overestimates the amount -of memory required (often, greatly), its estimates are not very -accurate, and it prints a localized error message that libguestfs -needs to parse to obtain useful information. - -xfs_repair has internal logic already to find the available physical -memory and limit memory usage. This also operates even if the -m -option is not used. - -The beneficial option is noprefetch (-P) which limits the caching that -xfs_repair does. Leave that one alone. - -Reported-by: Ming Xie -Thanks: Eric Sandeen, Dave Chinner -Related: https://redhat.atlassian.net/browse/RHEL-165677 -(cherry picked from commit 788bd68663cfc4535753623faa25180fd35f0893) ---- - convert/convert.ml | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/convert/convert.ml b/convert/convert.ml -index 2150abb7..3740a764 100644 ---- a/convert/convert.ml -+++ b/convert/convert.ml -@@ -335,13 +335,11 @@ and do_fsck ?(before=false) g = - *) - let nomodify = true - (* xfs_repair runs out of memory in the low memory environment -- * of the appliance unless we limit the amount of memory it will -- * use here. -+ * of the appliance unless we disable prefetch. - *) -- and noprefetch = true -- and maxmem = Int64.of_int (g#get_memsize () / 2) in -+ and noprefetch = true in - -- if g#xfs_repair ~maxmem ~noprefetch ~nomodify dev <> 0 then -+ if g#xfs_repair ~noprefetch ~nomodify dev <> 0 then - error (f_"detected errors on the XFS filesystem on %s") dev - - | _, _ -> diff --git a/sources b/sources index b204143..ca45f2a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-2.11.5.tar.gz) = f28cd95712e155536d0b3f04fd11cbbe10051bce354d76fd940f5e11b95467b26f11f0fb45d17c2ef1c0b74e82858a01d42621b6d954bfc5de3da328eb073b47 -SHA512 (virt-v2v-2.11.5.tar.gz.sig) = e8c9fef0db34c34cf2429792f5f8a0a8403d61d33d211878d8145e649e0216b0ed2fc0ccc6f353fc2def94435515743f570dad2d5dd9ad56e4c8ac4b491bd979 +SHA512 (virt-v2v-2.11.6.tar.gz) = 4f89bfe3a45636562f3ac0279f38cff5194a3e8ae2922bae8b36fee45639ff9dca18488b83e81fd287e3531a79734dabbfccc821d0ae7a6c6b51618a78a890f6 +SHA512 (virt-v2v-2.11.6.tar.gz.sig) = d286ed23da3f9a2f9491b07912091e27f1a678ef18a4043fa0fe747e7a2645a96f110c54980d8203c2f9be169c5e1a83271a31e2ca2f80b0ca6d06e251a824e3 diff --git a/virt-v2v.spec b/virt-v2v.spec index a235c14..76eeb92 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -44,8 +44,8 @@ ExclusiveArch: x86_64 Name: virt-v2v Epoch: 1 -Version: 2.11.5 -Release: 2%{?dist} +Version: 2.11.6 +Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -75,7 +75,6 @@ Patch0007: 0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch Patch0008: 0008-RHEL-tests-Remove-btrfs-test.patch Patch0009: 0009-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch Patch0010: 0010-RHEL-output-output.ml-Remove-reduce-memory-pressure-.patch -Patch0011: 0011-convert-Stop-using-maxmem-xfs_repair-m-option.patch BuildRequires: autoconf, automake, libtool BuildRequires: make @@ -383,7 +382,7 @@ done %changelog -* Thu Apr 16 2026 Richard W.M. Jones - 1:2.11.5-2 +* Thu Apr 23 2026 Richard W.M. Jones - 1:2.11.6-1 - Rebase to virt-v2v 2.11.5 Synchronize spec file with Fedora resolves: RHEL-153361 @@ -397,6 +396,8 @@ done resolves: RHEL-137121 - Stop using maxmem (xfs_repair -m option) resolves: RHEL-165677 +- Fix CHS geometry error for Veritas/Sun partitions + resolves: RHEL-165220 * Fri Apr 03 2026 Richard W.M. Jones - 1:2.10.0-9 - Add --no-fstrim option