rpms/virt-v2v
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to stable branch version 2.0.3

Browse Source 
Remove -o json mode
resolves: rhbz#2074026
Allow conversion of guests with NVMe drives from VMX files
resolves: rhbz#2070530
Cleanly reject guests with snapshots when using -it ssh
resolves: rhbz#1774386
Document that vmx+ssh "-ip" auth doesn't cover ssh / scp shell commands
resolves: rhbz#1854275
Fix conversion if swap partition isn't encrypted with root directory
resolves: rhbz#1658128
Document permissions when importing OVA using RHV UI
resolves: rhbz#2039597
This commit is contained in:
Richard W.M. Jones 2022-04-12 12:17:50 +01:00
parent 48c7f08e4f
commit 0a6d24c379
15 changed files with 1532 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0001-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch
View File

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

18
0002-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch
View File

@ -1,4 +1,4 @@
From f22a51d2f2d7baa34df574dc5c086da75bd899d5 Mon Sep 17 00:00:00 2001
From 2fad059b0a6e161c9e0a5a97c7e00bae10c6d3d2 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
@ -17,7 +17,7 @@ qemu script.
4 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/docs/virt-v2v-output-local.pod b/docs/virt-v2v-output-local.pod
index a5f155cb..3a2e6238 100644
index d2a1c270..0be37f5e 100644
--- a/docs/virt-v2v-output-local.pod
+++ b/docs/virt-v2v-output-local.pod
@@ -9,7 +9,7 @@ or libvirt
@ -27,9 +27,9 @@ index a5f155cb..3a2e6238 100644
- virt-v2v [-i* options] -o qemu -os DIRECTORY [--qemu-boot]
+ virt-v2v [-i* options] -o qemu -os DIRECTORY
virt-v2v [-i* options] -o json -os DIRECTORY
[-oo json-disks-pattern=PATTERN]
@@ -50,12 +50,10 @@ where C<NAME> is the guest name.
virt-v2v [-i* options] -o null
@@ -47,12 +47,10 @@ where C<NAME> is the guest name.
=item B<-o qemu -os> C<DIRECTORY>
@ -41,10 +41,10 @@ index a5f155cb..3a2e6238 100644
-run, I<unless> you also add the I<--qemu-boot> option.
+run.
=item B<-o json -os> C<DIRECTORY>
=item B<-o null>
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
index 69bdbbd4..ea7bc942 100644
index 4e912b6c..7d0bafff 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
@ -59,7 +59,7 @@ index 69bdbbd4..ea7bc942 100644
=head1 OPTIONS
=over 4
@@ -494,9 +489,6 @@ This is similar to I<-o local>, except that a shell script is written
@@ -487,9 +482,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 69bdbbd4..ea7bc942 100644
=item B<-o> B<rhev>
This is the same as I<-o rhv>.
@@ -750,10 +742,6 @@ Print information about the source guest and stop. This option is
@@ -743,10 +735,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>.

2
0003-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch
View File

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

2
0004-RHEL-Fixes-for-libguestfs-winsupport.patch
View File

@ -1,4 +1,4 @@
From 79acbb6c0c06375cdee6dd8fc0eb711298065cb2 Mon Sep 17 00:00:00 2001
From 29d999ed093cd3b957f0f375a7c8890c11aa3183 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.

2
0005-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch
View File

@ -1,4 +1,4 @@
From ad3b85ab5a33a1a05fa1ef4aaab1539c27f81e57 Mon Sep 17 00:00:00 2001
From 3868df96a8b18fddb458c5b422fceb5f7c094fd1 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)

4
0006-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch
View File

@ -1,4 +1,4 @@
From ffde3eac49231c33b70df01e3a79b5169222664b Mon Sep 17 00:00:00 2001
From c9998b7a257a709bb1c19509037e268cef1189d7 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 c4948e5e..97727b8f 100644
index 8080ebea..ad5772de 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

2
0007-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch
View File

@ -1,4 +1,4 @@
From b5dd57d100044dfa39784ea52a6a6c2b2bd23623 Mon Sep 17 00:00:00 2001
From 83e27ad543d3c5fb3aed514d98a52a8ef17d07a7 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

