rpms/virt-v2v
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to virt-v2v 2.8.1

Browse Source 
related: RHEL-81735

virt-v2v fails to convert guests with e2fsck errors
resolves: RHEL-97600
Improve layout of man page
resolves: RHEL-99745
Fix xfs_repair out of memory error
resolves: RHEL-99313
This commit is contained in:
Richard W.M. Jones 2025-06-26 16:43:40 +01:00
parent 8f11161a77
commit 6833559d9e
15 changed files with 65 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
0002-RHEL-Fixes-for-libguestfs-winsupport.patch → 0001-RHEL-Fixes-for-libguestfs-winsupport.patch
View File

@ -1,4 +1,4 @@
From a9cf6bac4934b50e706c953ca3b01537b8aa2bac Mon Sep 17 00:00:00 2001
From 42d326e84452862518293f435df4e1db1f3b5696 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.
@ -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 f8953dd7..de207849 100644
index ff82ad54..45d48a95 100644
--- a/convert/convert.ml
+++ b/convert/convert.ml
@@ -53,6 +53,7 @@ let rec convert input_disks options source =

37
0001-convert-Replay-dirty-log-for-ext4-filesystems-before.patch
View File

@ -1,37 +0,0 @@
From 7266bd42f43817e090b15cb3b7abef06a1124bf4 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 19 Jun 2025 08:58:35 +0100
Subject: [PATCH] convert: Replay dirty log for ext4 filesystems before running
e2fsck
As in commit 2e7c03b967 ("convert: Replay dirty log for XFS
filesystems before running xfs_repair"), we can repair dirty logs
which otherwise cause e2fsck to fail, by simply mounting and
unmounting the filesystem first.
e2fsck is supposed to be able to replay the dirty log, but apparently
it cannot, or cannot in all circumstances.
Reported-by: Ming Xie
Fixes: https://issues.redhat.com/browse/RHEL-97600
Fixes: commit 78ffb68d4f1ef8af776c24537feaf832fd3ec7e9
---
convert/convert.ml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/convert/convert.ml b/convert/convert.ml
index ad0b82b1..f8953dd7 100644
--- a/convert/convert.ml
+++ b/convert/convert.ml
@@ -258,6 +258,11 @@ and do_fsck ?(before=false) g =
);
| dev, "ext4" ->
+ if before then (
+ (* Replay and hence repair a dirty log (RHEL-97600) *)
+ Fun.protect ~finally:g#umount_all (fun () -> g#mount_ro dev "/");
+ );
+
g#e2fsck ~forceno:true dev
| dev, "xfs" ->

2
0003-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch → 0002-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
View File

@ -1,4 +1,4 @@
From 6c9466c351ca8ac2360f467584f37a6c2057f738 Mon Sep 17 00:00:00 2001
From 0edaf8c3992e6243c5c7ecf152c78fa3b2b47201 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

10
0004-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch → 0003-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
View File

@ -1,4 +1,4 @@
From 7b79a043edb3df4569ece2d6c52e3f4d46835c67 Mon Sep 17 00:00:00 2001
From d16c02df196557e526a0a099d382afce84a843d5 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,10 +43,10 @@ index 49f00754..bdf12c5d 100644
=item B<-o null>
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
index 9b3d682d..3f2fa7f4 100644
index 3cfb0948..600de391 100644
--- a/docs/virt-v2v.pod
+++ b/docs/virt-v2v.pod
@@ -159,11 +159,6 @@ Since F<guest-domain.xml> contains the path(s) to the guest disk
@@ -160,11 +160,6 @@ Since F<guest-domain.xml> contains the path(s) to the guest disk
image(s) you do not need to specify the name of the disk image on the
command line.
@ -58,7 +58,7 @@ index 9b3d682d..3f2fa7f4 100644
=head1 OPTIONS
=over 4
@@ -545,9 +540,6 @@ This is similar to I<-o local>, except that a shell script is written
@@ -546,9 +541,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 9b3d682d..3f2fa7f4 100644
=item B<-o> B<vdsm>
Set the output method to I<vdsm>.
@@ -605,11 +597,6 @@ For I<-o openstack> (L<virt-v2v-output-openstack(1)>) only, set a guest ID
@@ -606,11 +598,6 @@ For I<-o openstack> (L<virt-v2v-output-openstack(1)>) only, set a guest ID
which is saved on each Cinder volume in the C<virt_v2v_guest_id>
volume property.

2
0005-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch → 0004-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
View File

