Rebase to virt-v2v 2.2.0

resolves: rhbz#2135762 Include the BOCHS DRM driver in the initial ram disk resolves: rhbz#2131123 windows_virtio: favor "fwcfg" over "qemufwcfg" resolves: rhbz#2151752 -o rhv-upload: set ovirt:id correctly resolves: rhbz#2152465 Enable the %check tests
2023-01-10 15:23:53 +00:00 · 2023-01-10 15:23:53 +00:00 · ef9a918d7e
commit ef9a918d7e
parent 5eebd819d3
43 changed files with 108 additions and 3901 deletions
--- 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 d7c0992dfb11982d96cac8e279c454d82787918a Mon Sep 17 00:00:00 2001
+From d68e2f083683c631666cda5c4d13c8d569f7a46b 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
@ -16,10 +16,10 @@ support cases.
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/output/output_qemu.ml b/output/output_qemu.ml
-index 3269fba5..7f2e9284 100644
+index 5788fc42..46fd598c 100644
 --- a/output/output_qemu.ml
 +++ b/output/output_qemu.ml
-@@ -137,7 +137,7 @@ module QEMU = struct
+@@ -141,7 +141,7 @@ module QEMU = struct
      * module deals with shell and qemu comma quoting.
      *)
     let cmd = Qemuopts.create () in
--- a/0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
+++ b/0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
@ -1,4 +1,4 @@
-From 610f53a67a0804ee76e9213c503b7bb00dd722b8 Mon Sep 17 00:00:00 2001
+From 0d8ed33d6cdd6011bed171331cf0b548ce45c18d 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
@ -44,10 +44,10 @@ index d2a1c270..0be37f5e 100644
 =item B<-o null>
 diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
-index 4e912b6c..7d0bafff 100644
+index b458607d..246408e7 100644
 --- a/docs/virt-v2v.pod
 +++ b/docs/virt-v2v.pod
-@@ -139,11 +139,6 @@ Since F<guest-domain.xml> contains the path(s) to the guest disk
+@@ -144,11 +144,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.
@ -59,7 +59,7 @@ index 4e912b6c..7d0bafff 100644
 =head1 OPTIONS
 =over 4
-@@ -487,9 +482,6 @@ This is similar to I<-o local>, except that a shell script is written
+@@ -507,9 +502,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>.
@ -69,7 +69,7 @@ index 4e912b6c..7d0bafff 100644
 =item B<-o> B<rhev>
 This is the same as I<-o rhv>.
-@@ -743,10 +735,6 @@ Print information about the source guest and stop.  This option is
+@@ -763,10 +755,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>.
@ -81,12 +81,12 @@ index 4e912b6c..7d0bafff 100644
 =item B<--quiet>
 diff --git a/output/output_qemu.ml b/output/output_qemu.ml
-index 7f2e9284..527d3c5e 100644
+index 46fd598c..e7efbb73 100644
 --- a/output/output_qemu.ml
 +++ b/output/output_qemu.ml
-@@ -63,6 +63,9 @@ module QEMU = struct
+@@ -65,6 +65,9 @@ module QEMU = struct
-       ) options.output_options;
+     let compressed = !compressed
-     let qemu_boot = !qemu_boot in
+     and qemu_boot = !qemu_boot in
 +    if qemu_boot then
 +      error (f_"-o qemu: the -oo qemu-boot option cannot be used in RHEL");
@ -95,7 +95,7 @@ index 7f2e9284..527d3c5e 100644
     let output_storage =
       match options.output_storage with
 diff --git a/v2v/v2v.ml b/v2v/v2v.ml
-index 9790416e..97b4e4ec 100644
+index fcf5e2d4..27df44e8 100644
 --- a/v2v/v2v.ml
 +++ b/v2v/v2v.ml
@@ -270,8 +270,6 @@ let rec main () =
--- 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 b61fc893f429eb4bec34816d667cc930e50ccd0f Mon Sep 17 00:00:00 2001
+From b2ca2747a705cba4d97a9c35d15453e5e78e1c81 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
@ -9,7 +9,7 @@ Subject: [PATCH] RHEL: Fix list of supported sound cards to match RHEL qemu
 1 file changed, 3 insertions(+), 2 deletions(-)
 diff --git a/lib/utils.ml b/lib/utils.ml
-index 128bb697..7116a4f9 100644
+index 26e7e259..e355eb3e 100644
 --- a/lib/utils.ml
 +++ b/lib/utils.ml
@@ -60,13 +60,14 @@ let kvm_arch = function
--- a/0004-RHEL-Fixes-for-libguestfs-winsupport.patch
+++ b/0004-RHEL-Fixes-for-libguestfs-winsupport.patch
@ -1,4 +1,4 @@
-From 5d70bf1302ea3f1006d87672676f86eb5d40eb85 Mon Sep 17 00:00:00 2001
+From 46c605335dfb6db59b696e38b7f86b7b5811ac04 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.
@ -14,7 +14,7 @@ In virt-v2v helpers we must set the program name to virt-v2v.
 5 files changed, 17 insertions(+), 2 deletions(-)
 diff --git a/convert/convert.ml b/convert/convert.ml
-index 87fca725..5e0e6c2b 100644
+index 8d62f6d4..a1bfdcee 100644
 --- a/convert/convert.ml
 +++ b/convert/convert.ml
@@ -51,6 +51,7 @@ let rec convert dir options source =
@ -26,10 +26,10 @@ index 87fca725..5e0e6c2b 100644
   (* Setting the number of vCPUs allows parallel mkinitrd, but make
    * sure this is not too large because each vCPU consumes guest RAM.
 diff --git a/convert/windows_virtio.ml b/convert/windows_virtio.ml
-index a27cd6a5..183166b7 100644
+index d9fda13f..c97e3fce 100644
 --- a/convert/windows_virtio.ml
 +++ b/convert/windows_virtio.ml
-@@ -241,6 +241,7 @@ and copy_from_virtio_win g inspect srcdir destdir filter missing =
+@@ -258,6 +258,7 @@ and copy_from_virtio_win g inspect srcdir destdir filter missing =
     let g2 =
       try
         let g2 = open_guestfs ~identifier:"virtio_win" () in
--- a/0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
+++ b/0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
@ -1,4 +1,4 @@
-From 37e241d6d4f22331b34c2ed0af233c73be2b0869 Mon Sep 17 00:00:00 2001
+From cf946574bfea15242fa0367bf4ccf9ed4b7790d0 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)
--- a/0006-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
+++ b/0006-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
@ -1,4 +1,4 @@
-From 8ee8aec8739c6c0a4024ad187be56f525e8089c0 Mon Sep 17 00:00:00 2001
+From 588cb7ba9e87d35e91bacbc95a1044969d3964e3 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)
@ -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 8080ebea..ad5772de 100644
+index 4a0544f8..9c3981e1 100644
 --- a/docs/virt-v2v-input-xen.pod
 +++ b/docs/virt-v2v-input-xen.pod
@@ -11,7 +11,7 @@ virt-v2v-input-xen - Using virt-v2v to convert guests from Xen
--- a/0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
+++ b/0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
@ -1,4 +1,4 @@
-From fd0c34d843bb5ba9e1b33e0dfd1250943c760a70 Mon Sep 17 00:00:00 2001
+From 52311a826b2a1f1e6d3a2bb0f20ed39e4dd57c5c 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
--- a/0008-RHEL-Disable-o-glance.patch
+++ b/0008-RHEL-Disable-o-glance.patch
@ -1,4 +1,4 @@
-From 14507902a675fd2e0356c0faf67524eb04e974d2 Mon Sep 17 00:00:00 2001
+From 3102ba0d304f3d0ad216f9f67cb554fb385cac26 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,10 +100,10 @@ index f5a3abad..1ab356e8 100644
 =head1 AUTHOR
 diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
-index 7d0bafff..84e049cc 100644
+index 246408e7..2ecf60f5 100644
 --- a/docs/virt-v2v.pod
 +++ b/docs/virt-v2v.pod
-@@ -416,14 +416,6 @@ See L</Networks and bridges> below.
+@@ -421,14 +421,6 @@ See L</Networks and bridges> below.
 This is the same as I<-o local>.
@ -115,10 +115,10 @@ index 7d0bafff..84e049cc 100644
 -Set the output method to OpenStack Glance.  In this mode the converted
 -guest is uploaded to Glance.  See L<virt-v2v-output-openstack(1)>.
 -
- =item B<-o> B<json>
+ =item B<-o> B<kubevirt>
- This option is deprecated and will be removed in S<virt-v2v 2.2>.
+ Set the output method to I<kubevirt>.  B<Note the way this mode works
-@@ -1148,11 +1140,6 @@ and output methods may use disk space, as outlined in the table below.
+@@ -1177,11 +1169,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 7d0bafff..84e049cc 100644
 =item I<-o local>
 =item I<-o qemu>
-@@ -1336,13 +1323,6 @@ instance.
+@@ -1365,13 +1352,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.
@ -169,7 +169,7 @@ index c0db9115..074b5e16 100755
 set -e
 set -x
 diff --git a/v2v/v2v.ml b/v2v/v2v.ml
-index 97b4e4ec..41e020cb 100644
+index 27df44e8..fc5b8af0 100644
 --- a/v2v/v2v.ml
 +++ b/v2v/v2v.ml
@@ -192,7 +192,6 @@ let rec main () =
@ -177,15 +177,15 @@ index 97b4e4ec..41e020cb 100644
       error (f_"%s option used more than once on the command line") "-o";
     match mode with
 -    | "glance" -> output_mode := `Glance
     | "kubevirt" -> output_mode := `Kubevirt
     | "libvirt" -> output_mode := `Libvirt
     | "disk" | "local" -> output_mode := `Disk
     | "json" -> output_mode := `JSON
@@ -250,7 +249,7 @@ let rec main () =
       s_"Map network ‘in’ to ‘out’";
     [ L"no-trim" ],  Getopt.String ("-", no_trim_warning),
       s_"Ignored for backwards compatibility";
-    [ S 'o' ],       Getopt.String ("glance|json|libvirt|local|null|openstack|qemu|rhv|rhv-upload|vdsm", set_output_mode),
+-    [ S 'o' ],       Getopt.String ("glance|kubevirt|libvirt|local|null|openstack|qemu|rhv|rhv-upload|vdsm", set_output_mode),
-+    [ S 'o' ],       Getopt.String ("json|libvirt|local|null|openstack|qemu|rhv|rhv-upload|vdsm", set_output_mode),
+    [ S 'o' ],       Getopt.String ("kubevirt|libvirt|local|null|openstack|qemu|rhv|rhv-upload|vdsm", set_output_mode),
       s_"Set output mode (default: libvirt)";
     [ M"oa" ],       Getopt.String ("sparse|preallocated", set_output_alloc),
                                     s_"Set output allocation mode";
@ -203,7 +203,7 @@ index 97b4e4ec..41e020cb 100644
       pr "input:ova\n";
       pr "input:vmx\n";
 -      pr "output:glance\n";
-       pr "output:json\n";
+       pr "output:kubevirt\n";
       pr "output:libvirt\n";
       pr "output:local\n";
@@ -481,7 +477,6 @@ read the man page virt-v2v(1).
@ -211,6 +211,6 @@ index 97b4e4ec..41e020cb 100644
     | `Null -> (module Output_null.Null)
     | `QEmu -> (module Output_qemu.QEMU)
 -    | `Glance -> (module Output_glance.Glance)
     | `Kubevirt -> (module Output_kubevirt.Kubevirt)
     | `Openstack -> (module Output_openstack.Openstack)
     | `RHV_Upload -> (module Output_rhv_upload.RHVUpload)
     | `RHV -> (module Output_rhv.RHV)
--- a/0009-RHEL-Remove-the-in-place-option.patch
+++ b/0009-RHEL-Remove-the-in-place-option.patch
@ -1,4 +1,4 @@
-From 1176553cf7a9a7f7961887372757234ffdfae2bd Mon Sep 17 00:00:00 2001
+From 24cabe5685464c9065adb11ed186ddaad7e465dc 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,12 +12,12 @@ wish to support in RHEL.
 3 files changed, 17 deletions(-)
 diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
-index 84e049cc..7ad22f00 100644
+index 2ecf60f5..a4aa7a96 100644
 --- a/docs/virt-v2v.pod
 +++ b/docs/virt-v2v.pod
-@@ -21,9 +21,6 @@ There is also a companion front-end called L<virt-p2v(1)> which comes
+@@ -24,9 +24,6 @@ virtualize those machines (physical to virtual, or p2v).
- as an ISO, CD or PXE image that can be booted on physical machines to
+ To estimate the disk space needed before conversion, see
- virtualize those machines (physical to virtual, or p2v).
+ L<virt-v2v-inspector(1)>.
 -For in-place conversion, there is a separate tool called
 -L<virt-v2v-in-place(1)>.
@ -25,7 +25,7 @@ index 84e049cc..7ad22f00 100644
 =head2 Input and Output
 You normally run virt-v2v with several I<-i*> options controlling the
-@@ -36,10 +33,6 @@ The input and output sides of virt-v2v are separate and unrelated.
+@@ -39,10 +36,6 @@ The input and output sides of virt-v2v are separate and unrelated.
 Virt-v2v can read from any input and write to any output.  Therefore
 these sides of virt-v2v are documented separately in this manual.
@ -36,16 +36,16 @@ index 84e049cc..7ad22f00 100644
 =head2 Other virt-v2v topics
 L<virt-v2v-support(1)> — Supported hypervisors, virtualization
-@@ -1587,7 +1580,6 @@ L<https://rwmj.wordpress.com/2015/09/18/importing-kvm-guests-to-ovirt-or-rhev/#c
+@@ -1617,7 +1610,6 @@ L<https://rwmj.wordpress.com/2015/09/18/importing-kvm-guests-to-ovirt-or-rhev/#c
 =head1 SEE ALSO
 L<virt-p2v(1)>,
 L<virt-v2v-inspector(1)>,
 -L<virt-v2v-in-place(1)>,
 L<virt-customize(1)>,
 L<virt-df(1)>,
 L<virt-filesystems(1)>,
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index d36e230b..db32e42b 100644
+index a4c87398..998b871d 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
@@ -77,7 +77,6 @@ TESTS = \
@ -53,11 +53,11 @@ index d36e230b..db32e42b 100644
 	test-v2v-i-disk.sh \
 	test-v2v-i-ova.sh \
 -	test-v2v-in-place.sh \
 	test-v2v-inspector.sh \
 	test-v2v-mac.sh \
 	test-v2v-machine-readable.sh \
 	test-v2v-networks-and-bridges.sh \
 diff --git a/v2v/v2v.ml b/v2v/v2v.ml
-index 41e020cb..e00f9814 100644
+index fc5b8af0..f60c82f3 100644
 --- a/v2v/v2v.ml
 +++ b/v2v/v2v.ml
@@ -214,12 +214,6 @@ let rec main () =
--- a/0010-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch
+++ b/0010-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch
@ -1,4 +1,4 @@
-From b61a03ad272bb08ff5ca757ade6a23bfef34fdc9 Mon Sep 17 00:00:00 2001
+From 7ee1a1d7a52772dac78cbf060b4303d6987b675b 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
@ -12,10 +12,10 @@ separately.  Thus remove the version check and test.
 2 files changed, 12 deletions(-)
 diff --git a/output/output.ml b/output/output.ml
-index 23c3932d..496c32b6 100644
+index 6065e592..8f83a324 100644
 --- a/output/output.ml
 +++ b/output/output.ml
-@@ -83,17 +83,6 @@ let output_to_local_file ?(changeuid = fun f -> f ()) ?(compressed = false)
+@@ -86,17 +86,6 @@ let output_to_local_file ?(changeuid = fun f -> f ()) ?(compressed = false)
     if output_format <> "qcow2" then
       error (f_"‘-oo compressed’ is only allowed when the output format \
                 is a local qcow2-format file, i.e. ‘-of qcow2’");
@ -34,10 +34,10 @@ index 23c3932d..496c32b6 100644
   let g = open_guestfs () in
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index a26ecf7a..47e5f10d 100644
+index 998b871d..8cf17f94 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -82,7 +82,6 @@ TESTS = \
+@@ -83,7 +83,6 @@ TESTS = \
 	test-v2v-networks-and-bridges.sh \
 	test-v2v-o-glance.sh \
 	test-v2v-o-libvirt.sh \
--- a/0010-output-Remove-o-json-mode.patch
+++ b/0010-output-Remove-o-json-mode.patch
--- a/0011-RHEL-9-tests-Remove-btrfs-test.patch
+++ b/0011-RHEL-9-tests-Remove-btrfs-test.patch
@ -1,4 +1,4 @@
-From 8a8ff53b7d438e82085d52199d21c980a54c733d Mon Sep 17 00:00:00 2001
+From b564aa5af395dcc6eddfd0a659cb8d7fc3e16920 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
@ -9,10 +9,10 @@ RHEL does not have btrfs so this test always fails.
 1 file changed, 1 deletion(-)
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 47e5f10d..9560cc77 100644
+index 8cf17f94..8b2a8685 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -96,7 +96,6 @@ TESTS = \
+@@ -97,7 +97,6 @@ TESTS = \
 	test-v2v-sound.sh \
 	test-v2v-virtio-win-iso.sh \
 	test-v2v-fedora-conversion.sh \
--- a/0011-output-Remove-unused-dummy.c.patch
+++ b/0011-output-Remove-unused-dummy.c.patch
@ -1,27 +0,0 @@
 From 42da4736c2078801c0a5ebbe3825086f9b8d25ea Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 12 Apr 2022 11:53:45 +0100
 Subject: [PATCH] output: Remove unused dummy.c
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 This was removed when I removed -o json support, but I did not delete
 the file from git.  “make maintainer-check-extra-dist” complained
 about this.
 Fixes: commit 4e6b389b4e27c8d13e57fcaf777d96ad7e08650b
 (cherry picked from commit 0a1286df1725560e2789134d12022fc52572f9b0)
 ---
 output/dummy.c | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 output/dummy.c
 diff --git a/output/dummy.c b/output/dummy.c
 deleted file mode 100644
 index ebab6198..00000000
 --- a/output/dummy.c
 +++ /dev/null
@@ -1,2 +0,0 @@
 -/* Dummy source, to be used for OCaml-based tools with no C sources. */
 -enum { foo = 1 };