10
0008-RHEL-Disable-o-glance.patch
View File

@ -1,4 +1,4 @@
From 6b49387ee275dfa7ab9946195a61700a609bdcea Mon Sep 17 00:00:00 2001
From 4bb8bdee09063d20b64b67972a777e5050c06018 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 30 Jun 2021 11:15:52 +0100
Subject: [PATCH] RHEL: Disable -o glance
@ -100,7 +100,7 @@ index f5a3abad..1ab356e8 100644
=head1 AUTHOR
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
index ea7bc942..9a2df647 100644
index 7d0bafff..84e049cc 100644
--- a/docs/virt-v2v.pod
+++ b/docs/virt-v2v.pod
@@ -416,14 +416,6 @@ See L</Networks and bridges> below.
@ -117,8 +117,8 @@ index ea7bc942..9a2df647 100644
-
=item B<-o> B<json>
Set the output method to I<json>.
@@ -1155,11 +1147,6 @@ and output methods may use disk space, as outlined in the table below.
This option is deprecated and will be removed in S<virt-v2v 2.2>.
@@ -1148,11 +1140,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 ea7bc942..9a2df647 100644
=item I<-o local>
=item I<-o qemu>
@@ -1343,13 +1330,6 @@ instance.
@@ -1336,13 +1323,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.

6
0009-RHEL-Remove-the-in-place-option.patch
View File

@ -1,4 +1,4 @@
From 75e25e23b6e64fff7b397c827de9530c2f56b009 Mon Sep 17 00:00:00 2001
From b463db43b01f93d94a9e1d6fb283acadb507802c 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
@ -11,7 +11,7 @@ wish to support in RHEL.
2 files changed, 16 deletions(-)
diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod
index 9a2df647..abfae1c1 100644
index 84e049cc..7ad22f00 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
@ -35,7 +35,7 @@ index 9a2df647..abfae1c1 100644
=head2 Other virt-v2v topics
L<virt-v2v-support(1)> — Supported hypervisors, virtualization
@@ -1594,7 +1587,6 @@ L<https://rwmj.wordpress.com/2015/09/18/importing-kvm-guests-to-ovirt-or-rhev/#c
@@ -1587,7 +1580,6 @@ L<https://rwmj.wordpress.com/2015/09/18/importing-kvm-guests-to-ovirt-or-rhev/#c
=head1 SEE ALSO
L<virt-p2v(1)>,

295
0010-input-i-vmx-Add-support-for-NVMe-devices.patch Normal file
View File