@ -1,4 +1,4 @@
From 69a712214ac449d2a5668c1ffa12e212f0e7d054 Mon Sep 17 00:00:00 2001
From 99614f4fb8d044b9a850d8e7934524b4e7450473 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

2
0006-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch → 0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
View File

@ -1,4 +1,4 @@
From 253fb648d9f95e9c603c5032f0a0eb5c81d82ce8 Mon Sep 17 00:00:00 2001
From 67e67669418624469b001328dddd10337b9bfa95 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)

2
0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch → 0006-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
View File

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

28
0008-RHEL-Remove-input-from-Xen.patch → 0007-RHEL-Remove-input-from-Xen.patch
View File

@ -1,4 +1,4 @@
From 7dcb7bdfd889caa204f62c2e66b8ad2f12f8860f Mon Sep 17 00:00:00 2001
From 35c4a9f5c9f92fe15055ec337a94ad9f743706d6 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
@ -229,7 +229,7 @@ index 0417e89f..00000000
-
-Copyright (C) 2009-2025 Red Hat Inc.
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
index 3f2fa7f4..4a997d4c 100644
index 600de391..fd4362fc 100644
--- a/docs/virt-v2v.pod
+++ b/docs/virt-v2v.pod
@@ -12,7 +12,7 @@ virt-v2v - Convert a guest to use KVM
@ -250,7 +250,7 @@ index 3f2fa7f4..4a997d4c 100644
L<virt-v2v-output-local(1)> — Output to local files or local libvirt.
L<virt-v2v-output-ovirt(1)> — Output to oVirt
@@ -188,10 +186,6 @@ This is only supported for:
@@ -189,10 +187,6 @@ This is only supported for:
=item *
@ -261,7 +261,7 @@ index 3f2fa7f4..4a997d4c 100644
L<input from VMware VMX|virt-v2v-input-vmware(1)/INPUT FROM VMWARE VMX>
when using the SSH transport method
@@ -303,12 +297,10 @@ hypervisor. See L<virt-v2v-input-vmware(1)>.
@@ -304,12 +298,10 @@ hypervisor. See L<virt-v2v-input-vmware(1)>.
Specify a libvirt connection URI to use when reading the guest. This
is only used when S<I<-i libvirt>>.
@ -277,7 +277,16 @@ index 3f2fa7f4..4a997d4c 100644
=item B<-if> format
@@ -859,38 +851,6 @@ __CUSTOMIZE_OPTIONS__
@@ -867,7 +859,7 @@ bandwidth. Virt-v2v should be able to copy guest data at gigabit
ethernet speeds or greater.
Ensure that the network connections between servers (conversion
-server, NFS server, vCenter, Xen) are as fast and as low latency as
+server, NFS server, vCenter) are as fast and as low latency as
possible.
=head2 Disk space
@@ -1166,38 +1158,6 @@ changes to the Windows Registry and filesystem.
=head1 NOTES
@ -316,15 +325,6 @@ index 3f2fa7f4..4a997d4c 100644
=head2 Enabling virtio
"Virtio" is the name for a set of drivers which make disk (block
@@ -1260,7 +1220,7 @@ bandwidth. Virt-v2v should be able to copy guest data at gigabit
ethernet speeds or greater.
Ensure that the network connections between servers (conversion
-server, NFS server, vCenter, Xen) are as fast and as low latency as
+server, NFS server, vCenter) are as fast and as low latency as
possible.
=head3 Disk space
diff --git a/input/Makefile.am b/input/Makefile.am
index d5e77f76..98ea5223 100644
--- a/input/Makefile.am

10
0009-RHEL-Remove-o-glance.patch → 0008-RHEL-Remove-o-glance.patch
View File

@ -1,4 +1,4 @@
From 8f9d1822ea5b563cf43709e524a453103515bbee Mon Sep 17 00:00:00 2001
From f246ed3ee4928d45f778d3d9ed25bccbf6f8c13c 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
@ -100,10 +100,10 @@ index 9bef76ea..04595816 100644
=head1 AUTHOR
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
index 4a997d4c..1ae73040 100644
index fd4362fc..3cedc823 100644
--- a/docs/virt-v2v.pod
+++ b/docs/virt-v2v.pod
@@ -438,14 +438,6 @@ See L</Networks and bridges> below.
@@ -439,14 +439,6 @@ See L</Networks and bridges> below.
This is the same as I<-o local>.
@ -118,7 +118,7 @@ index 4a997d4c..1ae73040 100644
=item B<-o> B<kubevirt>
Set the output method to I<kubevirt>. B<Note the way this mode works
@@ -1242,11 +1234,6 @@ and output methods may use disk space, as outlined in the table below.
@@ -881,11 +873,6 @@ and output methods may use disk space, as outlined in the table below.
This temporarily places a full copy of the uncompressed source disks
in C<$VIRT_V2V_TMPDIR> (or F</var/tmp>).
@ -130,7 +130,7 @@ index 4a997d4c..1ae73040 100644
=item I<-o local>
=item I<-o qemu>
@@ -1449,13 +1436,6 @@ See also L</Starting the libvirt system instance>.
@@ -1037,13 +1024,6 @@ See also L</Starting the libvirt system instance>.
Because of how Cinder volumes are presented as F</dev> block devices,
using I<-o openstack> normally requires that virt-v2v is run as root.

