Remove -oo qemu-boot option completely

resolves: rhbz#2166565

0018-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch

@@ -1,4 +1,4 @@
-From 3efe400625777a68d25c49ed53e4494076ffa9b8 Mon Sep 17 00:00:00 2001
+From 6022f67501fcae3f2849b5bc944b8bb4509a068a 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
@@ -11,10 +11,10 @@ In addition you will have to edit the -display option in the
 qemu script.
 ---
  docs/virt-v2v-output-local.pod |  6 ++----
- docs/virt-v2v.pod              | 12 ------------
+ docs/virt-v2v.pod              | 17 -----------------
  output/output_qemu.ml          |  3 +++
  v2v/v2v.ml                     |  2 --
- 4 files changed, 5 insertions(+), 18 deletions(-)
+ 4 files changed, 5 insertions(+), 23 deletions(-)
 
 diff --git a/docs/virt-v2v-output-local.pod b/docs/virt-v2v-output-local.pod
 index d2a1c270..0be37f5e 100644
@@ -44,7 +44,7 @@ index d2a1c270..0be37f5e 100644
  =item B<-o null>
  
 diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
-index b458607d..246408e7 100644
+index b458607d..6cfe9e44 100644
 --- a/docs/virt-v2v.pod
 +++ b/docs/virt-v2v.pod
 @@ -144,11 +144,6 @@ Since F<guest-domain.xml> contains the path(s) to the guest disk
@@ -69,7 +69,19 @@ index b458607d..246408e7 100644
  =item B<-o> B<rhev>
  
  This is the same as I<-o rhv>.
-@@ -763,10 +755,6 @@ Print information about the source guest and stop.  This option is
+@@ -588,11 +580,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.
+ 
+-=item B<-oo qemu-boot>
+-
+-When using I<-o qemu> only, this boots the guest immediately after
+-virt-v2v finishes.
+-
+ =item B<-oo verify-server-certificate>
+ 
+ =item B<-oo verify-server-certificate=>C<true|false>
+@@ -763,10 +750,6 @@ Print information about the source guest and stop.  This option is
  useful when you are setting up network and bridge maps.
  See L</Networks and bridges>.
  

0019-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch

@@ -1,4 +1,4 @@
-From 8d0779e4d215a09dedd25d19fb7b93da8110337e Mon Sep 17 00:00:00 2001
+From 0058850e2c137a5f5d1336c2f549345f6859546f 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

0020-RHEL-Fixes-for-libguestfs-winsupport.patch

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

0021-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch

@@ -1,4 +1,4 @@
-From e555a807bd17d08dba5cb204cd894e15e135bc32 Mon Sep 17 00:00:00 2001
+From 57f7e61ca112e9f512a0dcab39339cbc53868303 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)

0022-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch

@@ -1,4 +1,4 @@
-From d389a25c7711b174a76c324efa1e5a2146bc4f59 Mon Sep 17 00:00:00 2001
+From 0209277781f0e48428b6f58931cd2fbed592ecb5 Mon Sep 17 00:00:00 2001
 From: Pino Toscano <ptoscano@redhat.com>
 Date: Wed, 8 Mar 2017 11:03:40 +0100
 Subject: [PATCH] RHEL: v2v: do not mention SUSE Xen hosts (RHBZ#1430203)

0023-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch

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

0024-RHEL-Disable-o-glance.patch

@@ -1,4 +1,4 @@
-From b589e79c9fc420855e56508992ed5f0cffd48758 Mon Sep 17 00:00:00 2001
+From bcb45753c95aab6e2ef2ae55b7675865a0cced70 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: Disable -o glance
@@ -100,7 +100,7 @@ index f5a3abad..1ab356e8 100644
  =head1 AUTHOR
  
 diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
-index 246408e7..2ecf60f5 100644
+index 6cfe9e44..d161b63f 100644
 --- a/docs/virt-v2v.pod
 +++ b/docs/virt-v2v.pod
 @@ -421,14 +421,6 @@ See L</Networks and bridges> below.
@@ -118,7 +118,7 @@ index 246408e7..2ecf60f5 100644
  =item B<-o> B<kubevirt>
  
  Set the output method to I<kubevirt>.  B<Note the way this mode works
-@@ -1177,11 +1169,6 @@ and output methods may use disk space, as outlined in the table below.
+@@ -1172,11 +1164,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 246408e7..2ecf60f5 100644
  =item I<-o local>
  
  =item I<-o qemu>
-@@ -1365,13 +1352,6 @@ instance.
+@@ -1360,13 +1347,6 @@ 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.
  

0025-RHEL-Remove-the-in-place-option.patch

@@ -1,4 +1,4 @@
-From 921197415a9e1831f0c18bde15ead39f029d1db2 Mon Sep 17 00:00:00 2001
+From e1a0fb963052ff8231e48f267a0debbb8dbbdaf6 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 2 Dec 2021 11:56:05 +0000
 Subject: [PATCH] RHEL: Remove the --in-place option
@@ -12,7 +12,7 @@ wish to support in RHEL.
  3 files changed, 17 deletions(-)
 
 diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
-index 2ecf60f5..a4aa7a96 100644
+index d161b63f..0394b421 100644
 --- a/docs/virt-v2v.pod
 +++ b/docs/virt-v2v.pod
 @@ -24,9 +24,6 @@ virtualize those machines (physical to virtual, or p2v).
@@ -36,7 +36,7 @@ index 2ecf60f5..a4aa7a96 100644
  =head2 Other virt-v2v topics
  
  L<virt-v2v-support(1)> — Supported hypervisors, virtualization
-@@ -1617,7 +1610,6 @@ L<https://rwmj.wordpress.com/2015/09/18/importing-kvm-guests-to-ovirt-or-rhev/#c
+@@ -1612,7 +1605,6 @@ L<https://rwmj.wordpress.com/2015/09/18/importing-kvm-guests-to-ovirt-or-rhev/#c
  
  L<virt-p2v(1)>,
  L<virt-v2v-inspector(1)>,

0026-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch

@@ -1,4 +1,4 @@
-From bfe11996c25e6dd69bd34601a651f4eff04b0722 Mon Sep 17 00:00:00 2001
+From a93517fa3cf0c371c8feff33fd01a2a54efac7ee Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 5 Jul 2022 11:56:54 +0100
 Subject: [PATCH] RHEL 9: -oo compressed: Remove nbdcopy version check and test

0027-RHEL-9-tests-Remove-btrfs-test.patch

@@ -1,4 +1,4 @@
-From d5b8d7cbada2bd71764b980e47c232da3c642ad4 Mon Sep 17 00:00:00 2001
+From 31781b620ba4721df6688bebce7a587c9afb43f4 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 9: tests: Remove btrfs test

virt-v2v.spec

@@ -16,7 +16,7 @@
 Name:          virt-v2v
 Epoch:         1
 Version:       2.2.0
-Release:       3%{?dist}
+Release:       4%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 
 License:       GPLv2+
@@ -351,7 +351,7 @@ done
 
 
 %changelog
-* Mon Jan 30 2023 Richard W.M. Jones <rjones@redhat.com> - 1:2.2.0-3
+* Thu Feb 02 2023 Richard W.M. Jones <rjones@redhat.com> - 1:2.2.0-4
 - Rebase to virt-v2v 2.2.0
   resolves: rhbz#2135762
 - Copy drivers for Windows 11, Windows 2019 & Windows 2022
@@ -376,6 +376,8 @@ done
   resolves: rhbz#2162332
 - -o kubevirt: Enable -oo compressed option
   resolves: rhbz#2162444
+- Remove -oo qemu-boot option completely
+  resolves: rhbz#2166565
 
 * Thu Aug 18 2022 Laszlo Ersek <lersek@redhat.com> - 1:2.0.7-6
 - Install qemu-ga package during conversion