.gitignore

@@ -1,2 +1 @@
-SOURCES/libguestfs.keyring
 SOURCES/virt-v2v-2.5.6.tar.gz

.virt-v2v.metadata

@@ -1,2 +1 @@
-1bbc40f501a7fef9eef2a39b701a71aee2fea7c4 SOURCES/libguestfs.keyring
 7c49844a2ffb54d6fcb58eca1dbf57b110d5d47e  SOURCES/virt-v2v-2.5.6.tar.gz

SOURCES/0022-convert-windows-Ignore-sriov-drivers-on-virtio-win.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] mlcustomize: Ignore sriov drivers on virtio-win disk
 Fixes: https://issues.redhat.com/browse/RHEL-56383
 Thanks: Vadim Rozenfeld
 ---
- common/mlcustomize/inject_virtio_win.ml | 11 +++++++++--
+ mlcustomize/inject_virtio_win.ml | 11 +++++++++--
  1 file changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/common/mlcustomize/inject_virtio_win.ml b/common/mlcustomize/inject_virtio_win.ml
@@ -38,6 +38,3 @@ index afec1e4..88c1c8c 100644
      match_os_variant os_variant &&
      match_osinfo osinfo
  
--- 
-2.43.0
-

SPECS/virt-v2v.spec

@@ -49,7 +49,10 @@ Patch0018:     0018-RHEL-9-tests-Remove-btrfs-test.patch
 Patch0019:     0019-RHEL-9-Remove-block-driver-option.patch
 Patch0020:     0020-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch
 Patch0021:     0021-convert-windows-Online-all-virtio-disks-at-first-boo.patch
-Patch0022:     0022-convert-windows-Ignore-sriov-drivers-on-virtio-win-d.patch
+
+# Patches were taken from:
+# https://github.com/libguestfs/libguestfs-common/commit/94619ded353081255409eb3ffae51061adcbf9a4
+Patch0022:     0022-convert-windows-Ignore-sriov-drivers-on-virtio-win.patch 
 
 %if !0%{?rhel}
 # libguestfs hasn't been built on i686 for a while since there is no
@@ -353,11 +356,10 @@ make -C tests TESTS=test-v2v-fedora-luks-on-lvm-conversion.sh check
 
 
 %changelog
-* Thu Sep 12 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.6-7
+* Wed Oct 16 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 1:2.5.6-7
-- Bump and rebuild to resolve rhel-9.5.0 branch issue
+- Add 0022-convert-windows-Ignore-sriov-drivers-on-virtio-win.patch
-  related: RHEL-56383
 
-* Fri Sep 06 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.6-6
+* Thu Aug 29 2024 Richard W.M. Jones <rjones@redhat.com> - 1:2.5.6-5
 - convert: windows: Ignore sriov drivers on virtio-win disk
   resolves: RHEL-56383