--- a/0012-adopt-inversion-of-SELinux-relabeling-in-virt-custom.patch
+++ b/0012-adopt-inversion-of-SELinux-relabeling-in-virt-custom.patch
@ -1,79 +0,0 @@
 From 7b22bc65e5df2bbe9f5ccf8ab05e67afb5a4cb8f Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Tue, 10 May 2022 12:53:07 +0200
 Subject: [PATCH] adopt inversion of SELinux relabeling in virt-customize
 Remove "--selinux-relabel" options.
 Do not add any "--no-selinux-relabel" options; rely on the internal check
 for SELinux support instead ("is_selinux_guest" in
 "common/mlcustomize/SELinux_relabel.ml").
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1554735
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2075718
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 Message-Id: <20220510105307.15402-1-lersek@redhat.com>
 Acked-by: Richard W.M. Jones <rjones@redhat.com>
 [lersek@redhat.com: incorporate common submodule update]
 (cherry picked from commit 0c24fc6015ce7719acff3bcead7eb227b6de3f21)
 ---
 common                          | 2 +-
 tests/test-v2v-conversion-of.sh | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)
 Submodule common 201632e4..af6cb55b (rewind):
 diff --git a/common/mlcustomize/guest_packages.ml b/common/mlcustomize/guest_packages.ml
 index 7c29a2ab..4c3c34ed 100644
 --- a/common/mlcustomize/guest_packages.ml
 +++ b/common/mlcustomize/guest_packages.ml
@@ -73,9 +73,9 @@ let install_command packages package_management =
   | "zypper" -> sprintf "zypper -n in -l %s" quoted_args
   | "unknown" ->
 -    error_unknown_package_manager "--install"
 +    error_unknown_package_manager (s_"--install")
   | pm ->
 -    error_unimplemented_package_manager "--install" pm
 +    error_unimplemented_package_manager (s_"--install") pm
 let update_command package_management =
   match package_management with
@@ -103,9 +103,9 @@ let update_command package_management =
   | "zypper" -> "zypper -n update -l"
   | "unknown" ->
 -    error_unknown_package_manager "--update"
 +    error_unknown_package_manager (s_"--update")
   | pm ->
 -    error_unimplemented_package_manager "--update" pm
 +    error_unimplemented_package_manager (s_"--update") pm
 let uninstall_command packages package_management =
   let quoted_args = String.concat " " (List.map quote packages) in
@@ -127,6 +127,6 @@ let uninstall_command packages package_management =
   | "zypper" -> sprintf "zypper -n rm %s" quoted_args
   | "unknown" ->
 -    error_unknown_package_manager "--uninstall"
 +    error_unknown_package_manager (s_"--uninstall")
   | pm ->
 -    error_unimplemented_package_manager "--uninstall" pm
 +    error_unimplemented_package_manager (s_"--uninstall") pm
 diff --git a/tests/test-v2v-conversion-of.sh b/tests/test-v2v-conversion-of.sh
 index 5a974d1b..5c5cae7c 100755
 --- a/tests/test-v2v-conversion-of.sh
 +++ b/tests/test-v2v-conversion-of.sh
