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 eae5beb..f35155a 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,7 +1,7 @@ -From fc6b61fc9f5830de87354b329ba8dedd2e0fd361 Mon Sep 17 00:00:00 2001 +From 9f5965837da442e4402aae1f40b322070a4f060a 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 +Subject: [PATCH 01/10] RHEL: v2v: Select correct qemu binary for -o qemu mode (RHBZ#1147313). RHEL does not have qemu-system-x86_64 (etc), and in addition the @@ -16,10 +16,10 @@ support cases. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2v/output_qemu.ml b/v2v/output_qemu.ml -index d6d70c23..490576e9 100644 +index 12c56836..7391eda0 100644 --- a/v2v/output_qemu.ml +++ b/v2v/output_qemu.ml -@@ -81,7 +81,7 @@ object +@@ -79,7 +79,7 @@ object * module deals with shell and qemu comma quoting. *) let cmd = Qemuopts.create () in @@ -29,5 +29,5 @@ index d6d70c23..490576e9 100644 let flag = Qemuopts.flag cmd and arg = Qemuopts.arg cmd -- -2.30.1 +2.31.1 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 ce72232..33ec10c 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,7 +1,8 @@ -From 74ecf578578c168ee172dae7b5e8100d15fda497 Mon Sep 17 00:00:00 2001 +From 8a58d716ba714ddd9198e726b422bcd236fee2b5 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). +Subject: [PATCH 02/10] RHEL: v2v: Disable the --qemu-boot option + (RHBZ#1147313). This cannot work because there is no Gtk or SDL output mode in RHEL's qemu-kvm. @@ -42,7 +43,7 @@ index a5f155cb..3a2e6238 100644 =item B<-o json -os> C diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index 694313a8..ff02e6c9 100644 +index bdf4d716..83f6fd4d 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod @@ -141,11 +141,6 @@ Since F contains the path(s) to the guest disk @@ -57,7 +58,7 @@ index 694313a8..ff02e6c9 100644 =head1 OPTIONS =over 4 -@@ -534,9 +529,6 @@ This is similar to I<-o local>, except that a shell script is written +@@ -528,9 +523,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 +68,7 @@ index 694313a8..ff02e6c9 100644 =item B<-o> B This is the same as I<-o rhv>. -@@ -812,11 +804,6 @@ Print information about the source guest and stop. This option is +@@ -775,11 +767,6 @@ Print information about the source guest and stop. This option is useful when you are setting up network and bridge maps. See L. @@ -80,18 +81,18 @@ index 694313a8..ff02e6c9 100644 =item B<--quiet> diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml -index 3b74f307..df69e2e0 100644 +index 5e7c01f8..ac10ec31 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml -@@ -284,7 +284,6 @@ let parse_cmdline () = - s_"Estimate size of source and stop"; +@@ -276,7 +276,6 @@ let parse_cmdline () = + s_"Same as ‘-ip filename’"; [ L"print-source" ], Getopt.Set print_source, s_"Print source and stop"; - [ L"qemu-boot" ], Getopt.Set qemu_boot, s_"Boot in qemu (-o qemu only)"; [ L"root" ], Getopt.String ("ask|... ", set_root_choice), s_"How to choose root filesystem"; [ L"vddk-config" ], Getopt.String ("filename", set_input_option_compat "vddk-config"), -@@ -668,6 +667,8 @@ read the man page virt-v2v(1). +@@ -652,6 +651,8 @@ read the man page virt-v2v(1). | Some d when not (is_directory d) -> error (f_"-os %s: output directory does not exist or is not a directory") d | Some d -> d in @@ -101,5 +102,5 @@ index 3b74f307..df69e2e0 100644 output_format, output_alloc -- -2.30.1 +2.31.1 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 e7d019a..07e5de8 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,7 +1,7 @@ -From 86398c37f8f6385a8c925eda282e52a2569a9944 Mon Sep 17 00:00:00 2001 +From 0b12d6b45295cb4e1f06be2463e93fef2a793681 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 +Subject: [PATCH 03/10] RHEL: Fix list of supported sound cards to match RHEL qemu (RHBZ#1176493). --- @@ -30,5 +30,5 @@ index 7136e4be..a6c359f0 100644 (* Find the UEFI firmware. *) let find_uefi_firmware guest_arch = -- -2.30.1 +2.31.1 diff --git a/0004-RHEL-Fix-tests-for-libguestfs-winsupport.patch b/0004-RHEL-Fix-tests-for-libguestfs-winsupport.patch index 3c0636c..02f236f 100644 --- a/0004-RHEL-Fix-tests-for-libguestfs-winsupport.patch +++ b/0004-RHEL-Fix-tests-for-libguestfs-winsupport.patch @@ -1,7 +1,7 @@ -From ac1a6322b9df9364fee49e742b3fad6bc891f131 Mon Sep 17 00:00:00 2001 +From ca035dde2b4efaea38563660a51102e96e9e85e5 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. +Subject: [PATCH 04/10] RHEL: Fix tests for libguestfs-winsupport. It doesn't let us use guestfish for arbitrary Windows edits. --- @@ -75,5 +75,5 @@ index f1da222a..ff94fe39 100755 # We also update the Registry several times, for firstboot, and (ONLY -- -2.30.1 +2.31.1 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 00859d1..9c2f68d 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,7 +1,7 @@ -From b6ed3e6e33e084497d50f8fb1bc8a6565ec16f10 Mon Sep 17 00:00:00 2001 +From 44d88b1170601c31f6199667a6f23cbac4364654 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. +Subject: [PATCH 05/10] RHEL: v2v: Disable the virt-v2v --in-place option. This disables the virt-v2v --in-place option which we do not wish to support in RHEL. @@ -28,7 +28,7 @@ index dd2b1233..8fef46cc 100755 --ip,\ --it,\ diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index ff02e6c9..9f087849 100644 +index 83f6fd4d..719a95b5 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 ff02e6c9..9f087849 100644 =head2 Other virt-v2v topics -@@ -298,20 +291,6 @@ For I<-i disk> only, this specifies the format of the input disk +@@ -292,20 +285,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 ff02e6c9..9f087849 100644 =item B<-io> OPTION=VALUE Set input option(s) related to the current input mode or transport. -@@ -1335,8 +1314,8 @@ have at least 100 available inodes. +@@ -1298,8 +1277,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 ff02e6c9..9f087849 100644 $ df -h "`guestfish get-cachedir`" Filesystem Size Used Avail Use% Mounted on -@@ -1474,31 +1453,6 @@ that instead. +@@ -1437,31 +1416,6 @@ that instead. @@ -117,7 +117,7 @@ index ff02e6c9..9f087849 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 680fa89f..d33b81a7 100644 +index f08ea69a..5fb7898c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -76,7 +76,6 @@ TESTS = \ @@ -128,7 +128,7 @@ index 680fa89f..d33b81a7 100644 test-v2v-mac.sh \ test-v2v-machine-readable.sh \ test-v2v-networks-and-bridges.sh \ -@@ -225,7 +224,6 @@ EXTRA_DIST += \ +@@ -224,7 +223,6 @@ EXTRA_DIST += \ test-v2v-i-vmx-3.vmx \ test-v2v-i-vmx-4.vmx \ test-v2v-i-vmx-5.vmx \ @@ -251,10 +251,10 @@ index 6f7d78f3..00000000 -# Clean up. -rm -r $d diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml -index df69e2e0..7b79d462 100644 +index ac10ec31..01314580 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml -@@ -252,8 +252,7 @@ let parse_cmdline () = +@@ -246,8 +246,7 @@ let parse_cmdline () = s_"Use password from file to connect to input hypervisor"; [ M"it" ], Getopt.String ("transport", set_string_option_once "-it" input_transport), s_"Input transport"; @@ -264,7 +264,7 @@ index df69e2e0..7b79d462 100644 [ L"mac" ], Getopt.String ("mac:network|bridge|ip:out", add_mac), s_"Map NIC to network or bridge or assign static IP"; [ S 'n'; L"network" ], Getopt.String ("in:out", add_network), -@@ -396,7 +395,6 @@ read the man page virt-v2v(1). +@@ -386,7 +385,6 @@ read the man page virt-v2v(1). pr "vddk\n"; pr "colours-option\n"; pr "vdsm-compat-option\n"; @@ -272,7 +272,7 @@ index df69e2e0..7b79d462 100644 pr "io/oo\n"; pr "mac-option\n"; pr "bandwidth-option\n"; -@@ -572,6 +570,10 @@ read the man page virt-v2v(1). +@@ -556,6 +554,10 @@ read the man page virt-v2v(1). error (f_"only ‘-it ssh’ can be used here") in Input_vmx.input_vmx input_password input_transport arg in @@ -284,5 +284,5 @@ index df69e2e0..7b79d462 100644 let error_option_cannot_be_used_in_output_mode mode opt = error (f_"-o %s: %s option cannot be used in this output mode") mode opt -- -2.30.1 +2.31.1 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 a5118a9..0628e4b 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,7 +1,7 @@ -From cee07552e4ef7dffbf70eee8c4bd3fde0533c33b Mon Sep 17 00:00:00 2001 +From a3054b424c417d89b92d1f55aa1f59adcf7779c8 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) +Subject: [PATCH 06/10] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671) The SDL output mode is not supported in RHEL's qemu-kvm. --- @@ -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/v2v/input_disk.ml b/v2v/input_disk.ml -index d146e84c..4e403003 100644 +index b3acb5f6..5b39dbe2 100644 --- a/v2v/input_disk.ml +++ b/v2v/input_disk.ml -@@ -89,7 +89,7 @@ class input_disk input_format disk = object +@@ -88,7 +88,7 @@ class input_disk input_format disk = object s_features = [ "acpi"; "apic"; "pae" ]; s_firmware = UnknownFirmware; (* causes virt-v2v to autodetect *) s_display = @@ -22,5 +22,5 @@ index d146e84c..4e403003 100644 s_video = None; s_sound = None; -- -2.30.1 +2.31.1 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 35a0313..147ebfd 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,7 +1,7 @@ -From 2e74525029c1debe441ea6430e57ebce3279b7cc Mon Sep 17 00:00:00 2001 +From 28ab3e6e5e76678c4656dbb9cd54893f7ccdf21d 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) +Subject: [PATCH 07/10] RHEL: v2v: do not mention SUSE Xen hosts (RHBZ#1430203) They are not supported in RHEL. --- @@ -22,5 +22,5 @@ index cd3210bf..e9f336a9 100644 =head1 INPUT FROM XEN -- -2.30.1 +2.31.1 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 084564d..97fb3d3 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,7 +1,8 @@ -From 0795af0275af81058e54a9b7ad3d5e79ba66a21e Mon Sep 17 00:00:00 2001 +From 0eb7d51c403a81837a58537257202bece4e116e0 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. +Subject: [PATCH 08/10] RHEL: v2v: rhv-upload: Remove restriction on -oa + sparse. See: https://bugzilla.redhat.com/show_bug.cgi?id=1565681 and the v2v-devel private thread "Do we already support migration using FC?" @@ -12,7 +13,7 @@ and the v2v-devel private thread "Do we already support migration using FC?" 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/docs/virt-v2v-output-rhv.pod b/docs/virt-v2v-output-rhv.pod -index 7c9b478a..36c3676f 100644 +index dc6b2c0a..7b8fdc0f 100644 --- a/docs/virt-v2v-output-rhv.pod +++ b/docs/virt-v2v-output-rhv.pod @@ -5,7 +5,7 @@ virt-v2v-output-rhv - Using virt-v2v to convert guests to oVirt or RHV @@ -38,7 +39,7 @@ 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 15ba1078..ac5b3fa7 100644 +index 466de38d..34caaa6a 100644 --- a/v2v/output_rhv_upload.ml +++ b/v2v/output_rhv_upload.ml @@ -147,17 +147,10 @@ let error_unless_nbdkit_compiled_with_selinux config = @@ -85,5 +86,5 @@ index 2b0178a9..d817d915 100644 types.StorageDomain( name=params['output_storage'], -- -2.30.1 +2.31.1 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 84e8f41..82497c4 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,7 +1,7 @@ -From 649b0821d0d78065f48b3d3709769d5124fd4a3a Mon Sep 17 00:00:00 2001 +From 02c4ae37bec8c0dddfa92cd324f92ac32a928384 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 +Subject: [PATCH 09/10] RHEL: point to KB for supported v2v hypervisors/guests --- docs/virt-v2v-support.pod | 104 ++------------------------------------ @@ -123,5 +123,5 @@ index 9815f51f..1ffc0f9d 100644 =head2 Guest firmware -- -2.30.1 +2.31.1 diff --git a/0010-RHEL-9-Disable-o-glance.patch b/0010-RHEL-9-Disable-o-glance.patch new file mode 100644 index 0000000..c51d804 --- /dev/null +++ b/0010-RHEL-9-Disable-o-glance.patch @@ -0,0 +1,200 @@ +From e425f0836c502799c05cdcd6e215de4fff994e70 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Wed, 30 Jun 2021 11:15:52 +0100 +Subject: [PATCH 10/10] RHEL 9: Disable -o glance + +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1977539 +--- + docs/virt-v2v-output-openstack.pod | 56 ++---------------------------- + docs/virt-v2v.pod | 22 ------------ + tests/test-v2v-o-glance.sh | 3 ++ + v2v/cmdline.ml | 3 -- + v2v/output_glance.ml | 2 +- + 5 files changed, 6 insertions(+), 80 deletions(-) + +diff --git a/docs/virt-v2v-output-openstack.pod b/docs/virt-v2v-output-openstack.pod +index f5a3abad..1ab356e8 100644 +--- a/docs/virt-v2v-output-openstack.pod ++++ b/docs/virt-v2v-output-openstack.pod +@@ -10,13 +10,10 @@ virt-v2v-output-openstack - Using virt-v2v to convert guests to OpenStack + [-oo verify-server-certificate=false] + [-oo os-username=admin] [-oo os-*=*] + +- virt-v2v [-i* options] -o glance +- + =head1 DESCRIPTION + + This page documents how to use L to convert guests to run +-on OpenStack. There are two output modes you can select, but only +-I<-o openstack> should be used normally. ++on OpenStack. + + =over 4 + +@@ -27,15 +24,6 @@ Full description: L + This is the modern method for uploading to OpenStack via the REST API. + Guests can be directly converted into Cinder volumes. + +-=item B<-o glance> +- +-Full description: L +- +-This is the old method for uploading to Glance. Unfortunately Glance +-is not well suited to storing converted guests (since virt-v2v deals +-with "pets" not templated "cattle"), so this method is not recommended +-unless you really know what you are doing. +- + =back + + =head1 OUTPUT TO OPENSTACK +@@ -170,50 +158,10 @@ no Cinder volume type is used. + The following options are B supported with OpenStack: I<-oa>, + I<-of>. + +-=head1 OUTPUT TO GLANCE +- +-Note this is a legacy option. In most cases you should use +-L instead. +- +-To output to OpenStack Glance, use the I<-o glance> option. +- +-This runs the L CLI program which must be installed on the +-virt-v2v conversion host. For authentication to work, you will need +-to set C environment variables. +- +-Normally there is a file called C or C +-which you can simply C to set everything up. +- +-Virt-v2v adds metadata for the guest to Glance, describing such things +-as the guest operating system and what drivers it requires. The +-command C will display the metadata as "Property" +-fields such as C and C. +- +-=head2 Glance and sparseness +- +-Glance image upload doesn't appear to correctly handle sparseness. +-For this reason, using qcow2 will be faster and use less space on the +-Glance server. Use the virt-v2v S> option. +- +-=head2 Glance and multiple disks +- +-If the guest has a single disk, then the name of the disk in Glance +-will be the name of the guest. You can control this using the I<-on> +-option. +- +-Glance doesn't have a concept of associating multiple disks with a +-single guest, and Nova doesn't allow you to boot a guest from multiple +-Glance disks either. If the guest has multiple disks, then the first +-(assumed to be the system disk) will have the name of the guest, and +-the second and subsequent data disks will be called +-C-disk2>, C-disk3> etc. It may be best to +-leave the system disk in Glance, and import the data disks to Cinder. +- + =head1 SEE ALSO + + L, +-L, +-L. ++L. + + =head1 AUTHOR + +diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod +index 719a95b5..2f4fe86c 100644 +--- a/docs/virt-v2v.pod ++++ b/docs/virt-v2v.pod +@@ -422,20 +422,10 @@ interested in looking at the metadata. + This option is not compatible with I<-o libvirt> since it would create + a faulty guest (one with no disks). + +-This option is not compatible with I<-o glance> for technical reasons. +- + =item B<-o> B + + This is the same as I<-o local>. + +-=item B<-o> B +- +-This is a legacy option. You should probably use I<-o openstack> +-instead. +- +-Set the output method to OpenStack Glance. In this mode the converted +-guest is uploaded to Glance. See L. +- + =item B<-o> B + + Set the output method to I. +@@ -1148,11 +1138,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). + +-=item I<-o glance> +- +-This temporarily places a full copy of the output disks in +-C<$VIRT_V2V_TMPDIR> (or F). +- + =item I<-o local> + + =item I<-o qemu> +@@ -1337,13 +1322,6 @@ instance. + Because of how Cinder volumes are presented as F block devices, + using I<-o openstack> normally requires that virt-v2v is run as root. + +-=item Writing to Glance +- +-This does I need root (in fact it probably won’t work), but may +-require either a special user and/or for you to source a script that +-sets authentication environment variables. Consult the Glance +-documentation. +- + =item Writing to block devices + + This normally requires root. See the next section. +diff --git a/tests/test-v2v-o-glance.sh b/tests/test-v2v-o-glance.sh +index 162c397e..48d45dce 100755 +--- a/tests/test-v2v-o-glance.sh ++++ b/tests/test-v2v-o-glance.sh +@@ -20,6 +20,9 @@ + + set -e + ++# Feature is disabled in RHEL 9. ++exit 77 ++ + $TEST_FUNCTIONS + skip_if_skipped + skip_if_backend uml +diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml +index 01314580..e6c86b6f 100644 +--- a/v2v/cmdline.ml ++++ b/v2v/cmdline.ml +@@ -170,7 +170,6 @@ let parse_cmdline () = + if !output_mode <> `Not_set then + error (f_"%s option used more than once on the command line") "-o"; + match mode with +- | "glance" -> output_mode := `Glance + | "libvirt" -> output_mode := `Libvirt + | "disk" | "local" -> output_mode := `Local + | "json" -> output_mode := `JSON +@@ -323,8 +322,6 @@ let parse_cmdline () = + + virt-v2v -i disk disk.img -o local -os /var/tmp + +- virt-v2v -i disk disk.img -o glance +- + There is a companion front-end called \"virt-p2v\" which comes as an + ISO or CD image that can be booted on physical machines. + +diff --git a/v2v/output_glance.ml b/v2v/output_glance.ml +index 8c5426b9..3fce4e7a 100644 +--- a/v2v/output_glance.ml ++++ b/v2v/output_glance.ml +@@ -100,4 +100,4 @@ object + end + + let output_glance = new output_glance +-let () = Modules_list.register_output_module "glance" ++(* let () = Modules_list.register_output_module "glance" *) +-- +2.31.1 + diff --git a/sources b/sources index 7d40232..41968b2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (virt-v2v-1.45.1.tar.gz) = be9cb75c2fe01e989d0b1f35e8496ed7e78076d17b4a4e7b24b6372a8cc3ed633d749dc5e5adf2d7c0d2a8a61f81b3d71cba47917f6a5e91edca341f2827627e -SHA512 (virt-v2v-1.45.1.tar.gz.sig) = 94afc18b3c5954b318dcf668fc6f71b5a3f9b0568f2b0bc27eea92a92096a1197cc24048b18df2a2d69ece56b2864ba5dcc1e4c0d469903ff631d541646ea3d2 +SHA512 (virt-v2v-1.45.2.tar.gz) = 908c762b2200ca2125b7623fe4d14253e0d91de6e7691e540b1e70f68d4a18b8c21de75c894240cf6a0ae5296845dec5cd4cbac5f30c614ffa2c293649a3e6e1 +SHA512 (virt-v2v-1.45.2.tar.gz.sig) = 89c19dcc995472b958a1a6f5b5769331e014fc1d2fafd1abddb5edf78b32baf93135e2a57bee5c33de9f782c30970101921aea4b965ff308da9117850d717ba6 diff --git a/virt-v2v.spec b/virt-v2v.spec index dd43f15..b6865f0 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -14,8 +14,8 @@ Name: virt-v2v Epoch: 1 -Version: 1.45.1 -Release: 1%{?dist}.1 +Version: 1.45.2 +Release: 1%{?dist} Summary: Convert a virtual machine to run on KVM License: GPLv2+ @@ -59,6 +59,7 @@ Patch9006: 0006-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch Patch9007: 0007-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch Patch9008: 0008-RHEL-v2v-rhv-upload-Remove-restriction-on-oa-sparse.patch Patch9009: 0009-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch +Patch9010: 0010-RHEL-9-Disable-o-glance.patch %endif %if 0%{patches_touch_autotools} @@ -285,6 +286,12 @@ popd %changelog +* Wed Jun 30 2021 Richard W.M. Jones - 1:1.45.2-1 +- New upstream development version 1.45.2. +- Remove --debug-overlays and --print-estimate options. +- Remove -o glance option on RHEL 9 (RHBZ#1977539). +- Remove support for RHEV-APT (RHBZ#1945549). + * Wed Jun 16 2021 Richard W.M. Jones - 1:1.45.1-1.el9.1 - New upstream development version 1.45.1. - Require virtio-win on RHEL (RHBZ#1972644).