diff --git a/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch b/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch index 69fcfc1..eae5beb 100644 --- a/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch +++ b/0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch @@ -1,4 +1,4 @@ -From 21781d79e323f7eaee7deb6981ecb783e35a39af Mon Sep 17 00:00:00 2001 +From fc6b61fc9f5830de87354b329ba8dedd2e0fd361 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 28 Sep 2014 19:14:43 +0100 Subject: [PATCH 1/9] RHEL: v2v: Select correct qemu binary for -o qemu mode diff --git a/0002-RHEL-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch b/0002-RHEL-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch index 837d7de..ce72232 100644 --- a/0002-RHEL-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch +++ b/0002-RHEL-v2v-Disable-the-qemu-boot-option-RHBZ-1147313.patch @@ -1,4 +1,4 @@ -From 05de88f9fe2415664adff793351f916cc6a01485 Mon Sep 17 00:00:00 2001 +From 74ecf578578c168ee172dae7b5e8100d15fda497 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Sep 2014 10:50:27 +0100 Subject: [PATCH 2/9] RHEL: v2v: Disable the --qemu-boot option (RHBZ#1147313). @@ -42,10 +42,10 @@ index a5f155cb..3a2e6238 100644 =item B<-o json -os> C diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index fb8b6a5d..924e1d2d 100644 +index 694313a8..ff02e6c9 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod -@@ -144,11 +144,6 @@ Since F contains the path(s) to the guest disk +@@ -141,11 +141,6 @@ Since F 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. @@ -57,7 +57,7 @@ index fb8b6a5d..924e1d2d 100644 =head1 OPTIONS =over 4 -@@ -537,9 +532,6 @@ This is similar to I<-o local>, except that a shell script is written +@@ -534,9 +529,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>. @@ -67,7 +67,7 @@ index fb8b6a5d..924e1d2d 100644 =item B<-o> B This is the same as I<-o rhv>. -@@ -815,11 +807,6 @@ Print information about the source guest and stop. This option is +@@ -812,11 +804,6 @@ Print information about the source guest and stop. This option is useful when you are setting up network and bridge maps. See L. diff --git a/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch b/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch index 61b73d2..e7d019a 100644 --- a/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch +++ b/0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch @@ -1,4 +1,4 @@ -From f3c0c18b122b55e3f94b3bb757addaf18c2c5b6f Mon Sep 17 00:00:00 2001 +From 86398c37f8f6385a8c925eda282e52a2569a9944 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 24 Apr 2015 09:45:41 -0400 Subject: [PATCH 3/9] RHEL: Fix list of supported sound cards to match RHEL diff --git a/0004-RHEL-Fix-tests-for-libguestfs-winsupport.patch b/0004-RHEL-Fix-tests-for-libguestfs-winsupport.patch index 41ecc50..3c0636c 100644 --- a/0004-RHEL-Fix-tests-for-libguestfs-winsupport.patch +++ b/0004-RHEL-Fix-tests-for-libguestfs-winsupport.patch @@ -1,4 +1,4 @@ -From 2a4386e45aa52ebfdd501a8189458e2a6bad4708 Mon Sep 17 00:00:00 2001 +From ac1a6322b9df9364fee49e742b3fad6bc891f131 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 30 Aug 2015 03:21:57 -0400 Subject: [PATCH 4/9] RHEL: Fix tests for libguestfs-winsupport. diff --git a/0005-RHEL-v2v-Disable-the-virt-v2v-in-place-option.patch b/0005-RHEL-v2v-Disable-the-virt-v2v-in-place-option.patch index 01b5efa..00859d1 100644 --- a/0005-RHEL-v2v-Disable-the-virt-v2v-in-place-option.patch +++ b/0005-RHEL-v2v-Disable-the-virt-v2v-in-place-option.patch @@ -1,4 +1,4 @@ -From 1d74df726204bb9c6220ccd0505c8b63db10f833 Mon Sep 17 00:00:00 2001 +From b6ed3e6e33e084497d50f8fb1bc8a6565ec16f10 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 14 Jan 2016 11:53:42 -0500 Subject: [PATCH 5/9] RHEL: v2v: Disable the virt-v2v --in-place option. @@ -28,7 +28,7 @@ index dd2b1233..8fef46cc 100755 --ip,\ --it,\ diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index 924e1d2d..4016c724 100644 +index ff02e6c9..9f087849 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod @@ -8,10 +8,6 @@ virt-v2v - Convert a guest to use KVM @@ -52,7 +52,7 @@ index 924e1d2d..4016c724 100644 =head2 Other virt-v2v topics -@@ -301,20 +294,6 @@ For I<-i disk> only, this specifies the format of the input disk +@@ -298,20 +291,6 @@ For I<-i disk> only, this specifies the format of the input disk image. For other input methods you should specify the input format in the metadata. @@ -73,7 +73,7 @@ index 924e1d2d..4016c724 100644 =item B<-io> OPTION=VALUE Set input option(s) related to the current input mode or transport. -@@ -1338,8 +1317,8 @@ have at least 100 available inodes. +@@ -1335,8 +1314,8 @@ have at least 100 available inodes. =head3 Minimum free space check in the host You must have sufficient free space in the host directory used to @@ -84,7 +84,7 @@ index 924e1d2d..4016c724 100644 $ df -h "`guestfish get-cachedir`" Filesystem Size Used Avail Use% Mounted on -@@ -1477,31 +1456,6 @@ that instead. +@@ -1474,31 +1453,6 @@ that instead. @@ -117,7 +117,7 @@ index 924e1d2d..4016c724 100644 The I<--machine-readable> option can be used to make the output more diff --git a/tests/Makefile.am b/tests/Makefile.am -index 871dc3c9..eee4e1af 100644 +index 680fa89f..d33b81a7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -76,7 +76,6 @@ TESTS = \ 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 8ffe091..a5118a9 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 bf5b711b261a6a577a441235db68ad58b20711bd Mon Sep 17 00:00:00 2001 +From cee07552e4ef7dffbf70eee8c4bd3fde0533c33b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 2 Mar 2017 14:21:37 +0100 Subject: [PATCH 6/9] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671) diff --git a/0007-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch b/0007-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch index 1e0fd47..35a0313 100644 --- a/0007-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch +++ b/0007-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch @@ -1,4 +1,4 @@ -From d3eece67059c836c88f6001a5a928a3063a1aaa2 Mon Sep 17 00:00:00 2001 +From 2e74525029c1debe441ea6430e57ebce3279b7cc Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Wed, 8 Mar 2017 11:03:40 +0100 Subject: [PATCH 7/9] RHEL: v2v: do not mention SUSE Xen hosts (RHBZ#1430203) @@ -9,7 +9,7 @@ They are not supported in RHEL. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/virt-v2v-input-xen.pod b/docs/virt-v2v-input-xen.pod -index 3b3cf0f0..32da2848 100644 +index cd3210bf..e9f336a9 100644 --- a/docs/virt-v2v-input-xen.pod +++ b/docs/virt-v2v-input-xen.pod @@ -12,7 +12,7 @@ virt-v2v-input-xen - Using virt-v2v to convert guests from Xen diff --git a/0008-RHEL-v2v-rhv-upload-Remove-restriction-on-oa-sparse.patch b/0008-RHEL-v2v-rhv-upload-Remove-restriction-on-oa-sparse.patch index a1ad4a0..084564d 100644 --- a/0008-RHEL-v2v-rhv-upload-Remove-restriction-on-oa-sparse.patch +++ b/0008-RHEL-v2v-rhv-upload-Remove-restriction-on-oa-sparse.patch @@ -1,4 +1,4 @@ -From fba7d8bf5dad6fce2a0122570f6b69e0db9ce697 Mon Sep 17 00:00:00 2001 +From 0795af0275af81058e54a9b7ad3d5e79ba66a21e Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 14 May 2018 10:16:58 +0100 Subject: [PATCH 8/9] RHEL: v2v: rhv-upload: Remove restriction on -oa sparse. @@ -38,10 +38,10 @@ index 7c9b478a..36c3676f 100644 A file containing a password to be used when connecting to the oVirt diff --git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml -index dbef7011..27925d7d 100644 +index 15ba1078..ac5b3fa7 100644 --- a/v2v/output_rhv_upload.ml +++ b/v2v/output_rhv_upload.ml -@@ -135,17 +135,10 @@ let error_unless_nbdkit_compiled_with_selinux config = +@@ -147,17 +147,10 @@ let error_unless_nbdkit_compiled_with_selinux config = error (f_"nbdkit was compiled without SELinux support. You will have to recompile nbdkit with libselinux-devel installed, or else set SELinux to Permissive mode while doing the conversion.") ) @@ -60,14 +60,14 @@ index dbef7011..27925d7d 100644 let json_optstring = function | Some s -> JSON.String s | None -> JSON.Null -@@ -253,7 +246,6 @@ object +@@ -265,7 +258,6 @@ object error_unless_nbdkit_min_version config; error_unless_nbdkit_python_plugin_working plugin_script; error_unless_nbdkit_compiled_with_selinux config; - error_unless_output_alloc_sparse output_alloc; (* Python code prechecks. *) - let precheck_fn = tmpdir // "v2vprecheck.json" in + let json_params = match rhv_options.rhv_disk_uuids with diff --git a/v2v/rhv-upload-plugin.py b/v2v/rhv-upload-plugin.py index 2b0178a9..d817d915 100644 --- a/v2v/rhv-upload-plugin.py diff --git a/0009-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch b/0009-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch index a7b5eb3..84e8f41 100644 --- a/0009-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch +++ b/0009-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch @@ -1,4 +1,4 @@ -From b003d781dacf76572e11fad17ea699a99a324f54 Mon Sep 17 00:00:00 2001 +From 649b0821d0d78065f48b3d3709769d5124fd4a3a Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 26 Mar 2019 09:42:25 +0100 Subject: [PATCH 9/9] RHEL: point to KB for supported v2v hypervisors/guests