@@ -53,13 +53,6 @@ fi
 # Some guests need special virt-builder parameters.
 # See virt-builder --notes "$guestname"
 declare -a extra
 -case "$guestname" in
 -    fedora*|rhel*|centos*)
 -        extra[${#extra[*]}]='--selinux-relabel'
 -        ;;
 -    *)
 -        ;;
 -esac
 # Don't try to update Windows versions.
 case "$guestname" in
--- a/0013-output-create_libvirt_xml-wire-up-the-QEMU-guest-age.patch
+++ b/0013-output-create_libvirt_xml-wire-up-the-QEMU-guest-age.patch
@ -1,105 +0,0 @@
 From 0699afed37343d73c6803cabec466e1c3ca229b0 Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Mon, 13 Jun 2022 19:01:32 +0200
 Subject: [PATCH] output/create_libvirt_xml: wire up the QEMU guest agent
 The intent (even before RHBZ#2028764) has been to install the QEMU guest
 agent in the converted domain unconditionally. Therefore, in order for the
 GA to be actually accessible from the host side, augment the libvirt
 output module with a "guest agent connection" also unconditionally.
 For starters, the domain needs a virtio-serial device. Then there must be
 a port on the device that (in the guest) the GA identifies by name, and
 that (on the host) is exposed as a listening socket (usually in the unix
 address family). The adress of that port (usually a pathname, i.e., for a
 unix domain socket) is then passed to whatever host-side application wants
 to talk to the GA.
 The minimal domain XML fragment for that ("minimal" for our purposes) is
  <controller type='virtio-serial' model='virtio'>
  <channel type='unix'>
    <target type='virtio' name='org.qemu.guest_agent.0'/>
  </channel>
 The "controller" element is needed because "controller/@model" is where we
 regulate "virtio" vs. "virtio-transitional".
 Everything else is filled in by libvirt. Notably, libvirt (a) creates and
 binds the unix domain socket itself (usually
 "/var/lib/libvirt/qemu/channel/target/DOMAIN/org.qemu.guest_agent.0"), (b)
 passes the file descriptor to QEMU, and (c) figures out the socket
 pathname for commands such as
  virsh domfsinfo DOMAIN
  virsh domhostname DOMAIN --source agent
  virsh domifaddr DOMAIN --source agent
  virsh guestinfo DOMAIN
 For QEMU, the corresponding options would be
  -chardev socket,id=agent,server=on,wait=off,path=/tmp/DOMAIN-agent \
  -device virtio-serial-pci,id=vioserial \
  -device virtserialport,bus=vioserial.0,nr=1,chardev=agent,name=org.qemu.guest_agent.0 \
 Note the "path=/tmp/DOMAIN-agent" property of "-chardev"; virt-v2v would
 have to generate that (in place of the "fd=nnnn" property that libvirt
 passes to QEMU).
 Omit extending the QEMU output module for now, as the QGA protocol is
 based on JSON, and one needs "virsh" or "virt-manager" (or another
 management application interface) anyway, for efficiently exchanging
 messages with QGA. I don't know of end-user tools that directly connect to
 "/tmp/DOMAIN-agent".
 Don't modify the RHV and OpenStack outputs either; both of these
 management products likely configure the virtio-serial device
 automatically, for the agent access.
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2028764
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 Message-Id: <20220613170135.12557-2-lersek@redhat.com>
 Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
 Tested-by: Richard W.M. Jones <rjones@redhat.com>
 (cherry picked from commit 48c6ea27c5a7053e418622f7450e3f9ef05c923f)
 ---
 output/create_libvirt_xml.ml | 11 +++++++++++
 tests/test-v2v-i-ova.xml     |  4 ++++
 2 files changed, 15 insertions(+)
 diff --git a/output/create_libvirt_xml.ml b/output/create_libvirt_xml.ml
 index 68d0a909..531a4f75 100644
 --- a/output/create_libvirt_xml.ml
 +++ b/output/create_libvirt_xml.ml
@@ -524,6 +524,17 @@ let create_libvirt_xml ?pool source inspect
     e "console" ["type", "pty"] [];
   ];
 +  (* Given that we install the QEMU Guest Agent for both Linux and Windows
 +   * guests unconditionally, create the virtio-serial device that's needed for
 +   * communication between the host and the agent.
 +   *)
 +  List.push_back_list devices [
 +    e "controller" ["type", "virtio-serial"; "model", virtio_model] [];
 +    e "channel" ["type", "unix"] [
 +      e "target" ["type", "virtio"; "name", "org.qemu.guest_agent.0"] []
 +    ]
 +  ];
 +
   List.push_back_list body [
     e "devices" [] !devices;
   ];
 diff --git a/tests/test-v2v-i-ova.xml b/tests/test-v2v-i-ova.xml
 index 6b8cda62..da1db473 100644
 --- a/tests/test-v2v-i-ova.xml
 +++ b/tests/test-v2v-i-ova.xml
@@ -49,5 +49,9 @@
     <input type='tablet' bus='usb'/>
     <input type='mouse' bus='ps2'/>
     <console type='pty'/>
 +    <controller type='virtio-serial' model='virtio'/>
 +    <channel type='unix'>
 +      <target type='virtio' name='org.qemu.guest_agent.0'/>
 +    </channel>
   </devices>
 </domain>
--- a/0014-convert_linux-extract-qemu-guest-agent-package-name.patch
+++ b/0014-convert_linux-extract-qemu-guest-agent-package-name.patch
@ -1,82 +0,0 @@
 From 82c7526e052d2aa64a6754ff0e1082937e3ee4bc Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Mon, 13 Jun 2022 19:01:34 +0200
 Subject: [PATCH] convert_linux: extract qemu-guest-agent package name
 In commit a30383e35d34 ("v2v: linux: do not install qemu-guest-agent if
 already installed", 2019-09-20), the name of the package providing the
 QEMU guest agent was hard-coded as "qemu-guest-agent", regardless of
 distro family. Turns out this is actually correct (and may have been
 intentional, only it was not specifically documented): in all OS families
 currently recognized by our "family" function (`RHEL_family, `ALT_family,
 `SUSE_family, `Debian_family), the *binary* package is indeed called
 "qemu-guest-agent":
 - https://brewweb.engineering.redhat.com/brew/packageinfo?packageID=47646
 - http://rpmfind.net/linux/rpm2html/search.php?query=qemu-guest-agent&submit=Search+...&system=&arch=
 - https://packages.altlinux.org/en/sisyphus/srpms/qemu/
 - https://packages.debian.org/search?keywords=qemu-guest-agent&searchon=names&suite=all&section=all
 As a way of documenting this, extract the mapping to a new helper function
 named "qga_pkg_of_family".
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2028764
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
 Message-Id: <20220613170135.12557-4-lersek@redhat.com>
 (cherry picked from commit f65e8e68fb4eb9b8d40ac0fe7bfc3122a13e5251)
 ---
 convert/convert_linux.ml | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)
 diff --git a/convert/convert_linux.ml b/convert/convert_linux.ml
 index 79462aa1..2ddbc07a 100644
 --- a/convert/convert_linux.ml
 +++ b/convert/convert_linux.ml
@@ -56,6 +56,16 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ =
     | "debian" | "ubuntu" | "linuxmint" | "kalilinux" -> `Debian_family
     | _ -> assert false in
 +  (* map the OS family name to the qemu-guest-agent package name *)
 +  let qga_pkg_of_family =
 +    function
 +    | `RHEL_family
 +    | `ALT_family
 +    | `SUSE_family
 +    | `Debian_family -> Some "qemu-guest-agent"
 +    | _ -> None
 +  in
 +
   assert (inspect.i_package_format = "rpm" || inspect.i_package_format = "deb");
   (* Fail early if i_apps is empty.  Certain steps such as kernel
@@ -539,14 +549,21 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ =
   and install_linux_tools () =
     (* It is not fatal if we fail to install the QEMU guest agent. *)
 -    let has_qemu_guest_agent =
 -      List.exists (
 -        fun { G.app2_name = name } ->
 -          name = "qemu-guest-agent"
 -      ) inspect.i_apps in
 -    if not has_qemu_guest_agent then
 -      (* FIXME -- install qemu-guest-agent here *)
 -      ()
 +    match qga_pkg_of_family family with
 +    | None -> warning (f_"The name of the package that provides the QEMU Guest \
 +                          Agent for this guest OS is unknown.  The guest agent \
 +                          will not be installed.  Please consider reporting a \
 +                          bug according to the BUGS section of the virt-v2v(1) \
 +                          manual.")
 +    | Some qga_pkg ->
 +        let has_qemu_guest_agent =
 +          List.exists (
 +            fun { G.app2_name = name } ->
 +              name = qga_pkg
 +          ) inspect.i_apps in
 +        if not has_qemu_guest_agent then
 +          (* FIXME -- install qemu-guest-agent here *)
 +          ()
   and configure_kernel () =
     (* Previously this function would try to install kernels, but we
--- a/0015-convert_linux-install-the-QEMU-guest-agent-with-a-fi.patch
+++ b/0015-convert_linux-install-the-QEMU-guest-agent-with-a-fi.patch
@ -1,119 +0,0 @@
 From e32a5ee7deb9a381ab285aba92c4de23e3c6ee2e Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Mon, 13 Jun 2022 19:01:35 +0200
 Subject: [PATCH] convert_linux: install the QEMU guest agent with a firstboot
 script
 Register a firstboot script, for installing the guest agent with the
 guest's own package manager -- that is, "Guest_packages.install_command".
 For installing the package, network connectivity is required. Check it
 first with "nmcli" (also checking whether NetworkManager is running), then
 with "systemd-networkd-wait-online" (dependent on systemd-networkd). Note
 that NetworkManager and systemd-networkd are never supposed to be enabled
 at the same time.
 The source domain's SELinux policy may not allow our firstboot service to
 execute the package's installation scripts (if any). For that reason,
 temporarily disable SELinux around package installation.
 After installation, register another script for launching the agent.
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2028764
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 Message-Id: <20220613170135.12557-5-lersek@redhat.com>
 Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
 (cherry picked from commit e64356896377af1ac75a03d6a4c6a4208910bbf4)
 ---
 convert/convert_linux.ml | 78 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 76 insertions(+), 2 deletions(-)
 diff --git a/convert/convert_linux.ml b/convert/convert_linux.ml
 index 2ddbc07a..59d143bd 100644
 --- a/convert/convert_linux.ml
 +++ b/convert/convert_linux.ml
@@ -562,8 +562,82 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ =
               name = qga_pkg
           ) inspect.i_apps in
         if not has_qemu_guest_agent then
 -          (* FIXME -- install qemu-guest-agent here *)
 -          ()
 +          try
 +            let inst_cmd = Guest_packages.install_command [qga_pkg]
 +                             inspect.i_package_management in
 +
 +            (* Use only the portable filename character set in this. *)
 +            let selinux_enforcing = "/root/virt-v2v-fb-selinux-enforcing"
 +            and timeout = 30 in
 +            let fbs =
 +              Firstboot.add_firstboot_script g inspect.i_root
 +            in
 +            info (f_"The QEMU Guest Agent will be installed for this guest at \
 +                     first boot.");
 +
 +            (* Wait for the network to come online in the guest (best effort).
 +             *)
 +            fbs "wait online"
 +              (sprintf "#!/bin/sh\n\
 +                        if conn=$(nmcli networking connectivity); then\n\
 +                        \ \ tries=0\n\
 +                        \ \ while\n\
 +                        \ \ \ \ test $tries -lt %d &&\n\
 +                        \ \ \ \ test full != \"$conn\"\n\
 +                        \ \ do\n\
 +                        \ \ \ \ sleep 1\n\
 +                        \ \ \ \ tries=$((tries + 1))\n\
 +                        \ \ \ \ conn=$(nmcli networking connectivity)\n\
 +                        \ \ done\n\
 +                        elif systemctl -q is-active systemd-networkd; then\n\
 +                        \ \ /usr/lib/systemd/systemd-networkd-wait-online \\\n\
 +                        \ \ \ \ -q --timeout=%d\n\
 +                        fi\n" timeout timeout);
 +
 +            (* Disable SELinux temporarily around package installation. Refer to
 +             * <https://bugzilla.redhat.com/show_bug.cgi?id=2028764#c7> and
 +             * <https://bugzilla.redhat.com/show_bug.cgi?id=2028764#c8>.
 +             *)
 +            fbs "setenforce 0"
 +              (sprintf "#!/bin/sh\n\
 +                        rm -f %s\n\
 +                        if command -v getenforce >/dev/null &&\n\
 +                        \ \ test Enforcing = \"$(getenforce)\"\n\
 +                        then\n\
 +                        \ \ touch %s\n\
 +                        \ \ setenforce 0\n\
 +                        fi\n" selinux_enforcing selinux_enforcing);
 +            fbs "install qga" inst_cmd;
 +            fbs "setenforce restore"
 +              (sprintf "#!/bin/sh\n\
 +                        if test -f %s; then\n\
 +                        \ \ setenforce 1\n\
 +                        \ \ rm -f %s\n\
 +                        fi\n" selinux_enforcing selinux_enforcing);
 +
 +            (* Start the agent now and at subsequent boots. The following
 +             * commands should work on both sysvinit distros / distro versions
 +             * (regardless of "/etc/rc.d/" vs. "/etc/init.d/" being the scheme
 +             * in use) and systemd distros (via redirection to systemctl).
 +             *
 +             * On distros where the chkconfig command is redirected to
 +             * systemctl, the chkconfig command is likely superfluous. That's
 +             * because on systemd distros, the QGA package comes with such
 +             * runtime dependencies / triggers that the presence of the
 +             * virtio-serial port named "org.qemu.guest_agent.0" automatically
 +             * starts the agent during (second and later) boots. However, even
 +             * on such distros, the chkconfig command should do no harm.
 +             *)
 +            fbs "start qga"
 +              (sprintf "#!/bin/sh\n\
 +                        service %s start\n\
 +                        chkconfig %s on\n" qga_pkg qga_pkg)
 +          with
 +          | Guest_packages.Unknown_package_manager msg
 +          | Guest_packages.Unimplemented_package_manager msg ->
 +            warning (f_"The QEMU Guest Agent will not be installed.  The \
 +                        install command for package ‘%s’ could not be created: \
 +                        %s.") qga_pkg msg
   and configure_kernel () =
     (* Previously this function would try to install kernels, but we
--- a/0016-RHV-outputs-limit-copied-disk-count-to-23.patch
+++ b/0016-RHV-outputs-limit-copied-disk-count-to-23.patch
@ -1,122 +0,0 @@
 From 50a74177b3577952159d87335cf40c0ad3e51b4d Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Fri, 17 Jun 2022 11:53:37 +0200
 Subject: [PATCH] RHV outputs: limit copied disk count to 23
 We currently support virtio-blk (commonly) or IDE (unusually) for exposing
 disks to the converted guest; refer to "guestcaps.gcaps_block_bus" in
 "lib/create_ovf.ml". When using virtio-blk (i.e., in the common case), RHV
 can deal with at most 23 disks, as it plugs each virtio-blk device in a
 separate slot on the PCI(e) root bus; and the other slots are reserved for
 various purposes. When a domain has too many disks, the problem only
 becomes apparent once the copying finishes and an import is attempted.
 Modify the RHV outputs to fail relatively early when a domain has more
 than 23 disks that need to be copied.
 Notes:
 - With IDE, the theoretical limit may even be as low as 4. However, in the
  "Output_module.setup" function, we don't have access to
  "guestcaps.gcaps_block_bus", and in practice the IDE limitation has not
  caused surprises. So for now stick with 23, assuming virtio-blk.
  Modifying the "Output_module.setup" parameter list just for this seems
  overkill.
 - We could move the new check to an even earlier step, namely
  "Output_module.parse_options", due to the v2v directory deliberately
  existing (and having been populated with input sockets) at that time.
  However, even discounting the fact that "parse_options" is not a good
  name for including this kind of step, "parse_options" does not have
  access to the v2v directory name, and modifying the signature just for
  this is (again) overkill.
 - By adding the check to "Output_module.setup", we waste *some* effort
  (namely, the conversion occurs between "parse_options" and "setup"),
  but: (a) the "rhv-disk-uuid" count check (against the disk count) is
  already being done in the rhv-upload module's "setup" function, (b) in
  practice the slowest step ought to be the copying, and placing the new
  check in "setup" is early enough to prevent that.
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2051564
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 Message-Id: <20220617095337.9122-1-lersek@redhat.com>
 Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
 (cherry picked from commit e186cc2bea99a077990f192953e1bf6c9ba70e79)
 ---
 output/output.ml            | 5 +++++
 output/output.mli           | 7 +++++++
 output/output_rhv.ml        | 1 +
 output/output_rhv_upload.ml | 1 +
 output/output_vdsm.ml       | 1 +
 5 files changed, 15 insertions(+)
 diff --git a/output/output.ml b/output/output.ml
 index 10e685c4..5c6670b9 100644
 --- a/output/output.ml
 +++ b/output/output.ml
@@ -64,6 +64,11 @@ let get_disks dir =
   in
   loop [] 0
 +let error_if_disk_count_gt dir n =
 +  let socket = sprintf "%s/in%d" dir n in
 +  if Sys.file_exists socket then
 +    error (f_"this output module doesn't support copying more than %d disks") n
 +
 let output_to_local_file ?(changeuid = fun f -> f ())
       output_alloc output_format filename size socket =
   (* Check nbdkit is installed and has the required plugin. *)
 diff --git a/output/output.mli b/output/output.mli
 index 533a0c51..8d3d6865 100644
 --- a/output/output.mli
 +++ b/output/output.mli
@@ -76,6 +76,13 @@ val get_disks : string -> (int * int64) list
 (** Examines the v2v directory and opens each input socket (in0 etc),
     returning a list of input disk index and size. *)
 +val error_if_disk_count_gt : string -> int -> unit
 +(** This function lets an output module enforce a maximum disk count.
 +    [error_if_disk_count_gt dir n] checks whether the domain has more than [n]
 +    disks that need to be copied, by examining the existence of input NBD socket
 +    "in[n]" in the v2v directory [dir].  If the socket exists, [error] is
 +    called. *)
 +
 val output_to_local_file : ?changeuid:((unit -> unit) -> unit) ->
                            Types.output_allocation ->
                            string -> string -> int64 -> string ->
 diff --git a/output/output_rhv.ml b/output/output_rhv.ml
 index 119207fd..8571e07b 100644
 --- a/output/output_rhv.ml
 +++ b/output/output_rhv.ml
@@ -56,6 +56,7 @@ module RHV = struct
     (options.output_alloc, options.output_format, output_name, output_storage)
   let rec setup dir options source =
 +    error_if_disk_count_gt dir 23;
     let disks = get_disks dir in
     let output_alloc, output_format, output_name, output_storage = options in
 diff --git a/output/output_rhv_upload.ml b/output/output_rhv_upload.ml
 index 828996b3..f2ced4f4 100644
 --- a/output/output_rhv_upload.ml
 +++ b/output/output_rhv_upload.ml
@@ -133,6 +133,7 @@ after their uploads (if you do, you must supply one for each disk):
     else PCRE.matches (Lazy.force rex_uuid) uuid
   let rec setup dir options source =
 +    error_if_disk_count_gt dir 23;
     let disks = get_disks dir in
     let output_conn, output_format,
         output_password, output_name, output_storage,
 diff --git a/output/output_vdsm.ml b/output/output_vdsm.ml
 index a1e8c246..23d1b9cd 100644
 --- a/output/output_vdsm.ml
 +++ b/output/output_vdsm.ml
@@ -119,6 +119,7 @@ For each disk you must supply one of each of these options:
      compat, ovf_flavour)
   let setup dir options source =
 +    error_if_disk_count_gt dir 23;
     let disks = get_disks dir in
     let output_alloc, output_format,
         output_name, output_storage,
--- a/0017-convert-document-networking-dependency-of-key-ID-cle.patch
+++ b/0017-convert-document-networking-dependency-of-key-ID-cle.patch
@ -1,49 +0,0 @@
 From 81a201269e5451cd76348e0da6d0ef4c0fb4c0dd Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Fri, 1 Jul 2022 15:30:42 +0200
 Subject: [PATCH] convert: document networking dependency of "--key ID:clevis"
 Virt-v2v enables appliance networking already, for the sake of
 "unconfigure_vmware". We now have a second use case for networking: "--key
 ID:clevis". Update the comment in the code.
 (Short log for libguestfs-common commit range 35467027f657..af6cb55bc58a:
 Laszlo Ersek (12):
      options: fix UUID comparison logic bug in get_keys()
      mltools/tools_utils: remove unused function "key_store_to_cli"
      mltools/tools_utils: allow multiple "--key" options for OCaml tools too
      options: replace NULL-termination with number-of-elements in get_keys()
      options: wrap each passphrase from get_keys() into a struct
      options: add back-end for LUKS decryption with Clevis+Tang
      options: introduce selector type "key_clevis"
      options: generalize "--key" selector parsing for C-language utilities
      mltools/tools_utils-c: handle internal type error with abort()
      mltools/tools_utils: generalize "--key" selector parsing for OCaml utils
      options, mltools/tools_utils: parse "--key ID:clevis" options
      options, mltools/tools_utils: add helper for network dependency
 ).
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1809453
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 Message-Id: <20220628115856.5820-1-lersek@redhat.com>
 Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
 (cherry picked from commit 98fa5ab2685371c681282ce5de704877af27be74)
 ---
 convert/convert.ml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 diff --git a/convert/convert.ml b/convert/convert.ml
 index 5e0e6c2b..b678dc92 100644
 --- a/convert/convert.ml
 +++ b/convert/convert.ml
@@ -57,7 +57,8 @@ let rec convert dir options source =
    * sure this is not too large because each vCPU consumes guest RAM.
    *)
   g#set_smp (min 8 (Sysconf.nr_processors_online ()));
 -  (* The network is only used by the unconfigure_vmware () function. *)
 +  (* The network is used by the unconfigure_vmware () function, and the "--key
 +   * ID:clevis" command line options (if any). *)
   g#set_network true;
   List.iter (
     fun { s_disk_id = i } ->
--- a/0018-qemu-nbd-Implement-output-compression-for-qcow2-file.patch
+++ b/0018-qemu-nbd-Implement-output-compression-for-qcow2-file.patch
@ -1,142 +0,0 @@
 From 80831868395d161af8c47edf2f54234c63581d8d Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 28 Jan 2022 09:30:29 +0000
 Subject: [PATCH] qemu-nbd: Implement output compression for qcow2 files
 Reviewed-by: Laszlo Ersek <lersek@redhat.com>
 (cherry picked from commit 71c4301909cb307def02ebcd0e89beee4138e7f2)
 ---
 lib/qemuNBD.ml    | 11 +++++++++--
 lib/qemuNBD.mli   |  5 +++++
 output/output.ml  | 39 ++++++++++++++++++++++++++++++++++++---
 output/output.mli |  1 +
 4 files changed, 51 insertions(+), 5 deletions(-)
 diff --git a/lib/qemuNBD.ml b/lib/qemuNBD.ml
 index ae21b17c..bbb65f41 100644
 --- a/lib/qemuNBD.ml
 +++ b/lib/qemuNBD.ml
@@ -55,14 +55,16 @@ type cmd = {
   disk : string;
   mutable snapshot : bool;
   mutable format : string option;
 +  mutable imgopts : bool;
 }
 -let create disk = { disk; snapshot = false; format = None }
 +let create disk = { disk; snapshot = false; format = None; imgopts = false }
 let set_snapshot cmd snap = cmd.snapshot <- snap
 let set_format cmd format = cmd.format <- format
 +let set_image_opts cmd imgopts = cmd.imgopts <- imgopts
 -let run_unix socket { disk; snapshot; format } =
 +let run_unix socket { disk; snapshot; format; imgopts } =
   assert (disk <> "");
   (* Create a temporary directory where we place the PID file. *)
@@ -85,6 +87,11 @@ let run_unix socket { disk; snapshot; format } =
   (* -s adds a protective overlay. *)
   if snapshot then List.push_back args "-s";
 +  (* --image-opts reinterprets the filename parameter as a set of
 +   * image options.
 +   *)
 +  if imgopts then List.push_back args "--image-opts";
 +
   if have_selinux && qemu_nbd_has_selinux_label_option () then (
     List.push_back args "--selinux-label";
     List.push_back args "system_u:object_r:svirt_socket_t:s0"
 diff --git a/lib/qemuNBD.mli b/lib/qemuNBD.mli
 index e10d3106..afe9d944 100644
 --- a/lib/qemuNBD.mli
 +++ b/lib/qemuNBD.mli
@@ -43,6 +43,11 @@ val set_snapshot : cmd -> bool -> unit
 val set_format : cmd -> string option -> unit
 (** Set the format [--format] parameter. *)
 +val set_image_opts : cmd -> bool -> unit
 +(** Set whether the [--image-opts] parameter is used.  This changes
 +    the meaning of the [filename] parameter to a set of image options.
 +    Consult the qemu-nbd man page for more details. *)
 +
 val run_unix : string -> cmd -> string * int
 (** Start qemu-nbd command listening on a Unix domain socket,
     waiting for the process to start up.
 diff --git a/output/output.ml b/output/output.ml
 index 5c6670b9..23c3932d 100644
 --- a/output/output.ml
 +++ b/output/output.ml
@@ -69,7 +69,7 @@ let error_if_disk_count_gt dir n =
   if Sys.file_exists socket then
     error (f_"this output module doesn't support copying more than %d disks") n
 -let output_to_local_file ?(changeuid = fun f -> f ())
 +let output_to_local_file ?(changeuid = fun f -> f ()) ?(compressed = false)
       output_alloc output_format filename size socket =
   (* Check nbdkit is installed and has the required plugin. *)
   if not (Nbdkit.is_installed ()) then
@@ -78,6 +78,24 @@ let output_to_local_file ?(changeuid = fun f -> f ())
     error (f_"nbdkit-file-plugin is not installed or not working");
   let nbdkit_config = Nbdkit.config () in
 +  if compressed then (
 +    (* Only allow compressed with -of qcow2. *)
 +    if output_format <> "qcow2" then
 +      error (f_"‘-oo compressed’ is only allowed when the output format \
 +                is a local qcow2-format file, i.e. ‘-of qcow2’");
 +
 +    (* Check nbdcopy is new enough.  This assumes that the version of
 +     * libnbd is the same as the version of nbdcopy, but parsing this
 +     * is easier.  We can remove this check when we build-depend on
 +     * libnbd >= 1.14.
 +     *)
 +    let version =
 +      NBD.create () |> NBD.get_version |>
 +      String.nsplit "." |> List.map int_of_string in
 +    if version < [1; 13; 5] then
 +      error (f_"-oo compressed option requires nbdcopy >= 1.13.5")
 +  );
 +
   let g = open_guestfs () in
   let preallocation =
     match output_alloc with
@@ -103,9 +121,24 @@ let output_to_local_file ?(changeuid = fun f -> f ())
      On_exit.kill pid
   | "qcow2" ->
 -     let cmd = QemuNBD.create filename in
 +     let cmd =
 +       if compressed then (
 +         let qemu_quote str = String.replace str "," ",," in
 +         let image_opts = [ "driver=compress";
 +                            "file.driver=qcow2";
 +                            "file.file.driver=file";
 +                            "file.file.filename=" ^ qemu_quote filename ] in
 +         let image_opts = String.concat "," image_opts in
 +         let cmd = QemuNBD.create image_opts in
 +         QemuNBD.set_image_opts cmd true;
 +         cmd
 +       )
 +       else (* not compressed *) (
 +         let cmd = QemuNBD.create filename in
 +         QemuNBD.set_format cmd (Some "qcow2");
 +         cmd
 +       ) in
      QemuNBD.set_snapshot cmd false;
 -     QemuNBD.set_format cmd (Some "qcow2");
      let _, pid = QemuNBD.run_unix socket cmd in
      On_exit.kill pid
 diff --git a/output/output.mli b/output/output.mli
 index 8d3d6865..c1f0f53d 100644
 --- a/output/output.mli
 +++ b/output/output.mli
@@ -84,6 +84,7 @@ val error_if_disk_count_gt : string -> int -> unit
     called. *)
 val output_to_local_file : ?changeuid:((unit -> unit) -> unit) ->
 +                           ?compressed:bool ->
                            Types.output_allocation ->
                            string -> string -> int64 -> string ->
                            unit
--- a/0019-o-disk-o-libvirt-o-qemu-Implement-of-qcow2-oo-compre.patch
+++ b/0019-o-disk-o-libvirt-o-qemu-Implement-of-qcow2-oo-compre.patch
@ -1,272 +0,0 @@
 From ca3643d06eed2de22cb81ad2eb13ba7f75c0487e Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 28 Jan 2022 09:30:58 +0000
 Subject: [PATCH] -o disk, -o libvirt, -o qemu: Implement -of qcow2 -oo
 compressed
 For various output modes, implement -oo compressed which can be used
 to generate compressed qcow2 files.  This option was dropped when
 modularizing virt-v2v, and required changes to nbdcopy which are
 finally upstream in libnbd >= 1.13.5.
 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2047660
 Fixes: commit 255722cbf39afc0b012e2ac00d16fa6ba2f8c21f
 Reported-by: Xiaodai Wang
 Reviewed-by: Laszlo Ersek <lersek@redhat.com>
 (cherry picked from commit 53690a0c602a4286fdb9408fdf6a01cc352697ec)
 ---
 TODO                     | 14 --------------
 output/output_disk.ml    | 29 +++++++++++++++++++++--------
 output/output_libvirt.ml | 31 ++++++++++++++++++++++---------
 output/output_qemu.ml    | 38 +++++++++++++++++++++-----------------
 4 files changed, 64 insertions(+), 48 deletions(-)
 diff --git a/TODO b/TODO
 index f578d506..04b1dd20 100644
 --- a/TODO
 +++ b/TODO
@@ -1,17 +1,3 @@
 -virt-v2v -o disk|qemu -oo compressed
 -------------------------------------
 -
 -This was temporarily dropped when I modularized virt-v2v.  It would
 -not be too difficult to add it back.  The following is the qemu-nbd
 -command required (to be run as the output helper) which creates a
 -compressed qcow2 disk image:
 -
 -$ qemu-nbd --image-opts driver=compress,file.driver=qcow2,file.file.driver=file,file.file.filename=new.qcow2
 -
 -Note this requires fixes in nbdcopy so it obeys the advertised block
 -alignment:
 -https://lists.gnu.org/archive/html/qemu-block/2022-01/threads.html#00729
 -
 virt-v2v -o rhv-upload
 ----------------------
 diff --git a/output/output_disk.ml b/output/output_disk.ml
 index bc5b4e1c..abcfcdc0 100644
 --- a/output/output_disk.ml
 +++ b/output/output_disk.ml
@@ -30,7 +30,7 @@ open Create_libvirt_xml
 open Output
 module Disk = struct
 -  type poptions = Types.output_allocation * string * string * string
 +  type poptions = bool * Types.output_allocation * string * string * string
   type t = unit
@@ -41,11 +41,21 @@ module Disk = struct
       | None -> ""
   let query_output_options () =
 -    printf (f_"No output options can be used in this mode.\n")
 +    printf (f_"Output options that can be used with -o disk:
 +
 +  -oo compressed      Compress the output file (used only with -of qcow2)
 +")
   let parse_options options source =
 -    if options.output_options <> [] then
 -      error (f_"no -oo (output options) are allowed here");
 +    let compressed = ref false in
 +    List.iter (
 +      function
 +      | "compressed", "" -> compressed := true
 +      | "compressed", v -> compressed := bool_of_string v
 +      | k, _ ->
 +         error (f_"-o disk: unknown output option ‘-oo %s’") k
 +    ) options.output_options;
 +
     if options.output_password <> None then
       error_option_cannot_be_used_in_output_mode "local" "-op";
@@ -60,11 +70,13 @@ module Disk = struct
     let output_name = Option.default source.s_name options.output_name in
 -    options.output_alloc, options.output_format, output_name, output_storage
 +    !compressed, options.output_alloc, options.output_format,
 +    output_name, output_storage
   let setup dir options source =
     let disks = get_disks dir in
 -    let output_alloc, output_format, output_name, output_storage = options in
 +    let compressed, output_alloc, output_format, output_name, output_storage =
 +      options in
     List.iter (
       fun (i, size) ->
@@ -73,11 +85,12 @@ module Disk = struct
         (* Create the actual output disk. *)
         let outdisk = disk_path output_storage output_name i in
 -        output_to_local_file output_alloc output_format outdisk size socket
 +        output_to_local_file ~compressed output_alloc output_format
 +          outdisk size socket
     ) disks
   let finalize dir options () source inspect target_meta =
 -    let output_alloc, output_format, output_name, output_storage = options in
 +    let _, output_alloc, output_format, output_name, output_storage = options in
     (* Convert metadata to libvirt XML. *)
     (match target_meta.target_firmware with
 diff --git a/output/output_libvirt.ml b/output/output_libvirt.ml
 index e0d3432d..04b4c5f8 100644
 --- a/output/output_libvirt.ml
 +++ b/output/output_libvirt.ml
@@ -32,7 +32,7 @@ open Create_libvirt_xml
 open Output
 module Libvirt_ = struct
 -  type poptions = Libvirt.rw Libvirt.Connect.t Lazy.t *
 +  type poptions = Libvirt.rw Libvirt.Connect.t Lazy.t * bool *
                   Types.output_allocation * string * string * string
   type t = string * string
@@ -44,11 +44,21 @@ module Libvirt_ = struct
       | None -> ""
   let query_output_options () =
 -    printf (f_"No output options can be used in this mode.\n")
 +    printf (f_"Output options that can be used with -o libvirt:
 +
 +  -oo compressed      Compress the output file (used only with -of qcow2)
 +")
   let parse_options options source =
 -    if options.output_options <> [] then
 -      error (f_"no -oo (output options) are allowed here");
 +    let compressed = ref false in
 +    List.iter (
 +      function
 +      | "compressed", "" -> compressed := true
 +      | "compressed", v -> compressed := bool_of_string v
 +      | k, _ ->
 +         error (f_"-o disk: unknown output option ‘-oo %s’") k
 +    ) options.output_options;
 +
     if options.output_password <> None then
       error_option_cannot_be_used_in_output_mode "libvirt" "-op";
@@ -59,12 +69,13 @@ module Libvirt_ = struct
     let output_name = Option.default source.s_name options.output_name in
 -    (conn, options.output_alloc, options.output_format, output_name,
 -     output_pool)
 +    (conn, !compressed, options.output_alloc, options.output_format,
 +     output_name, output_pool)
   let setup dir options source =
     let disks = get_disks dir in
 -    let conn, output_alloc, output_format, output_name, output_pool = options in
 +    let conn, compressed, output_alloc, output_format,
 +        output_name, output_pool = options in
     let conn = Lazy.force conn in
     (* Get the capabilities from libvirt. *)
@@ -119,13 +130,15 @@ module Libvirt_ = struct
         (* Create the actual output disk. *)
         let outdisk = target_path // output_name ^ "-sd" ^ (drive_name i) in
 -        output_to_local_file output_alloc output_format outdisk size socket
 +        output_to_local_file ~compressed output_alloc output_format
 +          outdisk size socket
     ) disks;
     (capabilities_xml, pool_name)
   let rec finalize dir options t source inspect target_meta =
 -    let conn, output_alloc, output_format, output_name, output_pool = options in
 +    let conn, _, output_alloc, output_format, output_name, output_pool =
 +      options in
     let capabilities_xml, pool_name = t in
     (match target_meta.target_firmware with
 diff --git a/output/output_qemu.ml b/output/output_qemu.ml
 index 527d3c5e..e7efbb73 100644
 --- a/output/output_qemu.ml
 +++ b/output/output_qemu.ml
@@ -29,7 +29,8 @@ open Utils
 open Output
 module QEMU = struct
 -  type poptions = bool * Types.output_allocation * string * string * string
 +  type poptions = bool * bool *
 +                  Types.output_allocation * string * string * string
   type t = unit
@@ -42,6 +43,7 @@ module QEMU = struct
   let query_output_options () =
     printf (f_"Output options (-oo) which can be used with -o qemu:
 +  -oo compressed      Compress the output file (used only with -of qcow2)
   -oo qemu-boot       Boot the guest in qemu after conversion
 ")
@@ -49,19 +51,19 @@ module QEMU = struct
     if options.output_password <> None then
       error_option_cannot_be_used_in_output_mode "qemu" "-op";
 -    let qemu_boot = ref false in
 +    let compressed = ref false
 +    and qemu_boot = ref false in
     List.iter (
 -      fun (k, v) ->
 -        match k with
 -        | "qemu-boot" ->
 -           if v = "" || v = "true" then qemu_boot := true
 -           else if v = "false" then qemu_boot := false
 -           else
 -             error (f_"-o qemu: use -oo qemu-boot[=true|false]")
 -        | k ->
 -           error (f_"-o qemu: unknown output option ‘-oo %s’") k
 -      ) options.output_options;
 -    let qemu_boot = !qemu_boot in
 +      function
 +      | "compressed", "" -> compressed := true
 +      | "compressed", v -> compressed := bool_of_string v
 +      | "qemu-boot", "" -> qemu_boot := true
 +      | "qemu-boot", v -> qemu_boot := bool_of_string v
 +      | k, _ ->
 +         error (f_"-o qemu: unknown output option ‘-oo %s’") k
 +    ) options.output_options;
 +    let compressed = !compressed
 +    and qemu_boot = !qemu_boot in
     if qemu_boot then
       error (f_"-o qemu: the -oo qemu-boot option cannot be used in RHEL");
@@ -77,12 +79,13 @@ module QEMU = struct
     let output_name = Option.default source.s_name options.output_name in
 -    (qemu_boot, options.output_alloc, options.output_format,
 +    (compressed, qemu_boot, options.output_alloc, options.output_format,
      output_name, output_storage)
   let setup dir options source =
     let disks = get_disks dir in
 -    let _, output_alloc, output_format, output_name, output_storage = options in
 +    let compressed, _, output_alloc, output_format,
 +        output_name, output_storage = options in
     List.iter (
       fun (i, size) ->
@@ -91,11 +94,12 @@ module QEMU = struct
         (* Create the actual output disk. *)
         let outdisk = disk_path output_storage output_name i in
 -        output_to_local_file output_alloc output_format outdisk size socket
 +        output_to_local_file ~compressed output_alloc output_format
 +          outdisk size socket
     ) disks
   let finalize dir options () source inspect target_meta =
 -    let qemu_boot, output_alloc, output_format,
 +    let _, qemu_boot, output_alloc, output_format,
         output_name, output_storage = options in
     let { guestcaps; target_buses; target_firmware } = target_meta in
--- a/0020-tests-Add-a-simple-test-of-o-local-of-qcow2-oo-compr.patch
+++ b/0020-tests-Add-a-simple-test-of-o-local-of-qcow2-oo-compr.patch
@ -1,114 +0,0 @@
 From 672b9795e85b48f337b3da2d6fa393e7788d79a1 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 1 Jul 2022 11:18:53 +0100
 Subject: [PATCH] tests: Add a simple test of -o local -of qcow2 -oo compressed
 This only tests that it doesn't completely fail, which it did before
 we fixed nbdcopy.  I checked the file sizes manually and with
 compression the resulting file is about half the size.
 This test is a clone of tests/test-v2v-of-option.sh.  In order to
 compare the sizes across the two tests, and to keep the tests fairly
 similar I added an ls -l command to the original test.
 Reviewed-by: Laszlo Ersek <lersek@redhat.com>
 (cherry picked from commit 7505750972b49e1a448c519a27998bd5f20be60a)
 ---
 tests/Makefile.am                          |  2 +
 tests/test-v2v-o-local-qcow2-compressed.sh | 53 ++++++++++++++++++++++
 tests/test-v2v-of-option.sh                |  2 +
 3 files changed, 57 insertions(+)
 create mode 100755 tests/test-v2v-o-local-qcow2-compressed.sh
 diff --git a/tests/Makefile.am b/tests/Makefile.am
 index e787a86c..a26ecf7a 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
@@ -82,6 +82,7 @@ TESTS = \
 	test-v2v-networks-and-bridges.sh \
 	test-v2v-o-glance.sh \
 	test-v2v-o-libvirt.sh \
 +	test-v2v-o-local-qcow2-compressed.sh \
 	test-v2v-o-null.sh \
 	test-v2v-o-openstack.sh \
 	test-v2v-o-qemu.sh \
@@ -241,6 +242,7 @@ EXTRA_DIST += \
 	test-v2v-networks-and-bridges-expected.xml \
 	test-v2v-o-glance.sh \
 	test-v2v-o-libvirt.sh \
 +	test-v2v-o-local-qcow2-compressed.sh \
 	test-v2v-o-null.sh \
 	test-v2v-o-openstack.sh \
 	test-v2v-o-qemu.sh \
 diff --git a/tests/test-v2v-o-local-qcow2-compressed.sh b/tests/test-v2v-o-local-qcow2-compressed.sh
 new file mode 100755
 index 00000000..32c9ebbe
 --- /dev/null
 +++ b/tests/test-v2v-o-local-qcow2-compressed.sh
@@ -0,0 +1,53 @@
 +#!/bin/bash -
 +# libguestfs virt-v2v test script
 +# Copyright (C) 2014-2022 Red Hat Inc.
 +#
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 +
 +# Test -o local -of qcow2 -oo compressed.
 +
 +set -e
 +
 +source ./functions.sh
 +set -e
 +set -x
 +
 +skip_if_skipped
 +requires test -f ../test-data/phony-guests/windows.img
 +
 +# This requires fixed nbdcopy >= 1.13.5.
 +requires nbdcopy --version
 +nbdcopy --version | {
 +    IFS=' .' read name major minor release
 +    requires test \( "$major" -gt 1 \) -o \
 +                  \( "$major" -eq 1 -a "$minor" -gt 13 \) -o \
 +                  \( "$major" -eq 1 -a "$minor" -eq 13 -a "$release" -ge 5 \)
 +}
 +
 +export VIRT_TOOLS_DATA_DIR="$srcdir/../test-data/fake-virt-tools"
 +
 +d=test-v2v-o-local-qcow2-compressed.d
 +rm -rf $d
 +cleanup_fn rm -rf $d
 +mkdir $d
 +
 +$VG virt-v2v --debug-gc \
 +    -i disk ../test-data/phony-guests/windows.img \
 +    -o local -of qcow2 -oo compressed -os $d
 +
 +# Test the libvirt XML metadata and a disk was created.
 +ls -l $d
 +test -f $d/windows.xml
 +test -f $d/windows-sda
 diff --git a/tests/test-v2v-of-option.sh b/tests/test-v2v-of-option.sh
 index bdfd3418..6c5f5938 100755
 --- a/tests/test-v2v-of-option.sh
 +++ b/tests/test-v2v-of-option.sh
@@ -42,6 +42,8 @@ $VG virt-v2v --debug-gc \
     -i libvirt -ic "$libvirt_uri" windows \
     -o local -os $d -of qcow2
 +ls -l $d
 +
 # Test the disk is qcow2 format.
 if [ "$(guestfish disk-format $d/windows-sda)" != qcow2 ]; then
     echo "$0: test failed: output is not qcow2"
--- a/0023-convert-convert_linux-complete-the-remapping-of-NVMe.patch
+++ b/0023-convert-convert_linux-complete-the-remapping-of-NVMe.patch
@ -1,80 +0,0 @@
 From ba2963bc57c8c8a3d6f7cc2fd274c9ebd4ddb7d8 Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Wed, 6 Jul 2022 12:32:15 +0200
 Subject: [PATCH] convert/convert_linux: complete the remapping of NVMe devices
 In commit 75872bf282d7 ("input: -i vmx: Add support for NVMe devices",
 2022-04-08), we missed that pathnames such as
  /dev/nvme0n1[p1]
 would not match our "rex_device_cciss" and "rex_device" regular
 expressions.
 As a consequence, we don't remap such pathnames now in the boot config
 files with Augeas.
 Add a new regex and associated mapping logic for this kind of pathname.
 Notes:
 (1) "rex_device_cciss" could be extended internally with an alternative
 pattern:
  ^/dev/(cciss/c\\d+d\\d+|nvme\\d+n1)(?:p(\\d+))?$
                         ^^^^^^^^^^^
 but Rich suggested we should add a separate, complete regexp for
 maintainability.
 (2) Even with a separate regexp, we could reuse the existent CCISS pattern
 handler:
  if PCRE.matches rex_device_cciss value ||
     PCRE.matches rex_device_nvme value then (
    let device = PCRE.sub 1
    and part = try PCRE.sub 2 with Not_found -> "" in
    "/dev/" ^ replace device ^ part
  )
 Namely, although "PCRE.matches" creates/updates global state, and
 "PCRE.sub" reads that state, the "||" operator in OCaml has short-circuit
 behavior, and both regexps have the same structure.
 But, using the same maintainability argument, let's keep the handler logic
 for NVMe detached.
 Fixes: 75872bf282d7f2322110caca70963717b43806b1
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2101665
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 Message-Id: <20220706103215.5607-1-lersek@redhat.com>
 Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
 (cherry picked from commit 4368b94ee1724c16aa35c0ee42ce4c51ce037b5a)
 ---
 convert/convert_linux.ml | 6 ++++++
 1 file changed, 6 insertions(+)
 diff --git a/convert/convert_linux.ml b/convert/convert_linux.ml
 index 59d143bd..a66ff1e4 100644
 --- a/convert/convert_linux.ml
 +++ b/convert/convert_linux.ml
@@ -1199,6 +1199,7 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ =
     (* Map device names for each entry. *)
     let rex_resume = PCRE.compile "^resume=(/dev/[-a-z\\d/_]+)(.*)$"
     and rex_device_cciss = PCRE.compile "^/dev/(cciss/c\\d+d\\d+)(?:p(\\d+))?$"
 +    and rex_device_nvme = PCRE.compile "^/dev/(nvme\\d+n1)(?:p(\\d+))?$"
     and rex_device = PCRE.compile "^/dev/([a-z]+)(\\d*)?$" in
     let rec replace_if_device path value =
@@ -1221,6 +1222,11 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ =
         and part = try PCRE.sub 2 with Not_found -> "" in
         "/dev/" ^ replace device ^ part
       )
 +      else if PCRE.matches rex_device_nvme value then (
 +        let device = PCRE.sub 1
 +        and part = try PCRE.sub 2 with Not_found -> "" in
 +        "/dev/" ^ replace device ^ part
 +      )
       else if PCRE.matches rex_device value then (
         let device = PCRE.sub 1
         and part = try PCRE.sub 2 with Not_found -> "" in
--- a/0024-input-xen-sync-ip-limitations-language-from-input-vm.patch
+++ b/0024-input-xen-sync-ip-limitations-language-from-input-vm.patch
@ -1,49 +0,0 @@
 From c34fe9a52abdde05cb31c5bd2c99237652e1b0dc Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Mon, 11 Jul 2022 09:01:56 +0200
 Subject: [PATCH] input-xen: sync "-ip" limitations language from input-vmware
 manual
 My analysis in <https://bugzilla.redhat.com/show_bug.cgi?id=1854275#c33>
 was partially wrong; I had missed that for the xen+ssh transport, the
 client-side libvirt library launches a naked "ssh" utility, underneath
 "Libvirt.Connect.connect_auth":
  setup                            [input/input_xen_ssh.ml]
    Libvirt.Connect.connect_auth
      no effect of "-ip"
    Nbdkit_ssh.create_ssh          [input/nbdkit_ssh.ml]
      starts nbdkit with the ssh
        plugin honoring "-ip"
 Which requires a password just the same, and ignores "-ip" just the same.
 Recommend the ssh agent in the docs.
 Fixes: 46298c6514710013c59828b4933f0b3b1a354566
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1854275
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2062360
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 Message-Id: <20220711070157.5399-2-lersek@redhat.com>
 Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
 (cherry picked from commit ae067a9ce0eb5631940a8cc5dcc5ee056903276b)
 ---
 docs/virt-v2v-input-xen.pod | 5 +++++
 1 file changed, 5 insertions(+)
 diff --git a/docs/virt-v2v-input-xen.pod b/docs/virt-v2v-input-xen.pod
 index ad5772de..80ad94f7 100644
 --- a/docs/virt-v2v-input-xen.pod
 +++ b/docs/virt-v2v-input-xen.pod
@@ -32,6 +32,11 @@ server to the Xen host.  For example:
  $ ssh root@xen.example.com
  [ logs straight into the shell, no password is requested ]
 +Note that support for non-interactive authentication via the I<-ip>
 +option is incomplete.  Some operations remain that still require the
 +user to enter the password manually.  Therefore ssh-agent is recommended
 +over the I<-ip> option.  See L<https://bugzilla.redhat.com/1854275>.
 +
 With some modern ssh implementations, legacy crypto policies required
 to interoperate with RHEL 5 sshd are disabled.  To enable them you may
 need to run this command on the conversion server (ie. ssh client),
--- a/0025-input-xen-replace-enable-LEGACY-crypto-advice-with-t.patch
+++ b/0025-input-xen-replace-enable-LEGACY-crypto-advice-with-t.patch
@ -1,82 +0,0 @@
 From 3f7f730ac9cbf38267839ffcebd6b6fd721123c5 Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Mon, 11 Jul 2022 09:01:57 +0200
 Subject: [PATCH] input-xen: replace "enable LEGACY crypto" advice with
 targeted ssh options
 - "KexAlgorithms": the Fedora 35 ssh binary, using the DEFAULT
  crypto-policy, cannot log in to RHEL5 sshd without relaxing
  "KexAlgorithms". The server offers three algorithms:
  "diffie-hellman-group-exchange-sha1", "diffie-hellman-group14-sha1",
  "diffie-hellman-group1-sha1"; and according to RFC 9142,
  "diffie-hellman-group14-sha1" is the least deprecated from those. (The
  RFC marks it as MAY be implemented, and marks the other two as SHOULD
  NOT be implemented.) Recommend "diffie-hellman-group14-sha1".
 - "MACs": the Fedora 35 ssh binary, using the FUTURE crypto-policy, cannot
  log in to RHEL5 sshd without relaxing "MACs". The server offers
  "hmac-md5", "hmac-sha1", "hmac-ripemd160", "hmac-ripemd160@openssh.com",
  "hmac-sha1-96", "hmac-md5-96". After eliminating the MD5-based algos
  (MD5 is considered completely broken), and the one based on truncated
  SHA1, we're left with "hmac-sha1", "hmac-ripemd160", and
  "hmac-ripemd160@openssh.com". RIPEMD-160 is generally trusted, but it is
  compiled out of the Fedora 35 "ssh" client binary. Therefore only
  "hmac-sha1" remains.
 - "HostKeyAlgorithms", "PubkeyAcceptedAlgorithms": these options control
  the usage of public key algorithms, for authenticating the server to the
  client, and vice versa, respectively. RHEL5 sshd only supports "ssh-rsa"
  and "ssh-dss", and from those, "ssh-rsa" is more commonly used (for
  example, "ssh-keygen" defaults to creating "ssh-rsa" keys). Recommend
  "ssh-rsa".
 - "PubkeyAcceptedKeyTypes": this is the old ("legacy") name for
  "PubkeyAcceptedAlgorithms". As of this writing, the latest upstream
  release of libssh (also packaged in Fedora 35 -- libssh-0.9.6-1.fc35)
  does not recognize the new "PubkeyAcceptedAlgorithms" option name, only
  the original "PubkeyAcceptedKeyTypes". openssh-8.7p1-3.fc35 recognizes
  both option variants. Include "PubkeyAcceptedKeyTypes" in the
  recommendation along with "PubkeyAcceptedAlgorithms", for backward and
  forward compatbility.
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2062360
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 Message-Id: <20220711070157.5399-3-lersek@redhat.com>
 Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
 (cherry picked from commit af4a0454cdd21bb5e86f2dbfaa153e83afca3988)
 ---
 docs/virt-v2v-input-xen.pod | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)
 diff --git a/docs/virt-v2v-input-xen.pod b/docs/virt-v2v-input-xen.pod
 index 80ad94f7..1775fc31 100644
 --- a/docs/virt-v2v-input-xen.pod
 +++ b/docs/virt-v2v-input-xen.pod
@@ -37,12 +37,22 @@ option is incomplete.  Some operations remain that still require the
 user to enter the password manually.  Therefore ssh-agent is recommended
 over the I<-ip> option.  See L<https://bugzilla.redhat.com/1854275>.
 -With some modern ssh implementations, legacy crypto policies required
 -to interoperate with RHEL 5 sshd are disabled.  To enable them you may
 -need to run this command on the conversion server (ie. ssh client),
 -but read L<update-crypto-policies(8)> first:
 +With some modern ssh implementations, legacy crypto algorithms required
 +to interoperate with RHEL 5 sshd are disabled.  To enable them, you may
 +need to add the following C<Host> stanza to your F<~/.ssh/config>:
 - # update-crypto-policies --set LEGACY
 + Host xen.example.com
 +   KexAlgorithms            +diffie-hellman-group14-sha1
 +   MACs                     +hmac-sha1
 +   HostKeyAlgorithms        +ssh-rsa
 +   PubkeyAcceptedKeyTypes   +ssh-rsa
 +   PubkeyAcceptedAlgorithms +ssh-rsa
 +
 +(C<PubkeyAcceptedKeyTypes> and C<PubkeyAcceptedAlgorithms> have
 +identical meaning; the former is the old option name, the latter is the
 +new one. Virt-v2v uses both C<libssh> and C<ssh> when converting a guest
 +from Xen, and on some operating systems, C<libssh> and C<ssh> may not
 +both accept the same option variant.)
 =head2 Test libvirt connection to remote Xen host
--- a/0026-common-Adapt-to-renamed-function-On_exit.rmdir-On_ex.patch
+++ b/0026-common-Adapt-to-renamed-function-On_exit.rmdir-On_ex.patch
@ -1,172 +0,0 @@
 From ea881513e9c15b0a816d3ba4afe471ff2f591a03 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 14 Jul 2022 12:44:27 +0100
 Subject: [PATCH] common: Adapt to renamed function On_exit.rmdir ->
 On_exit.rm_rf
 This function was renamed to make it clearer what it does (and that
 it's potentially dangerous).  The functionality is unchanged.
 Reviewed-by: Laszlo Ersek <lersek@redhat.com>
 (cherry picked from commit 2eb6441264deb0411d36dabaf8fb2da9f07c8439)
 ---
 common                         | 2 +-
 input/OVA.ml                   | 2 +-
 input/parse_domain_from_vmx.ml | 2 +-
 lib/nbdkit.ml                  | 2 +-
 lib/qemuNBD.ml                 | 2 +-
 lib/utils.ml                   | 2 +-
 output/python_script.ml        | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
 Submodule common af6cb55b..fd964c1b:
 diff --git a/common/mlcustomize/guest_packages.ml b/common/mlcustomize/guest_packages.ml
 index 4c3c34ed..7c29a2ab 100644
 --- a/common/mlcustomize/guest_packages.ml
 +++ b/common/mlcustomize/guest_packages.ml
@@ -73,9 +73,9 @@ let install_command packages package_management =
   | "zypper" -> sprintf "zypper -n in -l %s" quoted_args
   | "unknown" ->
 -    error_unknown_package_manager (s_"--install")
 +    error_unknown_package_manager "--install"
   | pm ->
 -    error_unimplemented_package_manager (s_"--install") pm
 +    error_unimplemented_package_manager "--install" pm
 let update_command package_management =
   match package_management with
@@ -103,9 +103,9 @@ let update_command package_management =
   | "zypper" -> "zypper -n update -l"
   | "unknown" ->
 -    error_unknown_package_manager (s_"--update")
 +    error_unknown_package_manager "--update"
   | pm ->
 -    error_unimplemented_package_manager (s_"--update") pm
 +    error_unimplemented_package_manager "--update" pm
 let uninstall_command packages package_management =
   let quoted_args = String.concat " " (List.map quote packages) in
@@ -127,6 +127,6 @@ let uninstall_command packages package_management =
   | "zypper" -> sprintf "zypper -n rm %s" quoted_args
   | "unknown" ->
 -    error_unknown_package_manager (s_"--uninstall")
 +    error_unknown_package_manager "--uninstall"
   | pm ->
 -    error_unimplemented_package_manager (s_"--uninstall") pm
 +    error_unimplemented_package_manager "--uninstall" pm
 diff --git a/common/mltools/on_exit.ml b/common/mltools/on_exit.ml
 index 53ccb68a..cae12e73 100644
 --- a/common/mltools/on_exit.ml
 +++ b/common/mltools/on_exit.ml
@@ -52,7 +52,7 @@ let do_actions () =
     List.iter (do_action (fun file -> Unix.unlink file)) !files;
     List.iter (do_action (
       fun dir ->
 -        let cmd = sprintf "rm -rf %s" (Filename.quote dir) in
 +        let cmd = sprintf "rm -rf -- %s" (Filename.quote dir) in
         ignore (Tools_utils.shell_command cmd)
       )
     ) !rmdirs;
@@ -102,7 +102,7 @@ let unlink filename =
   register ();
   List.push_front filename files
 -let rmdir dir =
 +let rm_rf dir =
   register ();
   List.push_front dir rmdirs
 diff --git a/common/mltools/on_exit.mli b/common/mltools/on_exit.mli
 index a02e3db3..9bcf104f 100644
 --- a/common/mltools/on_exit.mli
 +++ b/common/mltools/on_exit.mli
@@ -47,7 +47,7 @@ val f : (unit -> unit) -> unit
 val unlink : string -> unit
 (** Unlink a single temporary file on exit. *)
 -val rmdir : string -> unit
 +val rm_rf : string -> unit
 (** Recursively remove a temporary directory on exit (using [rm -rf]). *)
 val kill : ?signal:int -> int -> unit
 diff --git a/input/OVA.ml b/input/OVA.ml
 index 9e9c3712..09ceee98 100644
 --- a/input/OVA.ml
 +++ b/input/OVA.ml
@@ -78,7 +78,7 @@ let rec parse_ova ova =
     else (
       let tmpdir =
         let t = Mkdtemp.temp_dir ~base_dir:large_tmpdir "ova." in
 -        On_exit.rmdir t;
 +        On_exit.rm_rf t;
         t in
       match detect_file_type ova with
 diff --git a/input/parse_domain_from_vmx.ml b/input/parse_domain_from_vmx.ml
 index 947ca414..7aca2c24 100644
 --- a/input/parse_domain_from_vmx.ml
 +++ b/input/parse_domain_from_vmx.ml
@@ -375,7 +375,7 @@ and find_nics vmx =
 let parse_domain_from_vmx vmx_source =
   let tmpdir =
     let t = Mkdtemp.temp_dir "vmx." in
 -    On_exit.rmdir t;
 +    On_exit.rm_rf t;
     t in
   (* If the transport is SSH, fetch the file from remote, else
 diff --git a/lib/nbdkit.ml b/lib/nbdkit.ml
 index 07896684..1137b6bb 100644
 --- a/lib/nbdkit.ml
 +++ b/lib/nbdkit.ml
@@ -105,7 +105,7 @@ let add_filter_if_available cmd filter =
 let run_unix socket cmd =
   (* Create a temporary directory where we place the PID file. *)
   let piddir = Mkdtemp.temp_dir "v2vnbdkit." in
 -  On_exit.rmdir piddir;
 +  On_exit.rm_rf piddir;
   let id = unique () in
   let pidfile = piddir // sprintf "nbdkit%d.pid" id in
 diff --git a/lib/qemuNBD.ml b/lib/qemuNBD.ml
 index bbb65f41..c3dd1666 100644
 --- a/lib/qemuNBD.ml
 +++ b/lib/qemuNBD.ml
@@ -69,7 +69,7 @@ let run_unix socket { disk; snapshot; format; imgopts } =
   (* Create a temporary directory where we place the PID file. *)
   let piddir = Mkdtemp.temp_dir "v2vqemunbd." in
 -  On_exit.rmdir piddir;
 +  On_exit.rm_rf piddir;
   let id = unique () in
   let pidfile = piddir // sprintf "qemunbd%d.pid" id in
 diff --git a/lib/utils.ml b/lib/utils.ml
 index 7116a4f9..84b9a93f 100644
 --- a/lib/utils.ml
 +++ b/lib/utils.ml
@@ -204,7 +204,7 @@ let error_if_no_ssh_agent () =
 let create_v2v_directory () =
   let d = Mkdtemp.temp_dir "v2v." in
   chown_for_libvirt_rhbz_1045069 d;
 -  On_exit.rmdir d;
 +  On_exit.rm_rf d;
   d
 (* Wait for a file to appear until a timeout. *)
 diff --git a/output/python_script.ml b/output/python_script.ml
 index 54ccd1b5..ecf46c2d 100644
 --- a/output/python_script.ml
 +++ b/output/python_script.ml
@@ -33,7 +33,7 @@ type script = {
 let create ?(name = "script.py") code =
   let tmpdir = Mkdtemp.temp_dir "v2v." in
 -  On_exit.rmdir tmpdir;
 +  On_exit.rm_rf tmpdir;
   let path = tmpdir // name in
   with_open_out path (fun chan -> output_string chan code);
   { tmpdir; path }
--- a/0027-o-rhv-Unmount-the-temporary-NFS-mountpoint-as-late-a.patch
+++ b/0027-o-rhv-Unmount-the-temporary-NFS-mountpoint-as-late-a.patch
@ -1,171 +0,0 @@
 From 0d92a42aab3fb0e7569294675666976724156128 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 14 Jul 2022 13:15:49 +0100
 Subject: [PATCH] -o rhv: Unmount the temporary NFS mountpoint as late as
 possible
 To partially avoid a potential race against nbdkit or qemu-nbd
 releasing files on the mountpoint before they exit, unmount as late as
 we can.
 See also https://bugzilla.redhat.com/show_bug.cgi?id=1953286#c26
 Reviewed-by: Laszlo Ersek <lersek@redhat.com>
 (cherry picked from commit e96357fc3b26aaf96eaa21afa36c894a27af6261)
 ---
 common               | 2 +-
 output/output_rhv.ml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 Submodule common fd964c1b..1000604f:
 diff --git a/common/mltools/on_exit.ml b/common/mltools/on_exit.ml
 index cae12e73..f8ef74e1 100644
 --- a/common/mltools/on_exit.ml
 +++ b/common/mltools/on_exit.ml
@@ -23,39 +23,39 @@ open Common_gettext.Gettext
 open Unix
 open Printf
 -(* List of files to unlink. *)
 -let files = ref []
 +type action =
 +  | Unlink of string     (* filename *)
 +  | Rm_rf of string      (* directory *)
 +  | Kill of int * int    (* signal, pid *)
 +  | Fn of (unit -> unit) (* generic function *)
 -(* List of directories to remove. *)
 -let rmdirs = ref []
 -
 -(* List of PIDs to kill. *)
 -let kills = ref []
 -
 -(* List of functions to call. *)
 -let fns = ref []
 +(* List of (priority, action). *)
 +let actions = ref []
 (* Perform a single exit action, printing any exception but
  * otherwise ignoring failures.
  *)
 -let do_action f arg =
 -  try f arg with exn -> debug "%s" (Printexc.to_string exn)
 +let do_action action =
 +  try
 +    match action with
 +    | Unlink file -> Unix.unlink file
 +    | Rm_rf dir ->
 +       let cmd = sprintf "rm -rf -- %s" (Filename.quote dir) in
 +       ignore (Tools_utils.shell_command cmd)
 +    | Kill (signal, pid) ->
 +       kill pid signal
 +    | Fn f -> f ()
 +  with exn -> debug "%s" (Printexc.to_string exn)
 (* Make sure the actions are performed only once. *)
 let done_actions = ref false
 -(* Perform the exit actions. *)
 +(* Perform the exit actions in priority order (lowest prio first). *)
 let do_actions () =
   if not !done_actions then (
 -    List.iter (do_action (fun f -> f ())) !fns;
 -    List.iter (do_action (fun (signal, pid) -> kill pid signal)) !kills;
 -    List.iter (do_action (fun file -> Unix.unlink file)) !files;
 -    List.iter (do_action (
 -      fun dir ->
 -        let cmd = sprintf "rm -rf -- %s" (Filename.quote dir) in
 -        ignore (Tools_utils.shell_command cmd)
 -      )
 -    ) !rmdirs;
 +    let actions = List.sort (fun (a, _) (b, _) -> compare a b) !actions in
 +    let actions = List.map snd actions in
 +    List.iter do_action actions
   );
   done_actions := true
@@ -94,18 +94,18 @@ let register () =
   );
   registered := true
 -let f fn =
 +let f ?(prio = 5000) fn =
   register ();
 -  List.push_front fn fns
 +  List.push_front (prio, Fn fn) actions
 -let unlink filename =
 +let unlink ?(prio = 5000) filename =
   register ();
 -  List.push_front filename files
 +  List.push_front (prio, Unlink filename) actions
 -let rm_rf dir =
 +let rm_rf ?(prio = 5000) dir =
   register ();
 -  List.push_front dir rmdirs
 +  List.push_front (prio, Rm_rf dir) actions
 -let kill ?(signal = Sys.sigterm) pid =
 +let kill ?(prio = 5000) ?(signal = Sys.sigterm) pid =
   register ();
 -  List.push_front (signal, pid) kills
 +  List.push_front (prio, Kill (signal, pid)) actions
 diff --git a/common/mltools/on_exit.mli b/common/mltools/on_exit.mli
 index 9bcf104f..66a85542 100644
 --- a/common/mltools/on_exit.mli
 +++ b/common/mltools/on_exit.mli
@@ -28,6 +28,12 @@
     killing another process, so we provide simple
     wrappers for those common actions here.
 +    Actions can be ordered by setting the optional [?prio]
 +    parameter in the range 0..9999.  By default actions
 +    have priority 5000.  Lower numbered actions run first.
 +    Higher numbered actions run last.  So to have an action
 +    run at the very end before exit you might use [~prio:9999]
 +
     Note this module registers signal handlers for
     SIGINT, SIGQUIT, SIGTERM and SIGHUP.  This means
     that any program that links with mltools.cmxa
@@ -39,18 +45,20 @@
     Your cleanup action might no longer run unless the
     program calls {!Stdlib.exit}. *)
 -val f : (unit -> unit) -> unit
 +val f : ?prio:int -> (unit -> unit) -> unit
 (** Register a function [f] which runs when the program exits.
     Similar to [Stdlib.at_exit] but also runs if the program is
 -    killed with a signal that we can catch. *)
 +    killed with a signal that we can catch.
 -val unlink : string -> unit
 +    [?prio] is the priority, default 5000.  See the description above. *)
 +
 +val unlink : ?prio:int -> string -> unit
 (** Unlink a single temporary file on exit. *)
 -val rm_rf : string -> unit
 +val rm_rf : ?prio:int -> string -> unit
 (** Recursively remove a temporary directory on exit (using [rm -rf]). *)
 -val kill : ?signal:int -> int -> unit
 +val kill : ?prio:int -> ?signal:int -> int -> unit
 (** Kill [PID] on exit.  The signal sent defaults to [Sys.sigterm].
     Use this with care since you can end up unintentionally killing
 diff --git a/output/output_rhv.ml b/output/output_rhv.ml
 index 8571e07b..15a2c14a 100644
 --- a/output/output_rhv.ml
 +++ b/output/output_rhv.ml
@@ -204,8 +204,8 @@ module RHV = struct
        if run_command cmd <> 0 then
          error (f_"mount command failed, see earlier errors.\n\nThis probably means you didn't specify the right %s path [-os %s], or else you need to rerun virt-v2v as root.") domain_class os;
 -       (* Make sure it is unmounted at exit. *)
 -       On_exit.f (
 +       (* Make sure it is unmounted at exit, as late as possible (prio=9999) *)
 +       On_exit.f ~prio:9999 (
          fun () ->
            let cmd = [ "umount"; mp ] in
            ignore (run_command cmd);
--- a/0028-output-Permit-output-modes-to-wait-on-the-local-NBD-.patch
+++ b/0028-output-Permit-output-modes-to-wait-on-the-local-NBD-.patch
@ -1,179 +0,0 @@
 From 96efdcf54c887ae88d54332df12a5f5dd962fd0a Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 15 Jul 2022 11:25:45 +0100
 Subject: [PATCH] output: Permit output modes to wait on the local NBD server
 Output.output_to_local_file is used by several output modes that write
 to local files or devices.  It launches an instance of qemu-nbd or
 nbdkit connected to the local file.
 Previously we unconditionally added an On_exit handler to kill the NBD
 server.  This is usually safe because nbdcopy --flush has guaranteed
 that the data was written through to permanent storage, and so killing
 the NBD server is just there to prevent orphaned processes.
 However for output to RHV (-o rhv) we actually need the NBD server to
 be cleaned up before we exit.  See the analysis here:
 https://bugzilla.redhat.com/show_bug.cgi?id=1953286#c26
 Allow an alternate strategy of waiting for the NBD server to exit
 during virt-v2v shutdown.
 We only need this in virt-v2v so implement it here instead of pushing
 it all the way into the On_exit module.
 Reviewed-by: Laszlo Ersek <lersek@redhat.com>
 (cherry picked from commit e2a1a7b4dfb6a9e44260da10a7e7029c09753b5c)
 ---
 output/output.ml  | 91 ++++++++++++++++++++++++++++-------------------
 output/output.mli | 17 +++++++--
 2 files changed, 69 insertions(+), 39 deletions(-)
 diff --git a/output/output.ml b/output/output.ml
 index 496c32b6..8f83a324 100644
 --- a/output/output.ml
 +++ b/output/output.ml
@@ -69,7 +69,10 @@ let error_if_disk_count_gt dir n =
   if Sys.file_exists socket then
     error (f_"this output module doesn't support copying more than %d disks") n
 +type on_exit_kill = Kill | KillAndWait
 +
 let output_to_local_file ?(changeuid = fun f -> f ()) ?(compressed = false)
 +      ?(on_exit_kill = Kill)
       output_alloc output_format filename size socket =
   (* Check nbdkit is installed and has the required plugin. *)
   if not (Nbdkit.is_installed ()) then
@@ -94,46 +97,60 @@ let output_to_local_file ?(changeuid = fun f -> f ()) ?(compressed = false)
     fun () -> g#disk_create ?preallocation filename output_format size
   );
 -  match output_format with
 -  | "raw" ->
 -     let cmd = Nbdkit.create "file" in
 -     Nbdkit.add_arg cmd "file" filename;
 -     if Nbdkit.version nbdkit_config >= (1, 22, 0) then (
 -       let cmd = Nbdkit.add_arg cmd "cache" "none" in
 -       cmd
 -     );
 -     let _, pid = Nbdkit.run_unix socket cmd in
 +  let pid =
 +    match output_format with
 +    | "raw" ->
 +       let cmd = Nbdkit.create "file" in
 +       Nbdkit.add_arg cmd "file" filename;
 +       if Nbdkit.version nbdkit_config >= (1, 22, 0) then (
 +         let cmd = Nbdkit.add_arg cmd "cache" "none" in
 +         cmd
 +       );
 +       let _, pid = Nbdkit.run_unix socket cmd in
 +       pid
 -     (* --exit-with-parent should ensure nbdkit is cleaned
 -      * up when we exit, but it's not supported everywhere.
 -      *)
 -     On_exit.kill pid
 +    | "qcow2" ->
 +       let cmd =
 +         if compressed then (
 +           let qemu_quote str = String.replace str "," ",," in
 +           let image_opts = [ "driver=compress";
 +                              "file.driver=qcow2";
 +                              "file.file.driver=file";
 +                              "file.file.filename=" ^ qemu_quote filename ] in
 +           let image_opts = String.concat "," image_opts in
 +           let cmd = QemuNBD.create image_opts in
 +           QemuNBD.set_image_opts cmd true;
 +           cmd
 +         )
 +         else (* not compressed *) (
 +           let cmd = QemuNBD.create filename in
 +           QemuNBD.set_format cmd (Some "qcow2");
 +           cmd
 +         ) in
 +       QemuNBD.set_snapshot cmd false;
 +       let _, pid = QemuNBD.run_unix socket cmd in
 +       pid
 -  | "qcow2" ->
 -     let cmd =
 -       if compressed then (
 -         let qemu_quote str = String.replace str "," ",," in
 -         let image_opts = [ "driver=compress";
 -                            "file.driver=qcow2";
 -                            "file.file.driver=file";
 -                            "file.file.filename=" ^ qemu_quote filename ] in
 -         let image_opts = String.concat "," image_opts in
 -         let cmd = QemuNBD.create image_opts in
 -         QemuNBD.set_image_opts cmd true;
 -         cmd
 -       )
 -       else (* not compressed *) (
 -         let cmd = QemuNBD.create filename in
 -         QemuNBD.set_format cmd (Some "qcow2");
 -         cmd
 -       ) in
 -     QemuNBD.set_snapshot cmd false;
 -     let _, pid = QemuNBD.run_unix socket cmd in
 -     On_exit.kill pid
 +    | _ ->
 +       error (f_"output mode only supports raw or qcow2 format (format: %s)")
 +         output_format in
 +
 +  match on_exit_kill with
 +  | Kill ->
 +    (* Kill the NBD server on exit.  (For nbdkit we use --exit-with-parent
 +     * but it's not supported everywhere).
 +     *)
 +    On_exit.kill pid
 -  | _ ->
 -     error (f_"output mode only supports raw or qcow2 format (format: %s)")
 -       output_format
 +  | KillAndWait ->
 +     On_exit.f (
 +       fun () ->
 +         kill pid Sys.sigterm;
 +         (* Errors from the NBD server don't matter.  On successful
 +          * completion we've already committed the data to disk.
 +          *)
 +         ignore (waitpid [] pid)
 +     )
 let disk_path os name i =
   let outdisk = sprintf "%s/%s-sd%s" os name (drive_name i) in
 diff --git a/output/output.mli b/output/output.mli
 index c1f0f53d..c4486311 100644
 --- a/output/output.mli
 +++ b/output/output.mli
@@ -83,14 +83,27 @@ val error_if_disk_count_gt : string -> int -> unit
     "in[n]" in the v2v directory [dir].  If the socket exists, [error] is
     called. *)
 +type on_exit_kill = Kill | KillAndWait
 +
 val output_to_local_file : ?changeuid:((unit -> unit) -> unit) ->
 -                           ?compressed:bool ->
 +                           ?compressed:bool -> ?on_exit_kill:on_exit_kill ->
                            Types.output_allocation ->
                            string -> string -> int64 -> string ->
                            unit
 (** When an output mode wants to create a local file with a
     particular format (only "raw" or "qcow2" allowed) then
 -    this common function can be used. *)
 +    this common function can be used.
 +
 +    Optional parameter [?on_exit_kill] controls how the NBD server
 +    is cleaned up.  The default is {!Kill} which registers an
 +    {!On_exit.kill} handler that kills (but does not wait for)
 +    the server when virt-v2v exits.  Most callers should use this.
 +
 +    Setting [~on_exit_kill:KillAndWait] should be used if the NBD
 +    server must fully exit before we continue with the rest of
 +    virt-v2v shut down.  This is only necessary if some other action
 +    (such as unmounting a host filesystem or removing a host device)
 +    depends on the NBD server releasing resources. *)
 val disk_path : string -> string -> int -> string
 (** For [-o disk|qemu], return the output disk name of the i'th disk,
--- a/0029-o-rhv-Wait-for-the-NBD-server-to-exit-to-avoid-a-rac.patch
+++ b/0029-o-rhv-Wait-for-the-NBD-server-to-exit-to-avoid-a-rac.patch
@ -1,33 +0,0 @@
 From f820585c37beb648ab856818179091349a604523 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 15 Jul 2022 11:37:46 +0100
 Subject: [PATCH] -o rhv: Wait for the NBD server to exit to avoid a race with
 unmounting
 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1953286#c26
 Reviewed-by: Laszlo Ersek <lersek@redhat.com>
 (cherry picked from commit 2fbd578b4e6884a23063ad67ee36f02c4eb6c668)
 ---
 output/output_rhv.ml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
 diff --git a/output/output_rhv.ml b/output/output_rhv.ml
 index 15a2c14a..45f831e3 100644
 --- a/output/output_rhv.ml
 +++ b/output/output_rhv.ml
@@ -175,7 +175,14 @@ module RHV = struct
               chmod filename 0o666
           )
         in
 -        output_to_local_file ~changeuid
 +
 +        (* We have to wait for the NBD server to exit rather than just
 +         * killing it, otherwise it races with unmounting.  See:
 +         * https://bugzilla.redhat.com/show_bug.cgi?id=1953286#c26
 +         *)
 +        let on_exit_kill = Output.KillAndWait in
 +
 +        output_to_local_file ~changeuid ~on_exit_kill
           output_alloc output_format filename size socket
     ) (List.combine disks filenames);
--- a/0030-output-create_libvirt_xml-relax-VCPU-feature-checkin.patch
+++ b/0030-output-create_libvirt_xml-relax-VCPU-feature-checkin.patch
@ -1,66 +0,0 @@
 From 29c6ee9322da082e3be9faa94cf4a6840b49cd97 Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Fri, 22 Jul 2022 09:36:27 +0200
 Subject: [PATCH] output/create_libvirt_xml: relax VCPU feature checking for
 "qemu64"
 When the source domain doesn't specify a VCPU model ("s_cpu_model" is
 None), and the guest OS is assumed to work with the default VCPU model
 ("gcaps_default_cpu" is true), we don't output any <cpu> element. In that
 case, libvirtd augments the domain config with:
  [1] <cpu mode='custom' match='exact' check='none'>
        <model fallback='forbid'>qemu64</model>
      </cpu>
 where the @check='none' attribute ensures that the converted domain will
 be launched, for example, on an Intel host, despite the "qemu64" VCPU
 model containing AMD-only feature flags such as "svm".
 However, if the source domain explicitly specifies the "qemu64" model
 (mostly seen with "-i libvirt -ic qemu://..."), we presently output
  [2] <cpu match='minimum'>
        <model fallback='allow'>qemu64</model>
      </cpu>
 which libvirtd completes as
  [3] <cpu mode='custom' match='minimum' check='partial'>
        <model fallback='allow'>qemu64</model>
      </cpu>
 In [3], cpu/@match='minimum' and cpu/model/@fallback='allow' are both
 laxer than @match='exact' and @fallback='forbid', respectively, in [1].
 However, cpu/@check='partial' in [3] is stricter than @check='none' in
 [1]; it causes libvirtd to catch the "svm" feature flag on an Intel host,
 and prevents the converted domain from starting.
 The "qemu64" VCPU model is supposed to run on every possible host
 <https://gitlab.com/qemu-project/qemu/-/blob/master/docs/system/cpu-models-x86.rst.inc>,
 therefore make an exception for the explicitly specified "qemu64" VCPU
 model, and generate the @check='none' attribute.
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2107503
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 Message-Id: <20220722073627.6511-1-lersek@redhat.com>
 Acked-by: Richard W.M. Jones <rjones@redhat.com>
 (cherry picked from commit e5297c3180fd3ebea41a40f4c5a66969a24b9ff3)
 ---
 output/create_libvirt_xml.ml | 2 ++
 1 file changed, 2 insertions(+)
 diff --git a/output/create_libvirt_xml.ml b/output/create_libvirt_xml.ml
 index 531a4f75..bd01304d 100644
 --- a/output/create_libvirt_xml.ml
 +++ b/output/create_libvirt_xml.ml
@@ -192,6 +192,8 @@ let create_libvirt_xml ?pool source inspect
            List.push_back cpu_attrs ("mode", "host-passthrough");
      | Some model ->
          List.push_back cpu_attrs ("match", "minimum");
 +         if model = "qemu64" then
 +           List.push_back cpu_attrs ("check", "none");
          (match source.s_cpu_vendor with
           | None -> ()
           | Some vendor ->
--- a/0031-input-xen-cover-RHEL9-OpenSSL-crypto-settings.patch
+++ b/0031-input-xen-cover-RHEL9-OpenSSL-crypto-settings.patch
@ -1,59 +0,0 @@
 From 9e1c78a4dda8e8f504fd8f01d7ff5a02e6d3b8ff Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Fri, 29 Jul 2022 12:57:03 +0200
 Subject: [PATCH] input-xen: cover RHEL9 OpenSSL crypto settings
 In [master] commit af4a0454cdd2 ("input-xen: replace "enable LEGACY
 crypto" advice with targeted ssh options", 2022-07-11), we documented how
 the libssh / openssh crypto settings needed to be relaxed, for connecting
 to RHEL5 sshd. [rhel-9.1 commit: 3f7f730ac9cb.]
 It turns out that in RHEL9, the non-LEGACY crypto policies disable SHA1 in
 signature algorithms even at the OpenSSL level. Explain how the user can
 re-enable that separately, for individual virt-v2v invocations.
 The method depends on Rich's libvirt commit 45912ac399ab ("rpc: Pass
 OPENSSL_CONF through to ssh invocations", 2022-07-25), which is is going
 to be released in upstream libvirt v8.6.0.
 Thanks: Dmitry Belyavskiy & Rich Jones
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2062360
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 Message-Id: <20220729105703.10150-1-lersek@redhat.com>
 Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
 (cherry picked from commit ddab06d5eb99696f5fd1073b8ec91efbc8c3e4ab)
 ---
 docs/virt-v2v-input-xen.pod | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 diff --git a/docs/virt-v2v-input-xen.pod b/docs/virt-v2v-input-xen.pod
 index 1775fc31..9c3981e1 100644
 --- a/docs/virt-v2v-input-xen.pod
 +++ b/docs/virt-v2v-input-xen.pod
@@ -54,6 +54,26 @@ new one. Virt-v2v uses both C<libssh> and C<ssh> when converting a guest
 from Xen, and on some operating systems, C<libssh> and C<ssh> may not
 both accept the same option variant.)
 +When connecting to RHEL 5 sshd from RHEL 9, the SHA1 algorithm's use in
 +signatures has to be re-enabled at the OpenSSL level, in addition to the
 +above SSH configuration.  Create a file called F<$HOME/openssl-sha1.cnf>
 +with the following contents:
 +
 + .include /etc/ssl/openssl.cnf
 + [openssl_init]
 + alg_section = evp_properties
 + [evp_properties]
 + rh-allow-sha1-signatures = yes
 +
 +and export the following variable into the environment of the
 +C<virt-v2v> process:
 +
 + OPENSSL_CONF=$HOME/openssl-sha1.cnf
 +
 +Note that the C<OPENSSL_CONF> environment variable will only take effect
 +if the libvirt client library used by virt-v2v is at least version
 +8.6.0.
 +
 =head2 Test libvirt connection to remote Xen host
 Use the L<virsh(1)> command to list the guests on the remote Xen host:
--- a/0032-convert_linux-remove-LVM2-devices-file.patch
+++ b/0032-convert_linux-remove-LVM2-devices-file.patch
@ -1,46 +0,0 @@
 From 83fc438139c49ffae330d5caeece1e52bcb1d18e Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Fri, 5 Aug 2022 10:44:26 +0200
 Subject: [PATCH] convert_linux: remove LVM2 "devices file"
 A recent feature of LVM2 is the "devices file"
 <https://man7.org/linux/man-pages/man8/lvmdevices.8.html>. It speeds up
 LVM2 PV discovery on a normal system, but an old devices file in a
 converted domain (with different hardware) can prevent the assembly of
 volume groups.
 In particular, when converting a physical system to a guest with virt-p2v,
 the original system will have used "sys_wwid"-type identifiers in the LVM2
 devices file, and those are guaranteed not to match any virtio-blk disks
 in the output domain.
 We've seen a similar issue in the past under RHBZ#1164853, so just extend
 the same scrubbing with the new pathname.
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2112801
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 Message-Id: <20220805084426.9200-1-lersek@redhat.com>
 Acked-by: Richard W.M. Jones <rjones@redhat.com>
 (cherry picked from commit 8e4b732e8b4343c169c658338da53fb0ede7e512)
 ---
 convert/convert_linux.ml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/convert/convert_linux.ml b/convert/convert_linux.ml
 index a66ff1e4..2aaa438e 100644
 --- a/convert/convert_linux.ml
 +++ b/convert/convert_linux.ml
@@ -1402,11 +1402,11 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ =
      * device names.  blkid will rebuild these on demand.
      *
      * Delete the LVM cache since it will contain references to the
 -     * old devices (RHBZ#1164853).
 +     * old devices (RHBZ#1164853, RHBZ#2112801).
      *)
     List.iter g#rm_f [
       "/etc/blkid/blkid.tab"; "/etc/blkid.tab";
 -      "/etc/lvm/cache/.cache"
 +      "/etc/lvm/cache/.cache"; "/etc/lvm/devices/system.devices"
     ];
   in
--- a/0033-convert-linux-Add-support-for-Zstandard-compressed-k.patch
+++ b/0033-convert-linux-Add-support-for-Zstandard-compressed-k.patch
@ -1,48 +0,0 @@
 From 380fa6663e9b373d87e446fc03601e9e44f985f6 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 9 Aug 2022 19:09:08 +0100
 Subject: [PATCH] convert: linux: Add support for Zstandard compressed kernel
 modules
 OpenSUSE uses *.ko.zst for kernel modules.  This commit adds support
 in the same way as the existing support for *.ko.xz.  Note this
 requires a corresponding change to libguestfs to support Zstandard
 compression in the guestfs_file_architecture API:
 https://github.com/libguestfs/libguestfs/commit/0e784824e82a88e522873fec5db1a11943d637ed
 Reported-by: Xiaodai Wang
 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2116811
 (cherry picked from commit 315c016dbea899587649a4bbf1865390cb4e1d3c)
 ---
 convert/linux_kernels.ml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
 diff --git a/convert/linux_kernels.ml b/convert/linux_kernels.ml
 index 307de572..6e9d2bdd 100644
 --- a/convert/linux_kernels.ml
 +++ b/convert/linux_kernels.ml
@@ -65,8 +65,8 @@ let print_kernel_info chan prefix ki =
       ki.ki_supports_isa_pvpanic ki.ki_supports_virtio_socket
       ki.ki_is_xen_pv_only_kernel ki.ki_is_debug
 -let rex_ko = PCRE.compile "\\.k?o(?:\\.xz)?$"
 -let rex_ko_extract = PCRE.compile "/([^/]+)\\.k?o(?:\\.xz)?$"
 +let rex_ko = PCRE.compile "\\.k?o(?:\\.(?:xz|zst))?$"
 +let rex_ko_extract = PCRE.compile "/([^/]+)\\.k?o(?:\\.(?:xz|zst))?$"
 let detect_kernels (g : G.guestfs) inspect family bootloader =
   (* What kernel/kernel-like packages are installed on the current guest? *)
@@ -203,7 +203,11 @@ let detect_kernels (g : G.guestfs) inspect family bootloader =
              let all_candidates = List.flatten (
                List.map (
                  fun f ->
 -                   [ "/" ^ f ^ ".o"; "/" ^ f ^ ".ko"; "/" ^ f ^ ".ko.xz" ]
 +                   [ "/" ^ f ^ ".o";
 +                     "/" ^ f ^ ".ko";
 +                     "/" ^ f ^ ".ko.xz";
 +                     "/" ^ f ^ ".ko.zst";
 +                   ]
                ) candidates
              ) in
              let candidate =
--- a/0034-convert_linux-start-the-QEMU-guest-agent-in-a-distro.patch
+++ b/0034-convert_linux-start-the-QEMU-guest-agent-in-a-distro.patch
@ -1,98 +0,0 @@
 From 7dd396af54df3f7563aa3a42b3c17547710aec67 Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Wed, 17 Aug 2022 16:47:36 +0200
 Subject: [PATCH] convert_linux: start the QEMU guest agent in a
 distro-specific way
 The current command "service <package-name> start" does not apply to
 RHEL-6; the service name ("qemu-ga") differs from the package name
 ("qemu-guest-agent") there.
 Overhaul the logic -- detach the command from the package name; cover the
 RHEL, ALT, SUSE and Debian families separately. Remove the "chkconfig"
 command, as in all tested / investigated cases, it is unnecessary.
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2028764
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 Message-Id: <20220817144736.18850-1-lersek@redhat.com>
 Acked-by: Richard W.M. Jones <rjones@redhat.com>
 (cherry picked from commit ad2b4f2e50950a5798a75359badb526290aa92e7)
 ---
 convert/convert_linux.ml | 56 ++++++++++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 16 deletions(-)
 diff --git a/convert/convert_linux.ml b/convert/convert_linux.ml
 index 2aaa438e..b8e9ad15 100644
 --- a/convert/convert_linux.ml
 +++ b/convert/convert_linux.ml
@@ -66,6 +66,34 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ =
     | _ -> None
   in
 +  let qga_svc_start_cmd family distro major =
 +    match family, distro, major with
 +    | `RHEL_family, ( "rhel" | "centos" | "scientificlinux" | "redhat-based" |
 +                      "oraclelinux" ), 6 ->
 +      (* https://bugzilla.redhat.com/show_bug.cgi?id=2028764#c52 *)
 +      Some "service qemu-ga start"
 +
 +    | `RHEL_family, _, _ ->
 +      (* https://bugzilla.redhat.com/show_bug.cgi?id=2028764#c52 *)
 +      Some "systemctl start qemu-guest-agent"
 +
 +    | `ALT_family, _, _ ->
 +      (* https://bugzilla.redhat.com/show_bug.cgi?id=2028764#c45 *)
 +      Some "systemctl start qemu-guest-agent"
 +
 +    | `SUSE_family, _, _ ->
 +      (* https://bugzilla.redhat.com/show_bug.cgi?id=2028764#c51 *)
 +      None
 +
 +    | `Debian_family, _, _ ->
 +      (* https://bugzilla.redhat.com/show_bug.cgi?id=2028764#c42 *)
 +      Some "service qemu-guest-agent start"
 +
 +    | _ ->
 +      (* should never be called when "qga_pkg_of_family" returns None *)
 +      assert false
 +  in
 +
   assert (inspect.i_package_format = "rpm" || inspect.i_package_format = "deb");
   (* Fail early if i_apps is empty.  Certain steps such as kernel
@@ -615,23 +643,19 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ =
                         \ \ rm -f %s\n\
                         fi\n" selinux_enforcing selinux_enforcing);
 -            (* Start the agent now and at subsequent boots. The following
 -             * commands should work on both sysvinit distros / distro versions
 -             * (regardless of "/etc/rc.d/" vs. "/etc/init.d/" being the scheme
 -             * in use) and systemd distros (via redirection to systemctl).
 -             *
 -             * On distros where the chkconfig command is redirected to
 -             * systemctl, the chkconfig command is likely superfluous. That's
 -             * because on systemd distros, the QGA package comes with such
 -             * runtime dependencies / triggers that the presence of the
 -             * virtio-serial port named "org.qemu.guest_agent.0" automatically
 -             * starts the agent during (second and later) boots. However, even
 -             * on such distros, the chkconfig command should do no harm.
 +            (* On all the distro families covered by "qga_pkg_of_family" and
 +             * "qga_svc_start_cmd", the QEMU guest agent service is always
 +             * enabled by package installation for *subsequent* boots. Package
 +             * installation may or may not enable the service for the current
 +             * (i.e., first) boot, however, so try that here manually.
              *)
 -            fbs "start qga"
 -              (sprintf "#!/bin/sh\n\
 -                        service %s start\n\
 -                        chkconfig %s on\n" qga_pkg qga_pkg)
 +            match qga_svc_start_cmd family inspect.i_distro inspect.i_major_version
 +            with
 +            | None -> ()
 +            | Some start_cmd ->
 +              fbs "start qga"
 +                (sprintf "#!/bin/sh\n\
 +                          %s\n" start_cmd)
           with
           | Guest_packages.Unknown_package_manager msg
           | Guest_packages.Unimplemented_package_manager msg ->
--- a/0035-convert_linux-include-the-BOCHS-DRM-driver-in-the-in.patch
+++ b/0035-convert_linux-include-the-BOCHS-DRM-driver-in-the-in.patch
@ -1,49 +0,0 @@
 From ea261c2e84aacaca4b3612c400117cb0e4929b36 Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Fri, 30 Sep 2022 14:04:44 +0200
 Subject: [PATCH] convert_linux: include the BOCHS DRM driver in the initial
 ram disk
 UEFI RHEL-7 guests cannot be successfully converted from VMWare without
 including the BOCHS DRM driver -- Plymouth ("rhgb") crashes during early
 boot in the converted domain.
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2131123
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 Message-Id: <20220930120444.11883-1-lersek@redhat.com>
 Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
 (cherry picked from commit aa69d64cd4526f1f7e3ddffd25a81f404936f853)
 ---
 convert/convert_linux.ml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
 diff --git a/convert/convert_linux.ml b/convert/convert_linux.ml
 index b8e9ad15..5bfdac5a 100644
 --- a/convert/convert_linux.ml
 +++ b/convert/convert_linux.ml
@@ -731,8 +731,13 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ =
     match kernel.ki_initrd with
     | None -> ()
     | Some initrd ->
 -      (* Enable the basic virtio modules in the kernel. *)
 -      (* Also forcibly include the "xts" module; see RHBZ#1658126. *)
 +      (* Enable the basic virtio modules in the kernel.
 +       *
 +       * Also forcibly include the "xts" module; see RHBZ#1658126.
 +       *
 +       * Include the BOCHS DRM paravirt video driver; see RHBZ#2131123.  This
 +       * driver is known under two names -- "bochs-drm" and "bochs".
 +       *)
       let modules =
         let modules =
           (* The order of modules here is deliberately the same as the
@@ -743,7 +748,8 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ =
            *)
           List.filter (fun m -> List.mem m kernel.ki_modules)
                       [ "virtio"; "virtio_ring"; "virtio_blk";
 -                        "virtio_scsi"; "virtio_net"; "virtio_pci"; "xts" ] in
 +                        "virtio_scsi"; "virtio_net"; "virtio_pci"; "xts";
 +                        "bochs-drm"; "bochs" ] in
         if modules <> [] then modules
         else
           (* Fallback copied from old virt-v2v.  XXX Why not "ide"? *)
--- a/0036-docs-Document-that-Windows-system-on-Dynamic-Disk-is.patch
+++ b/0036-docs-Document-that-Windows-system-on-Dynamic-Disk-is.patch
@ -1,32 +0,0 @@
 From 816d2b88919a8957df71944b21c52fef16265844 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Tue, 15 Nov 2022 10:17:02 +0000
 Subject: [PATCH] docs: Document that Windows system on Dynamic Disk is not
 supported
 Related: https://bugzilla.redhat.com/show_bug.cgi?id=2140548
 (cherry picked from commit 6aa09ca0a9e912e1ae2e984b384ee54eb5d5b3aa)
 ---
 docs/virt-v2v.pod | 9 +++++++++
 1 file changed, 9 insertions(+)
 diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
 index 912f1bc3..23919685 100644
 --- a/docs/virt-v2v.pod
 +++ b/docs/virt-v2v.pod
@@ -926,6 +926,15 @@ For more information, see L<https://bugzilla.redhat.com/1592061>
 =head2 Windows
 +=head3 System disk on a Dynamic Disk is not supported
 +
 +If the Windows system disk (the drive containing C<\windows>) is
 +located on a Dynamic Disk then it cannot be converted.  Data disks —
 +that is, disks which are part of the guest but do not contain parts of
 +the Windows operating system — may be Dynamic Disks.
 +
 +See L<https://bugzilla.redhat.com/2140548>.
 +
 =head3 Windows E<ge> 8 Fast Startup is incompatible with virt-v2v
 Guests which use the Windows E<ge> 8 "Fast Startup" feature (or guests
--- a/0037-rhv-Use-osinfo-to-distinguish-Windows-10-variants.patch
+++ b/0037-rhv-Use-osinfo-to-distinguish-Windows-10-variants.patch
@ -1,59 +0,0 @@
 From f708a4ba1bcd5cb3be8c2f91a347cd3eed81c8b7 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 1 Dec 2022 10:53:12 +0000
 Subject: [PATCH] rhv: Use osinfo to distinguish Windows >= 10 variants
 Windows versions >= 10 no longer use the NT major.minor numbering
 scheme (it is fixed at 10.0).  Libguestfs >= 1.49.8 can distinguish
 these versions and it sets <osinfo> correctly, so use that instead.
 After this change the OVF will contain:
  <Info>Windows 10 Pro</Info>
  <Description>windows_11</Description>
 which is strange, but apparently what Microsoft intended.  As far as
 RHV is concerned it only needs <Description> to choose the correct
 devices etc.
 Reported-by: Tingting Zheng
 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2149863
 Reviewed-by: Laszlo Ersek <lersek@redhat.com>
 (cherry picked from commit 38b35f3b7e5c6e5aea5dece5f77561b8332d3360)
 ---
 lib/create_ovf.ml | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)
 diff --git a/lib/create_ovf.ml b/lib/create_ovf.ml
 index 18e86d6c..8aff3d8f 100644
 --- a/lib/create_ovf.ml
 +++ b/lib/create_ovf.ml
@@ -231,13 +231,22 @@ and get_ostype = function
       i_arch = "i386" } ->
     "windows_10"
 +  (* For Windows NT 10.0 always use the <osinfo> field since the
 +   * other fields will not accurately reflect the version.
 +   *)
   | { i_type = "windows"; i_major_version = 10; i_minor_version = 0;
 -      i_arch = "x86_64"; i_product_variant = "Client" } ->
 -    "windows_10x64"
 -
 -  | { i_type = "windows"; i_major_version = 10; i_minor_version = 0;
 -      i_arch = "x86_64" } ->
 -    "windows_2016x64"
 +      i_arch = "x86_64"; i_osinfo = osinfo; i_product_name = product } ->
 +     (match osinfo with
 +      | "win10" -> "windows_10x64"
 +      | "win11" -> "windows_11"
 +      | "win2k16" -> "windows_2016x64"
 +      | "win2k19" -> "windows_2019x64"
 +      | "win2k22" -> "windows_2022"
 +      | _ ->
 +         warning (f_"unknown Windows 10 variant: %s (%s)")
 +           osinfo product;
 +         "windows_2022"
 +     )
   | { i_type = typ; i_distro = distro;
       i_major_version = major; i_minor_version = minor; i_arch = arch;
--- a/0038-convert-windows-Introduce-osinfo-matching.patch
+++ b/0038-convert-windows-Introduce-osinfo-matching.patch
@ -1,97 +0,0 @@
 From f83a1b246c3ffeaed5fd7d4ef0525a608820b6c1 Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Fri, 2 Dec 2022 10:04:25 +0000
 Subject: [PATCH] convert: windows: Introduce osinfo matching
 This neutral refactoring allows us to match drivers with virtio-win
 guests using the inspect osinfo field.  This change adds an
 "any_osinfo" predicate which matches any osinfo field.  The following
 commit will add more cases for Windows >= 10 and use the osinfo field
 to distinguish them.
 (cherry picked from commit 7866fecbe5223eb8dec7c5cc8882d0130ccfba44)
 ---
 convert/windows_virtio.ml | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)
 diff --git a/convert/windows_virtio.ml b/convert/windows_virtio.ml
 index 183166b7..0f71fa94 100644
 --- a/convert/windows_virtio.ml
 +++ b/convert/windows_virtio.ml
@@ -50,9 +50,9 @@ let rec install_drivers ((g, _) as reg) inspect =
   g#mkdir_p driverdir;
   if not (copy_drivers g inspect driverdir) then (
 -      warning (f_"there are no virtio drivers available for this version of Windows (%d.%d %s %s).  virt-v2v looks for drivers in %s\n\nThe guest will be configured to use slower emulated devices.")
 +      warning (f_"there are no virtio drivers available for this version of Windows (%d.%d %s %s %s).  virt-v2v looks for drivers in %s\n\nThe guest will be configured to use slower emulated devices.")
               inspect.i_major_version inspect.i_minor_version inspect.i_arch
 -              inspect.i_product_variant virtio_win;
 +              inspect.i_product_variant inspect.i_osinfo virtio_win;
       (IDE, RTL8139, false, false, false, false)
   )
   else (
@@ -280,7 +280,8 @@ and copy_from_virtio_win g inspect srcdir destdir filter missing =
  *)
 and virtio_iso_path_matches_guest_os path inspect =
   let { i_major_version = os_major; i_minor_version = os_minor;
 -        i_arch = arch; i_product_variant = os_variant } = inspect in
 +        i_arch = arch; i_product_variant = os_variant;
 +        i_osinfo = osinfo } = inspect in
   try
     (* Lowercased path, since the ISO may contain upper or lowercase path
      * elements.
@@ -301,37 +302,39 @@ and virtio_iso_path_matches_guest_os path inspect =
     let is_client os_variant = os_variant = "Client"
     and not_client os_variant = os_variant <> "Client"
 -    and any_variant os_variant = true in
 -    let p_os_major, p_os_minor, match_os_variant =
 +    and any_variant os_variant = true
 +    and any_osinfo osinfo = true in
 +    let p_os_major, p_os_minor, match_os_variant, match_osinfo =
       if pathelem "xp" || pathelem "winxp" then
 -        (5, 1, any_variant)
 +        (5, 1, any_variant, any_osinfo)
       else if pathelem "2k3" || pathelem "win2003" then
 -        (5, 2, any_variant)
 +        (5, 2, any_variant, any_osinfo)
       else if pathelem "vista" then
 -        (6, 0, is_client)
 +        (6, 0, is_client, any_osinfo)
       else if pathelem "2k8" || pathelem "win2008" then
 -        (6, 0, not_client)
 +        (6, 0, not_client, any_osinfo)
       else if pathelem "w7" || pathelem "win7" then
 -        (6, 1, is_client)
 +        (6, 1, is_client, any_osinfo)
       else if pathelem "2k8r2" || pathelem "win2008r2" then
 -        (6, 1, not_client)
 +        (6, 1, not_client, any_osinfo)
       else if pathelem "w8" || pathelem "win8" then
 -        (6, 2, is_client)
 +        (6, 2, is_client, any_osinfo)
       else if pathelem "2k12" || pathelem "win2012" then
 -        (6, 2, not_client)
 +        (6, 2, not_client, any_osinfo)
       else if pathelem "w8.1" || pathelem "win8.1" then
 -        (6, 3, is_client)
 +        (6, 3, is_client, any_osinfo)
       else if pathelem "2k12r2" || pathelem "win2012r2" then
 -        (6, 3, not_client)
 +        (6, 3, not_client, any_osinfo)
       else if pathelem "w10" || pathelem "win10" then
 -        (10, 0, is_client)
 +        (10, 0, is_client, any_osinfo)
       else if pathelem "2k16" || pathelem "win2016" then
 -        (10, 0, not_client)
 +        (10, 0, not_client, any_osinfo)
       else
         raise Not_found in
     arch = p_arch && os_major = p_os_major && os_minor = p_os_minor &&
 -      match_os_variant os_variant
 +    match_os_variant os_variant &&
 +    match_osinfo osinfo
   with Not_found -> false
--- a/0039-convert-windows-Copy-drivers-for-Windows-11-Windows-.patch
+++ b/0039-convert-windows-Copy-drivers-for-Windows-11-Windows-.patch
@ -1,77 +0,0 @@
 From 94217004b0ea3292686397e29434a4cff1134e5e Mon Sep 17 00:00:00 2001
 From: "Richard W.M. Jones" <rjones@redhat.com>
 Date: Thu, 1 Dec 2022 12:29:43 +0000
 Subject: [PATCH] convert: windows: Copy drivers for Windows 11, Windows 2019 &
 Windows 2022
 If the virtio-win ISO contains drivers for Windows 11, Windows 2019 or
 Windows 2022, and the guest matches these, then copy in the right
 drivers.  For this to work you will need libguestfs >= 1.49.8 which
 allows osinfo to be used to detect Windows versions >= 10.
 Side note: virtio-win uses a mix of different path element styles.
 In the exploded tree of drivers installed by the RPM:
  /usr/share/virtio-win/drivers/amd64$ ls -l
  total 0
  drwxr-xr-x. 2 root root 174 Nov 30 13:28 Win10
  drwxr-xr-x. 2 root root 174 Nov 30 13:28 Win11
  drwxr-xr-x. 2 root root 236 Nov 30 13:28 Win2008R2
  drwxr-xr-x. 2 root root 174 Nov 30 13:28 Win2012
  drwxr-xr-x. 2 root root 174 Nov 30 13:28 Win2012R2
  drwxr-xr-x. 2 root root 174 Nov 30 13:28 Win2016
  drwxr-xr-x. 2 root root 174 Nov 30 13:28 Win2019
  drwxr-xr-x. 2 root root 174 Nov 30 13:28 Win2022
  drwxr-xr-x. 2 root root 236 Nov 30 13:28 Win7
  drwxr-xr-x. 2 root root 174 Nov 30 13:28 Win8
  drwxr-xr-x. 2 root root 174 Nov 30 13:28 Win8.1
 Inside the ISO:
  ><fs> ll /viostor/
  total 28
  dr-xr-xr-x 1 root root 2048 Jun 14  2020 2k12
  dr-xr-xr-x 1 root root 2048 Jun 14  2020 2k12R2
  dr-xr-xr-x 1 root root 2048 Jun 14  2020 2k16
  dr-xr-xr-x 1 root root 2048 Jun 14  2020 2k19
  dr-xr-xr-x 1 root root 2048 Dec 11  2021 2k22
  dr-xr-xr-x 1 root root 2048 Jun 14  2020 2k8R2
  dr-xr-xr-x 1 root root 2048 Jun 14  2020 w10
  dr-xr-xr-x 1 root root 2048 Dec 11  2021 w11
  dr-xr-xr-x 1 root root 2048 Jun 14  2020 w7
  dr-xr-xr-x 1 root root 2048 Jun 14  2020 w8
  dr-xr-xr-x 1 root root 2048 Jun 14  2020 w8.1
 So I have matched both path elements.
 Reported-by: Tingting Zheng
 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2149811
 Reviewed-by: Laszlo Ersek <lersek@redhat.com>
 (cherry picked from commit 7b49177e2b0c769b947ed19fa029c80282a2b93b)
 ---
 convert/windows_virtio.ml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
 diff --git a/convert/windows_virtio.ml b/convert/windows_virtio.ml
 index 0f71fa94..76c94790 100644
 --- a/convert/windows_virtio.ml
 +++ b/convert/windows_virtio.ml
@@ -326,9 +326,15 @@ and virtio_iso_path_matches_guest_os path inspect =
       else if pathelem "2k12r2" || pathelem "win2012r2" then
         (6, 3, not_client, any_osinfo)
       else if pathelem "w10" || pathelem "win10" then
 -        (10, 0, is_client, any_osinfo)
 +        (10, 0, is_client, ((=) "win10"))
 +      else if pathelem "w11" || pathelem "win11" then
 +        (10, 0, is_client, ((=) "win11"))
       else if pathelem "2k16" || pathelem "win2016" then
 -        (10, 0, not_client, any_osinfo)
 +        (10, 0, not_client, ((=) "win2k16"))
 +      else if pathelem "2k19" || pathelem "win2019" then
 +        (10, 0, not_client, ((=) "win2k19"))
 +      else if pathelem "2k22" || pathelem "win2022" then
 +        (10, 0, not_client, ((=) "win2k22"))
       else
         raise Not_found in
--- a/0040-convert_linux.get_uefi_arch_suffix-move-to-Utils.patch
+++ b/0040-convert_linux.get_uefi_arch_suffix-move-to-Utils.patch
@ -1,61 +0,0 @@
 From 3ffada4717e1f90843c67b2292ac7b9c6880c79c Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Fri, 2 Dec 2022 13:44:08 +0100
 Subject: [PATCH] convert_linux.get_uefi_arch_suffix: move to Utils
 So that Windows conversion can use the same function.
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2149629
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 Message-Id: <20221202124409.11741-2-lersek@redhat.com>
 Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
 (cherry picked from commit b13813b527856749bea4087cb9c6deba2d67eff6)
 ---
 convert/convert_linux.ml | 6 ------
 lib/utils.ml             | 5 +++++
 lib/utils.mli            | 5 +++++
 3 files changed, 10 insertions(+), 6 deletions(-)
 diff --git a/convert/convert_linux.ml b/convert/convert_linux.ml
 index 5bfdac5a..cde3b037 100644
 --- a/convert/convert_linux.ml
 +++ b/convert/convert_linux.ml
@@ -1327,12 +1327,6 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ =
         info (f_"Can't fix UEFI bootloader. VM may not boot.")
       in
 -      let get_uefi_arch_suffix = function
 -        | "x86_64" -> Some "X64"
 -        | "i386" -> Some "X32"
 -        | _ -> None
 -      in
 -
       match get_uefi_arch_suffix inspect.i_arch with
       | None -> cant_fix_uefi ()
       | Some suffix -> (
 diff --git a/lib/utils.ml b/lib/utils.ml
 index 84b9a93f..e355eb3e 100644
 --- a/lib/utils.ml
 +++ b/lib/utils.ml
@@ -259,3 +259,8 @@ let get_disk_allocated ~dir ~disknr =
            Some !allocated
          ) else None
        )
 +
 +let get_uefi_arch_suffix = function
 +  | "x86_64" -> Some "X64"
 +  | "i386" -> Some "X32"
 +  | _ -> None
 diff --git a/lib/utils.mli b/lib/utils.mli
 index d431e21f..5687bf75 100644
 --- a/lib/utils.mli
 +++ b/lib/utils.mli
@@ -98,3 +98,8 @@ val get_disk_allocated : dir:string -> disknr:int -> int64 option
     image, according to the "base:allocation" metadata context. If the context
     is not supported by the NBD server behind the socket, the function returns
     None. *)
 +
 +val get_uefi_arch_suffix : string -> string option
 +(** [get_uefi_arch_suffix arch] maps [arch] from [inspect.i_arch] representation
 +    to UEFI spec representation.  If a mapping cannot be found, [None] is
 +    returned. *)
--- a/0041-convert_windows-fix-up-the-UEFI-fallback-boot-loader.patch
+++ b/0041-convert_windows-fix-up-the-UEFI-fallback-boot-loader.patch
@ -1,87 +0,0 @@
 From 796573e6f530d4736bcd9d81a6dc113f928a4d27 Mon Sep 17 00:00:00 2001
 From: Laszlo Ersek <lersek@redhat.com>
 Date: Fri, 2 Dec 2022 13:44:09 +0100
 Subject: [PATCH] convert_windows: fix up the UEFI fallback boot loader if
 broken
 The "fallback" (or "default") boot behavior is described at great length
 here:
 https://blog.uncooperative.org/uefi/linux/shim/efi%20system%20partition/2014/02/06/the-efi-system-partition.html
 The gist of it applies to all UEFI OSes, including Windows. For the
 fallback boot behavior to work, the \EFI\BOOT\BOOTX64.efi boot loader on
 the EFI system partition must match the installed operating system. We've
 encountered a physical machine, during a virt-p2v conversion, where (a)
 \EFI\BOOT\BOOTX64.efi belongs to a previously installed, but now wiped,
 RHEL (hence shim+grub) deployment, and (b) the currently installed
 operating system is Windows.
 Virt-v2v never transfers the UEFI variables (including the UEFI boot
 options) of the source, therefore the converted VM always relies on the
 default boot behavior when it is first started up. In the above scenario,
 where \EFI\BOOT\BOOTX64.efi is actually "shim", the mismatch is triggered
 at first boot after conversion, and a broken grub shell is reached instead
 of the Windows boot loader.
 Detect this situation by investigating \EFI\BOOT\BOOTX64.efi on the EFI
 system partition of a Windows disk image. If the file is missing, or is
 not -- as expected -- a duplicate of \EFI\Microsoft\Boot\bootmgfw.efi,
 then copy the latter to the former.
 Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2149629
 Signed-off-by: Laszlo Ersek <lersek@redhat.com>
 Message-Id: <20221202124409.11741-3-lersek@redhat.com>
 Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
 (cherry picked from commit 9d4b58dcecc40da5c97a0e716f44757c422160f0)
 ---
 convert/convert_windows.ml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml
 index 34a5044d..57a7ff03 100644
 --- a/convert/convert_windows.ml
 +++ b/convert/convert_windows.ml
@@ -836,17 +836,42 @@ let convert (g : G.guestfs) _ inspect _ static_ips =
         );
       with
         Not_found -> ()
 +
 +    and fix_win_uefi_fallback esp_path uefi_arch =
 +      (* [esp_path] is on NTFS, and therefore it is considered case-sensitive;
 +       * refer to
 +       * <https://libguestfs.org/guestfs.3.html#guestfs_case_sensitive_path>.
 +       * However, the EFI system partition mounted under [esp_path] is FAT32 per
 +       * UEFI spec, and the Linux vfat driver in the libguestfs appliance treats
 +       * pathnames case-insensitively. Therefore, we're free to use any case in
 +       * the ESP-relative pathnames below.
 +       *)
 +      let bootmgfw = sprintf "%s/efi/microsoft/boot/bootmgfw.efi" esp_path in
 +      if g#is_file bootmgfw then
 +        let bootdir = sprintf "%s/efi/boot" esp_path in
 +        let fallback = sprintf "%s/boot%s.efi" bootdir uefi_arch in
 +        if not (g#is_file fallback) || not (g#equal fallback bootmgfw) then (
 +          info (f_"Fixing UEFI bootloader.");
 +          g#rm_rf bootdir;
 +          g#mkdir_p bootdir;
 +          g#cp_a bootmgfw fallback
 +        )
     in
     match inspect.i_firmware with
     | I_BIOS -> ()
     | I_UEFI esp_list ->
       let esp_temp_path = g#mkdtemp "/Windows/Temp/ESP_XXXXXX" in
 +      let uefi_arch = get_uefi_arch_suffix inspect.i_arch in
       List.iter (
         fun dev_path ->
         g#mount dev_path esp_temp_path;
         fix_win_uefi_bcd esp_temp_path;
 +        (match uefi_arch with
 +         | Some uefi_arch -> fix_win_uefi_fallback esp_temp_path uefi_arch
 +         | None -> ()
 +        );
         g#umount esp_temp_path;
       ) esp_list;
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (virt-v2v-2.0.7.tar.gz) = 0e2a7b55fdea7fac854747317d613a5f3e9bea17102424a8682783374f1dd273146c88a9e214f968f67a687545145c4a44d7e1bae16735e454822e636aab008c
+SHA512 (virt-v2v-2.2.0.tar.gz) = 8251d8b232cc93d2ebd8a9d21d6807795559928c557a34dbc84a72473f548df85268521b7a803ef26b3abe2ef21170ab8d8d923a99d5228b761586d43bebb81f
-SHA512 (virt-v2v-2.0.7.tar.gz.sig) = 4af524ebc70ecc670ff9c63bf485b969ed13c63e34d25e8e002423a59e4d84cd4f51683ec32c674bcb97ad24e214483eb9e12aa295adaeec507ece671ad93539
+SHA512 (virt-v2v-2.2.0.tar.gz.sig) = 40ceb183c48d673dcd2a42b394ade98753f5cb2abc6978c7ba33c461dee77c4b1c461cce55fa188d594297c47e9d8cff9d01e8eabd63fdc2eadeea65327156c2
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@ -11,12 +11,12 @@
 %endif
 # The source directory.
-%global source_directory 2.0-stable
+%global source_directory 2.2-stable
 Name:          virt-v2v
 Epoch:         1
-Version:       2.0.7
+Version:       2.2.0
-Release:       7%{?dist}
+Release:       1%{?dist}
 Summary:       Convert a virtual machine to run on KVM
 License:       GPLv2+
@ -45,38 +45,8 @@ Patch0006:     0006-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
 Patch0007:     0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
 Patch0008:     0008-RHEL-Disable-o-glance.patch
 Patch0009:     0009-RHEL-Remove-the-in-place-option.patch
-Patch0010:     0010-output-Remove-o-json-mode.patch
+Patch0010:     0010-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch
-Patch0011:     0011-output-Remove-unused-dummy.c.patch
+Patch0011:     0011-RHEL-9-tests-Remove-btrfs-test.patch
 Patch0012:     0012-adopt-inversion-of-SELinux-relabeling-in-virt-custom.patch
 Patch0013:     0013-output-create_libvirt_xml-wire-up-the-QEMU-guest-age.patch
 Patch0014:     0014-convert_linux-extract-qemu-guest-agent-package-name.patch
 Patch0015:     0015-convert_linux-install-the-QEMU-guest-agent-with-a-fi.patch
 Patch0016:     0016-RHV-outputs-limit-copied-disk-count-to-23.patch
 Patch0017:     0017-convert-document-networking-dependency-of-key-ID-cle.patch
 Patch0018:     0018-qemu-nbd-Implement-output-compression-for-qcow2-file.patch
 Patch0019:     0019-o-disk-o-libvirt-o-qemu-Implement-of-qcow2-oo-compre.patch
 Patch0020:     0020-tests-Add-a-simple-test-of-o-local-of-qcow2-oo-compr.patch
 Patch0021:     0021-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch
 Patch0022:     0022-RHEL-9-tests-Remove-btrfs-test.patch
 Patch0023:     0023-convert-convert_linux-complete-the-remapping-of-NVMe.patch
 Patch0024:     0024-input-xen-sync-ip-limitations-language-from-input-vm.patch
 Patch0025:     0025-input-xen-replace-enable-LEGACY-crypto-advice-with-t.patch
 Patch0026:     0026-common-Adapt-to-renamed-function-On_exit.rmdir-On_ex.patch
 Patch0027:     0027-o-rhv-Unmount-the-temporary-NFS-mountpoint-as-late-a.patch
 Patch0028:     0028-output-Permit-output-modes-to-wait-on-the-local-NBD-.patch
 Patch0029:     0029-o-rhv-Wait-for-the-NBD-server-to-exit-to-avoid-a-rac.patch
 Patch0030:     0030-output-create_libvirt_xml-relax-VCPU-feature-checkin.patch
 Patch0031:     0031-input-xen-cover-RHEL9-OpenSSL-crypto-settings.patch
 Patch0032:     0032-convert_linux-remove-LVM2-devices-file.patch
 Patch0033:     0033-convert-linux-Add-support-for-Zstandard-compressed-k.patch
 Patch0034:     0034-convert_linux-start-the-QEMU-guest-agent-in-a-distro.patch
 Patch0035:     0035-convert_linux-include-the-BOCHS-DRM-driver-in-the-in.patch
 Patch0036:     0036-docs-Document-that-Windows-system-on-Dynamic-Disk-is.patch
 Patch0037:     0037-rhv-Use-osinfo-to-distinguish-Windows-10-variants.patch
 Patch0038:     0038-convert-windows-Introduce-osinfo-matching.patch
 Patch0039:     0039-convert-windows-Copy-drivers-for-Windows-11-Windows-.patch
 Patch0040:     0040-convert_linux.get_uefi_arch_suffix-move-to-Utils.patch
 Patch0041:     0041-convert_windows-fix-up-the-UEFI-fallback-boot-loader.patch
 %if !0%{?rhel}
 # libguestfs hasn't been built on i686 for a while since there is no
@ -99,7 +69,6 @@ ExclusiveArch: x86_64
 BuildRequires: autoconf, automake, libtool
 %endif
 BuildRequires: git
 BuildRequires: make
 BuildRequires: /usr/bin/pod2man
 BuildRequires: gcc
@ -124,6 +93,7 @@ BuildRequires: xorriso
 BuildRequires: ocaml-findlib-devel
 BuildRequires: ocaml-libguestfs-devel
 BuildRequires: ocaml-libvirt-devel
 BuildRequires: ocaml-libnbd-devel
 BuildRequires: ocaml-fileutils-devel
 BuildRequires: ocaml-gettext-devel
@ -131,7 +101,17 @@ BuildRequires: ocaml-gettext-devel
 BuildRequires: ocaml-ounit-devel
 %endif
 # These are for running our limited test.
 BuildRequires: %{_bindir}/qemu-nbd
 BuildRequires: %{_bindir}/nbdcopy
 BuildRequires: %{_bindir}/nbdinfo
 BuildRequires: nbdkit-file-plugin
 BuildRequires: nbdkit-null-plugin
 BuildRequires: nbdkit-python-plugin
 BuildRequires: nbdkit-cow-filter >= 1.28.3-1.el9
 %ifarch x86_64
 BuildRequires: glibc-static
 %endif
 %if 0%{verify_tarball_signature}
 BuildRequires: gnupg2
@ -245,7 +225,7 @@ for %{name}.
 %if 0%{verify_tarball_signature}
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %endif
-%autosetup -p1 -S git
+%autosetup -p1
 %if 0%{patches_touch_autotools}
 autoreconf -i
@ -289,31 +269,28 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-in-place.1*
 %check
-# All tests fail at the moment because of bugs in libvirt blockdev.
+%ifarch x86_64
-# # Tests fail on both armv7 and ppc64le in Fedora 31 because the kernel
+# Only run the tests with non-debug (ie. non-Rawhide) kernels.
-# # cannot boot on qemu.
+# XXX This tests for any debug kernel installed.
-# %ifnarch %{arm} ppc64le
+if grep CONFIG_DEBUG_MUTEXES=y /lib/modules/*/config ; then
    echo "Skipping tests because debug kernel is installed"
    exit 0
 fi
-# # On x86_64 this single test fails with: "virt-v2v: warning: the
+# Make sure we can see the debug messages (RHBZ#1230160).
-# # target hypervisor does not support a x86_64 KVM guest".  Missing
+export LIBGUESTFS_DEBUG=1
-# # BuildRequires?
+export LIBGUESTFS_TRACE=1
 # %ifarch x86_64
 # truncate -s 0 tests/test-v2v-o-libvirt.sh
 # %endif
-# # This test fails in mock.
+# The built in tests take a very long time to run under TCG (in Koji),
-# truncate -s 0 tests/test-v2v-oa-option.sh
+# so just perform a very simple conversion to check things are
-
+# working.
-# # Make sure we can see the debug messages (RHBZ#1230160).
+for f in windows.img fedora.img; do
-# export LIBGUESTFS_DEBUG=1
+    make -C test-data/phony-guests $f
-# export LIBGUESTFS_TRACE=1
+    if -s test-data/phony-guests/$f; then
-
+        ./run virt-v2v -v -x -i disk test-data/phony-guests/$f -o null
-# make %{?_smp_mflags} check || {
+    fi
-#     cat tests/test-suite.log
+done
-#     exit 1
+%endif
 #   }
 # %endif
 %files -f %{name}.lang
@ -323,6 +300,7 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-in-place.1*
 %if !0%{?rhel}
 %{_bindir}/virt-v2v-in-place
 %endif
 %{_bindir}/virt-v2v-inspector
 %{_mandir}/man1/virt-v2v.1*
 %{_mandir}/man1/virt-v2v-hacking.1*
 %{_mandir}/man1/virt-v2v-input-vmware.1*
@ -330,11 +308,13 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-in-place.1*
 %if !0%{?rhel}
 %{_mandir}/man1/virt-v2v-in-place.1*
 %endif
 %{_mandir}/man1/virt-v2v-inspector.1*
 %{_mandir}/man1/virt-v2v-output-local.1*
 %{_mandir}/man1/virt-v2v-output-openstack.1*
 %{_mandir}/man1/virt-v2v-output-rhv.1*
 %{_mandir}/man1/virt-v2v-release-notes-1.42.1*
 %{_mandir}/man1/virt-v2v-release-notes-2.0.1*
 %{_mandir}/man1/virt-v2v-release-notes-2.2.1*
 %{_mandir}/man1/virt-v2v-support.1*
 %{_datadir}/virt-tools
@ -355,15 +335,23 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-in-place.1*
 %changelog
-* Fri Dec 02 2022 Richard W.M. Jones <rjones@redhat.com> - 1:2.0.7-7
+* Tue Jan 10 2023 Richard W.M. Jones <rjones@redhat.com> - 1:2.2.0-1
 - Rebase to virt-v2v 2.2.0
  resolves: rhbz#2135762
 - Copy drivers for Windows 11, Windows 2019 & Windows 2022
  resolves: rhbz#2149811
 - Fix Description field for Windows >= 10 in -o rhv/vdsm modes
  resolves: rhbz#2149863
 - Fix UEFI fallback boot loader if broken
  resolves: rhbz#2149629
- Document Windows system on Dynamic Disk is not supported (2140548)
+- Document Windows system on Dynamic Disk is not supported (2140548 comment 5)
- Include the BOCHS DRM driver in the initial ram disk (2131123)
+- Include the BOCHS DRM driver in the initial ram disk
  resolves: rhbz#2131123
 - windows_virtio: favor "fwcfg" over "qemufwcfg"
  resolves: rhbz#2151752
 - -o rhv-upload: set ovirt:id correctly
  resolves: rhbz#2152465
 - Enable the %%check tests
 * Thu Aug 18 2022 Laszlo Ersek <lersek@redhat.com> - 1:2.0.7-6
 - Install qemu-ga package during conversion
`@ -1,2 +1,2 @@`
	`SHA512 (virt-v2v-2.0.7.tar.gz) = 0e2a7b55fdea7fac854747317d613a5f3e9bea17102424a8682783374f1dd273146c88a9e214f968f67a687545145c4a44d7e1bae16735e454822e636aab008c`	`SHA512 (virt-v2v-2.2.0.tar.gz) = 8251d8b232cc93d2ebd8a9d21d6807795559928c557a34dbc84a72473f548df85268521b7a803ef26b3abe2ef21170ab8d8d923a99d5228b761586d43bebb81f`
	`SHA512 (virt-v2v-2.0.7.tar.gz.sig) = 4af524ebc70ecc670ff9c63bf485b969ed13c63e34d25e8e002423a59e4d84cd4f51683ec32c674bcb97ad24e214483eb9e12aa295adaeec507ece671ad93539`	`SHA512 (virt-v2v-2.2.0.tar.gz.sig) = 40ceb183c48d673dcd2a42b394ade98753f5cb2abc6978c7ba33c461dee77c4b1c461cce55fa188d594297c47e9d8cff9d01e8eabd63fdc2eadeea65327156c2`