2
0010-RHEL-tests-Remove-btrfs-test.patch → 0009-RHEL-tests-Remove-btrfs-test.patch
View File

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

6
0011-RHEL-Remove-block-driver-option.patch → 0010-RHEL-Remove-block-driver-option.patch
View File

@ -1,4 +1,4 @@
From 111dceeee6c937797b7a2f73181cb5815b01f5ad Mon Sep 17 00:00:00 2001
From c7c4c87c7cade4f79048e4fd7e03f548e8d5e4ca 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
@ -37,10 +37,10 @@ index 6c02a99c..3d0d1b28 100644
=item B<--colours>
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
index 1ae73040..47e9fa36 100644
index 3cedc823..f0a2f231 100644
--- a/docs/virt-v2v.pod
+++ b/docs/virt-v2v.pod
@@ -211,16 +211,6 @@ The options are silently ignored for other input methods.
@@ -212,16 +212,6 @@ The options are silently ignored for other input methods.
See I<--network> below.

16
0012-RHEL-Remove-o-ovirt-o-ovirt-upload-and-o-vdsm-modes.patch → 0011-RHEL-Remove-o-ovirt-o-ovirt-upload-and-o-vdsm-modes.patch
View File

@ -1,4 +1,4 @@
From fdc8e7213c661be7afb41563397ab9ef8c637181 Mon Sep 17 00:00:00 2001
From eee5f0c29ee2b06b721e1ccfe0f85fb7193825f3 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
@ -360,7 +360,7 @@ index 6ba04ad0..00000000
-
-Copyright (C) 2009-2025 Red Hat Inc.
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
index 47e9fa36..d7d3c6aa 100644
index f0a2f231..19ec1619 100644
--- a/docs/virt-v2v.pod
+++ b/docs/virt-v2v.pod
@@ -14,9 +14,9 @@ virt-v2v - Convert a guest to use KVM
@ -407,7 +407,7 @@ index 47e9fa36..d7d3c6aa 100644
=head2 Convert from ESXi hypervisor over SSH to local libvirt
You have an ESXi hypervisor called C<esxi.example.com> with SSH access
@@ -486,26 +469,6 @@ no metadata is written.
@@ -487,26 +470,6 @@ no metadata is written.
Set the output method to OpenStack. See L<virt-v2v-output-openstack(1)>.
@ -434,7 +434,7 @@ index 47e9fa36..d7d3c6aa 100644
=item B<-o> B<qemu>
Set the output method to I<qemu>.
@@ -514,15 +477,6 @@ This is similar to I<-o local>, except that a shell script is written
@@ -515,15 +478,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>.
@ -450,7 +450,7 @@ index 47e9fa36..d7d3c6aa 100644
=item B<-oa> B<sparse>
=item B<-oa> B<preallocated>
@@ -585,117 +539,11 @@ For I<-o openstack> (L<virt-v2v-output-openstack(1)>) only, set optional
@@ -586,117 +540,11 @@ For I<-o openstack> (L<virt-v2v-output-openstack(1)>) only, set optional
OpenStack authentication. For example I<-oo os-username=>NAME is
equivalent to C<openstack --os-username=NAME>.
@ -568,7 +568,7 @@ index 47e9fa36..d7d3c6aa 100644
=item B<-op> file
Supply a file containing a password to be used when connecting to the
@@ -713,28 +561,6 @@ For I<-o libvirt>, this is a libvirt directory pool
@@ -714,28 +562,6 @@ For I<-o libvirt>, this is a libvirt directory pool
For I<-o local> and I<-o qemu>, this is a directory name.
The directory must exist.
@ -597,7 +597,7 @@ index 47e9fa36..d7d3c6aa 100644
=item B<--parallel> N
Enable parallel copying if the guest has multiple disks. I<N> is the
@@ -1387,26 +1213,6 @@ require either root or a special user:
@@ -975,26 +801,6 @@ require either root or a special user:
=over 4
@ -624,7 +624,7 @@ index 47e9fa36..d7d3c6aa 100644
=item Writing to libvirt
When using I<-o libvirt>, you may need to run virt-v2v as root so that
@@ -1514,7 +1320,6 @@ virt-v2v binary. Typical output looks like this:
@@ -1541,7 +1347,6 @@ virt-v2v binary. Typical output looks like this:
virt-v2v
libguestfs-rewrite
colours-option