@ -0,0 +1,295 @@
From 2bafd4d5019b9354f925fda85f841554547db826 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 4 Apr 2022 15:26:18 +0100
Subject: [PATCH] input: -i vmx: Add support for NVMe devices
We model NVMe devices in the source hypervisor.
We currently assume that no one is using the namespaces feature of
NVMe, ie. that each source device will appear in a Linux guest as
/dev/nvme0n1, /dev/nvme1n1, etc. We could fix this if it is a
problem, but it requires adjusting the current assumption for
removable devices that slots are simple integers.
The devices are mapped to virtio-blk, so in the target the device name
has to change from /dev/nvme0 to /dev/vda (etc.)
Reported-by: Ming Xie
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2070530
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
(cherry picked from commit 75872bf282d7f2322110caca70963717b43806b1)
---
convert/convert_linux.ml | 4 +-
convert/target_bus_assignment.ml | 4 +-
input/parse_domain_from_vmx.ml | 26 +++++++++-
lib/types.ml | 3 +-
lib/types.mli | 2 +-
tests/test-v2v-i-vmx-6.expected | 22 +++++++++
tests/test-v2v-i-vmx-6.vmx | 84 ++++++++++++++++++++++++++++++++
tests/test-v2v-i-vmx.sh | 4 +-
8 files changed, 140 insertions(+), 9 deletions(-)
create mode 100644 tests/test-v2v-i-vmx-6.expected
create mode 100644 tests/test-v2v-i-vmx-6.vmx
diff --git a/convert/convert_linux.ml b/convert/convert_linux.ml
index d9397cfa..c2bbce03 100644
--- a/convert/convert_linux.ml
+++ b/convert/convert_linux.ml
@@ -1032,7 +1032,9 @@ let convert (g : G.guestfs) source inspect keep_serial_console _ =
ide_block_prefix ^ drive_name i
| Some (Source_virtio_SCSI | Source_SCSI | Source_SATA) ->
"sd" ^ drive_name i
- | Some Source_virtio_blk -> "vd" ^ drive_name i in
+ | Some Source_virtio_blk -> "vd" ^ drive_name i
+ (* For NVMe assume no one is using namespaces. *)
+ | Some Source_NVME -> sprintf "nvme%dn1" i in
let source_dev = device_name_before_conversion i in
let target_dev = block_prefix_after_conversion ^ drive_name i in
source_dev, target_dev
diff --git a/convert/target_bus_assignment.ml b/convert/target_bus_assignment.ml
index 4b56a6e1..f8675cf2 100644
--- a/convert/target_bus_assignment.ml
+++ b/convert/target_bus_assignment.ml
@@ -73,8 +73,8 @@ let rec target_bus_assignment source_disks source_removables guestcaps =
| None -> ide_bus (* Wild guess, but should be safe. *)
| Some Source_virtio_blk -> virtio_blk_bus
| Some Source_IDE -> ide_bus
- | Some (Source_virtio_SCSI | Source_SCSI | Source_SATA) ->
- scsi_bus in
+ | Some (Source_virtio_SCSI | Source_SCSI | Source_SATA |
+ Source_NVME) -> scsi_bus in
match r.s_removable_slot with
| None ->
diff --git a/input/parse_domain_from_vmx.ml b/input/parse_domain_from_vmx.ml
index 730f1177..b812edeb 100644
--- a/input/parse_domain_from_vmx.ml
+++ b/input/parse_domain_from_vmx.ml
@@ -103,6 +103,7 @@ let remote_file_exists uri path =
let rec find_disks vmx vmx_source =
find_scsi_disks vmx vmx_source
+ @ find_nvme_disks vmx vmx_source
@ find_ide_disks vmx vmx_source
(* Find all SCSI hard disks.
@@ -129,6 +130,27 @@ and find_scsi_disks vmx vmx_source =
get_scsi_controller_target is_scsi_controller_target
scsi_device_types scsi_controller
+(* Find all NVMe hard disks.
+ *
+ * In the VMX file:
+ * nvme0.pcislotnumber = "192"
+ * nvme0:0.fileName = "guest.vmdk"
+ *)
+and find_nvme_disks vmx vmx_source =
+ let get_nvme_controller_target ns =
+ sscanf ns "nvme%d:%d" (fun c t -> c, t)
+ in
+ let is_nvme_controller_target ns =
+ try ignore (get_nvme_controller_target ns); true
+ with Scanf.Scan_failure _ | End_of_file | Failure _ -> false
+ in
+ let nvme_device_types = [ None ] in
+ let nvme_controller = Source_NVME in
+
+ find_hdds vmx vmx_source
+ get_nvme_controller_target is_nvme_controller_target
+ nvme_device_types nvme_controller
+
(* Find all IDE hard disks.
*
* In the VMX file:
@@ -153,12 +175,12 @@ and find_ide_disks vmx vmx_source =
and find_hdds vmx vmx_source
get_controller_target is_controller_target
device_types controller =
- (* Find namespaces matching '(ide|scsi)X:Y' with suitable deviceType. *)
+ (* Find namespaces matching '(ide|scsi|nvme)X:Y' with suitable deviceType. *)
let hdds =
Parse_vmx.select_namespaces (
function
| [ns] ->
- (* Check the namespace is '(ide|scsi)X:Y' *)
+ (* Check the namespace is '(ide|scsi|nvme)X:Y' *)
if not (is_controller_target ns) then false
else (
(* Check the deviceType is one we are looking for. *)
diff --git a/lib/types.ml b/lib/types.ml
index 5804c7c7..92ed0e52 100644
--- a/lib/types.ml
+++ b/lib/types.ml
@@ -56,7 +56,7 @@ and source_disk = {
s_disk_id : int;
s_controller : s_controller option;
}
-and s_controller = Source_IDE | Source_SATA | Source_SCSI |
+and s_controller = Source_IDE | Source_SATA | Source_SCSI | Source_NVME |
Source_virtio_blk | Source_virtio_SCSI
and source_removable = {
s_removable_type : s_removable_type;
@@ -194,6 +194,7 @@ and string_of_controller = function
| Source_IDE -> "ide"
| Source_SATA -> "sata"
| Source_SCSI -> "scsi"
+ | Source_NVME -> "nvme"
| Source_virtio_blk -> "virtio-blk"
| Source_virtio_SCSI -> "virtio-scsi"
diff --git a/lib/types.mli b/lib/types.mli
index dd2fe592..37238cd7 100644
--- a/lib/types.mli
+++ b/lib/types.mli
@@ -103,7 +103,7 @@ and source_disk = {
}
(** A source disk. *)
-and s_controller = Source_IDE | Source_SATA | Source_SCSI |
+and s_controller = Source_IDE | Source_SATA | Source_SCSI | Source_NVME |
Source_virtio_blk | Source_virtio_SCSI
(** Source disk controller. *)
diff --git a/tests/test-v2v-i-vmx-6.expected b/tests/test-v2v-i-vmx-6.expected
new file mode 100644
index 00000000..1793b6b9
--- /dev/null
+++ b/tests/test-v2v-i-vmx-6.expected
@@ -0,0 +1,22 @@
+
+Source guest information (--print-source option):
+
+ source name: esx6.7-rhel8.6-nvme-disk
+hypervisor type: vmware
+ VM genid:
+ memory: 2147483648 (bytes)
+ nr vCPUs: 1
+ CPU vendor:
+ CPU model:
+ CPU topology:
+ CPU features:
+ firmware: bios
+ display:
+ sound:
+disks:
+ 0 [nvme]
+removable media:
+
+NICs:
+ Network "VM Network" mac: 00:50:56:ac:cf:51 [vmxnet3]
+
diff --git a/tests/test-v2v-i-vmx-6.vmx b/tests/test-v2v-i-vmx-6.vmx
new file mode 100644
index 00000000..9203c0cf
--- /dev/null
+++ b/tests/test-v2v-i-vmx-6.vmx
@@ -0,0 +1,84 @@
+.encoding = "UTF-8"
+config.version = "8"
+virtualHW.version = "14"
+nvram = "esx6.7-rhel8.6-nvme-disk.nvram"
+pciBridge0.present = "TRUE"
+svga.present = "TRUE"
+pciBridge4.present = "TRUE"
+pciBridge4.virtualDev = "pcieRootPort"
+pciBridge4.functions = "8"
+pciBridge5.present = "TRUE"
+pciBridge5.virtualDev = "pcieRootPort"
+pciBridge5.functions = "8"
+pciBridge6.present = "TRUE"
+pciBridge6.virtualDev = "pcieRootPort"
+pciBridge6.functions = "8"
+pciBridge7.present = "TRUE"
+pciBridge7.virtualDev = "pcieRootPort"
+pciBridge7.functions = "8"
+vmci0.present = "TRUE"
+hpet0.present = "TRUE"
+floppy0.present = "FALSE"
+svga.vramSize = "8388608"
+memSize = "2048"
+powerType.powerOff = "default"
+powerType.suspend = "default"
+powerType.reset = "default"
+tools.upgrade.policy = "manual"
+sched.cpu.units = "mhz"
+sched.cpu.affinity = "all"
+vm.createDate = "1648710632879834"
+sata0.present = "TRUE"
+nvme0.present = "TRUE"
+nvme0:0.fileName = "nvme-disk.vmdk"
+sched.nvme0:0.shares = "normal"
+sched.nvme0:0.throughputCap = "off"
+nvme0:0.present = "TRUE"
+ethernet0.virtualDev = "vmxnet3"
+ethernet0.networkName = "VM Network"
+ethernet0.addressType = "vpx"
+ethernet0.generatedAddress = "00:50:56:ac:cf:51"
+ethernet0.uptCompatibility = "TRUE"
+ethernet0.present = "TRUE"
+sata0:0.startConnected = "FALSE"
+sata0:0.deviceType = "cdrom-raw"
+sata0:0.clientDevice = "TRUE"
+sata0:0.fileName = "emptyBackingString"
+sata0:0.present = "TRUE"
+displayName = "esx6.7-rhel8.6-nvme-disk"
+guestOS = "rhel8-64"
+toolScripts.afterPowerOn = "TRUE"
+toolScripts.afterResume = "TRUE"
+toolScripts.beforeSuspend = "TRUE"
+toolScripts.beforePowerOff = "TRUE"
+uuid.bios = "42 2c 17 6d 0b 31 4e 16-82 97 f0 b4 99 0b 86 09"
+vc.uuid = "50 2c fc c7 be fb b1 48-fc 7d 4b 39 b3 f5 de b5"
+migrate.hostLog = "esx6.7-rhel8.6-nvme-disk-7585773e.hlog"
+sched.cpu.min = "0"
+sched.cpu.shares = "normal"
+sched.mem.min = "0"
+sched.mem.minSize = "0"
+sched.mem.shares = "normal"
+migrate.encryptionMode = "opportunistic"
+numa.autosize.cookie = "10001"
+numa.autosize.vcpu.maxPerVirtualNode = "1"
+sched.swap.derivedName = "/vmfs/volumes/02155034-b2df70e7/esx6.7-rhel8.6-nvme-disk/esx6.7-rhel8.6-nvme-disk-34965f24.vswp"
+uuid.location = "56 4d c5 90 b1 ca f0 32-64 99 32 a7 d8 97 27 3a"
+nvme0:0.redo = ""
+pciBridge0.pciSlotNumber = "17"
+pciBridge4.pciSlotNumber = "21"
+pciBridge5.pciSlotNumber = "22"
+pciBridge6.pciSlotNumber = "23"
+pciBridge7.pciSlotNumber = "24"
+ethernet0.pciSlotNumber = "160"
+vmci0.pciSlotNumber = "32"
+sata0.pciSlotNumber = "33"
+nvme0.pciSlotNumber = "192"
+vmci0.id = "-1727298039"
+monitor.phys_bits_used = "43"
+vmotion.checkpointFBSize = "8388608"
+vmotion.checkpointSVGAPrimarySize = "8388608"
+cleanShutdown = "TRUE"
+softPowerOff = "TRUE"
+svga.guestBackedPrimaryAware = "TRUE"
+tools.syncTime = "FALSE"
\ No newline at end of file
diff --git a/tests/test-v2v-i-vmx.sh b/tests/test-v2v-i-vmx.sh
index db870bea..d74ddfaa 100755
--- a/tests/test-v2v-i-vmx.sh
+++ b/tests/test-v2v-i-vmx.sh
@@ -39,14 +39,14 @@ rm -f test-v2v-i-vmx-*.actual
# For the tests to succeed we need at least the fileName (VMDK input
# files) to exist.
-fns="BZ1308535_21disks.vmdk Fedora-20.vmdk RHEL-7.1-UEFI.vmdk Windows-7-x64.vmdk MSEdge-Win10_preview.vmdk"
+fns="BZ1308535_21disks.vmdk Fedora-20.vmdk RHEL-7.1-UEFI.vmdk Windows-7-x64.vmdk MSEdge-Win10_preview.vmdk nvme-disk.vmdk"
for fn in BZ1308535_21disks_{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20}.vmdk; do
fns="$fns $fn"
done
for fn in $fns; do qemu-img create -f vmdk $fn 512; done
-for i in 1 2 3 4 5; do
+for i in 1 2 3 4 5 6; do
$VG virt-v2v --debug-gc \
-i vmx test-v2v-i-vmx-$i.vmx \
--print-source > test-v2v-i-vmx-$i.actual
--
2.31.1

1128
0011-output-Remove-o-json-mode.patch Normal file
View File

File diff suppressed because it is too large Load Diff

34
0012-tests-Add-NVMe-test-cases-to-EXTRA_DIST.patch Normal file
View File

@ -0,0 +1,34 @@
From 0bcbd9783fa0a16fd5f58c01303f6c7dbe491fd6 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 12 Apr 2022 11:49:51 +0100
Subject: [PATCH] tests: Add NVMe test cases to EXTRA_DIST
Found by running make dist && make maintainer-check-extra-dist
Fixes: commit 75872bf282d7f2322110caca70963717b43806b1
(cherry picked from commit 2f6ce86474829974fdda68b1cc03a76c2652878d)
---
tests/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 29afd415..f02ac8ee 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -214,11 +214,13 @@ EXTRA_DIST += \
test-v2v-i-vmx-3.expected \
test-v2v-i-vmx-4.expected \
test-v2v-i-vmx-5.expected \
+ test-v2v-i-vmx-6.expected \
test-v2v-i-vmx-1.vmx \
test-v2v-i-vmx-2.vmx \
test-v2v-i-vmx-3.vmx \
test-v2v-i-vmx-4.vmx \
test-v2v-i-vmx-5.vmx \
+ test-v2v-i-vmx-6.vmx \
test-v2v-in-place.sh \
test-v2v-it-vddk-io-query.sh \
test-v2v-machine-readable.sh \
--
2.31.1

30
0013-output-Remove-unused-dummy.c.patch Normal file
View File

@ -0,0 +1,30 @@
From 4844b986e88d00e6372aa38f3dbbbc886c6bfa1f 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 };
--
2.31.1

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (virt-v2v-2.0.2.tar.gz) = 63a198e407df47dc4afffeb147453449e36d9f82952fef5af490888f8708a44f3a75d1dcd233e2a1fe9b58715f61a9875dac9c406a1fced08da6574bf577ffe9
SHA512 (virt-v2v-2.0.2.tar.gz.sig) = 6dc0da82c92243fc11071c569dd49a11a035589722a00b5a7d592f2266ba30eb7ded02746bfd6a88f1cb78d116ac1f6f4de5708f3bd226b9585fd7e0bbe02e05
SHA512 (virt-v2v-2.0.3.tar.gz) = 741ab3557d88ce7e6d5c79ba8e158d6f3cf686cf36462deea875405dfd7a869abde898a8bf532c515b4cff9f4bc7271fa4b6fa2153c4e4196aa0a5b6a891c54d
SHA512 (virt-v2v-2.0.3.tar.gz.sig) = eaedff6e7e827ffd2c42b1495b405ceb53578b09dba75136420b1b114781e200c2812562eb7d09ddc81c41d24debf5293a4d5f9977328b86946934a889e79cea

22
virt-v2v.spec
View File

@ -15,7 +15,7 @@
Name: virt-v2v
Epoch: 1
Version: 2.0.2
Version: 2.0.3
Release: 1%{?dist}
Summary: Convert a virtual machine to run on KVM
@ -42,6 +42,10 @@ 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-input-i-vmx-Add-support-for-NVMe-devices.patch
Patch0011: 0011-output-Remove-o-json-mode.patch
Patch0012: 0012-tests-Add-NVMe-test-cases-to-EXTRA_DIST.patch
Patch0013: 0013-output-Remove-unused-dummy.c.patch
%if !0%{?rhel}
# libguestfs hasn't been built on i686 for a while since there is no
@ -315,13 +319,25 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/virt-v2v-in-place.1*
%changelog
* Mon Apr 04 2022 Richard W.M. Jones <rjones@redhat.com> - 1:2.0.2-1
- Rebase to stable branch version 2.0.2
* Tue Apr 12 2022 Richard W.M. Jones <rjones@redhat.com> - 1:2.0.3-1
- Rebase to stable branch version 2.0.3
resolves: rhbz#2059287, rhbz#1658126, rhbz#1788823, rhbz#1854275
- Fix openssh-clients dependency
resolves: rhbz#2064178
- Fix security issue when running virt-v2v as root
resolves: rhbz#2066773
- Remove -o json mode
resolves: rhbz#2074026
- Allow conversion of guests with NVMe drives from VMX files
resolves: rhbz#2070530
- Cleanly reject guests with snapshots when using -it ssh
resolves: rhbz#1774386
- Document that vmx+ssh "-ip" auth doesn't cover ssh / scp shell commands
resolves: rhbz#1854275
- Fix conversion if swap partition isn't encrypted with root directory
resolves: rhbz#1658128
- Document permissions when importing OVA using RHV UI
resolves: rhbz#2039597
* Tue Feb 15 2022 Richard W.M. Jones <rjones@redhat.com> - 1:1.45.99-1
- Rebase to upstream 1.45.99.