2
0013-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch → 0012-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch
View File

@ -1,4 +1,4 @@
From cc4a8129a2af033ce492303d3ca9dcb229aaff7e Mon Sep 17 00:00:00 2001
From 192e435f741ae9d392553575a674f4cd6118ffe8 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

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (virt-v2v-2.8.0.tar.gz) = b4ceb8694a418fc4c1dd0951ddabe332cbce4e9b75137ab5a186a22d1ad0d1e09476aa51b44fd6da3016d3d45b69b2c0ee40941b5f0a2cf25f3f3df514b3dd25
SHA512 (virt-v2v-2.8.0.tar.gz.sig) = cd79caaea2edb345f641f6be7ffda3f58322d788aa716cde0654dc7f340f13303c437a7e8dd7507ed01e502257a0b808977e5b93c88b7b26669b9c0ba32753a7
SHA512 (virt-v2v-2.8.1.tar.gz) = 70da68563e870955ca013e6d55be8f56ad65dde6f84909f06fae7ab928227a566e8949bb90e839fffce2ad4ebc604b2cfa1c5547394c8d1bd092bb95f9e6435c
SHA512 (virt-v2v-2.8.1.tar.gz.sig) = 1236dd21272c53dbafb4cd0ac4177bcf73600ff52ea8949b878793eafb1829a67880043c6e03c2d82c691d986ea8a7daa60508f4ae22345c961a939b3b6a43b0

37
virt-v2v.spec
View File

@ -6,8 +6,8 @@
Name: virt-v2v
Epoch: 1
Version: 2.8.0
Release: 2%{?dist}
Version: 2.8.1
Release: 1%{?dist}
Summary: Convert a virtual machine to run on KVM
License: GPL-2.0-or-later AND LGPL-2.0-or-later
@ -27,19 +27,18 @@ Source3: copy-patches.sh
# https://github.com/libguestfs/virt-v2v/commits/rhel-10.1
# Patches.
Patch0001: 0001-convert-Replay-dirty-log-for-ext4-filesystems-before.patch
Patch0002: 0002-RHEL-Fixes-for-libguestfs-winsupport.patch
Patch0003: 0003-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
Patch0004: 0004-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
Patch0005: 0005-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
Patch0006: 0006-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
Patch0007: 0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
Patch0008: 0008-RHEL-Remove-input-from-Xen.patch
Patch0009: 0009-RHEL-Remove-o-glance.patch
Patch0010: 0010-RHEL-tests-Remove-btrfs-test.patch
Patch0011: 0011-RHEL-Remove-block-driver-option.patch
Patch0012: 0012-RHEL-Remove-o-ovirt-o-ovirt-upload-and-o-vdsm-modes.patch
Patch0013: 0013-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch
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-Remove-input-from-Xen.patch
Patch0008: 0008-RHEL-Remove-o-glance.patch
Patch0009: 0009-RHEL-tests-Remove-btrfs-test.patch
Patch0010: 0010-RHEL-Remove-block-driver-option.patch
Patch0011: 0011-RHEL-Remove-o-ovirt-o-ovirt-upload-and-o-vdsm-modes.patch
Patch0012: 0012-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
@ -330,8 +329,8 @@ done
%changelog
* Thu Jun 19 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.8.0-2
- Rebase to virt-v2v 2.8.0
* Thu Jun 19 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.8.1-1
- Rebase to virt-v2v 2.8.1
related: RHEL-81735
- Fix virt-v2v -v --install dnf5 error
resolves: RHEL-83288
@ -359,6 +358,10 @@ done
resolves: RHEL-95365
- virt-v2v fails to convert guests with e2fsck errors
resolves: RHEL-97600
- Improve layout of man page
resolves: RHEL-99745
- Fix xfs_repair out of memory error
resolves: RHEL-99313
* Tue Feb 11 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.1-4
- Rebase to virt-v2v 2.7.1