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

Rebase to upstream 1.45.93. 

resolves: rhbz#2011713
This commit is contained in:
Richard W.M. Jones 2021-12-03 17:34:43 +00:00
parent 99c8749f70
commit 80d7267e49
11 changed files with 65 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From 95b7d1f4c26d3ddf049a5741b44c0b18948435b4 Mon Sep 17 00:00:00 2001 From 2a2cb7e1f6152b61f3f938399b16d11fdc755d47 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sun, 28 Sep 2014 19:14:43 +0100 Date: Sun, 28 Sep 2014 19:14:43 +0100
Subject: [PATCH] RHEL: v2v: Select correct qemu binary for -o qemu mode Subject: [PATCH] RHEL: v2v: Select correct qemu binary for -o qemu mode
@ -12,14 +12,14 @@ Note that we don't support people running qemu directly like this.
It's just for quick testing of converted VMs, and to help us with It's just for quick testing of converted VMs, and to help us with
support cases. support cases.
--- ---
output/output.ml | 2 +- output/output_qemu.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/output/output.ml b/output/output.ml diff --git a/output/output_qemu.ml b/output/output_qemu.ml
index 9d888f54..51e6bb68 100644 index 0aac1eba..c4265703 100644
--- a/output/output.ml --- a/output/output_qemu.ml
+++ b/output/output.ml +++ b/output/output_qemu.ml
@@ -1283,7 +1283,7 @@ and qemu_finalize dir source inspect target_meta @@ -119,7 +119,7 @@ and qemu_finalize dir source inspect target_meta
* module deals with shell and qemu comma quoting. * module deals with shell and qemu comma quoting.
*) *)
let cmd = Qemuopts.create () in let cmd = Qemuopts.create () in

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

@ -1,4 +1,4 @@
From 164c7748334841c8a1cc6cf53af9605d5589a6a5 Mon Sep 17 00:00:00 2001 From c66dfdca6557f88340e5101a447adea5852d6c00 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 30 Sep 2014 10:50:27 +0100 Date: Tue, 30 Sep 2014 10:50:27 +0100
Subject: [PATCH] RHEL: v2v: Disable the --qemu-boot / -oo qemu-boot option Subject: [PATCH] RHEL: v2v: Disable the --qemu-boot / -oo qemu-boot option
@ -12,7 +12,7 @@ qemu script.
--- ---
docs/virt-v2v-output-local.pod | 6 ++---- docs/virt-v2v-output-local.pod | 6 ++----
docs/virt-v2v.pod | 12 ------------ docs/virt-v2v.pod | 12 ------------
output/output.ml | 3 +++ output/output_qemu.ml | 3 +++
v2v/v2v.ml | 2 -- v2v/v2v.ml | 2 --
4 files changed, 5 insertions(+), 18 deletions(-) 4 files changed, 5 insertions(+), 18 deletions(-)
@ -80,11 +80,11 @@ index 3d0e00a3..04f3efd2 100644
=item B<-q> =item B<-q>
=item B<--quiet> =item B<--quiet>
diff --git a/output/output.ml b/output/output.ml diff --git a/output/output_qemu.ml b/output/output_qemu.ml
index 51e6bb68..4cc27b3e 100644 index c4265703..822e4c72 100644
--- a/output/output.ml --- a/output/output_qemu.ml
+++ b/output/output.ml +++ b/output/output_qemu.ml
@@ -1216,6 +1216,9 @@ and qemu_parse_options options = @@ -52,6 +52,9 @@ and qemu_parse_options options =
) options.output_options; ) options.output_options;
let qemu_boot = !qemu_boot in let qemu_boot = !qemu_boot in
@ -95,10 +95,10 @@ index 51e6bb68..4cc27b3e 100644
let output_storage = let output_storage =
match options.output_storage with match options.output_storage with
diff --git a/v2v/v2v.ml b/v2v/v2v.ml diff --git a/v2v/v2v.ml b/v2v/v2v.ml
index 3fc29b26..caf5e5bf 100644 index c6746b5d..55aaf514 100644
--- a/v2v/v2v.ml --- a/v2v/v2v.ml
+++ b/v2v/v2v.ml +++ b/v2v/v2v.ml
@@ -282,8 +282,6 @@ let rec main () = @@ -277,8 +277,6 @@ let rec main () =
s_"Same as ‘-ip filename’"; s_"Same as ‘-ip filename’";
[ L"print-source" ], Getopt.Set print_source, [ L"print-source" ], Getopt.Set print_source,
s_"Print source and stop"; s_"Print source and stop";

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

@ -1,4 +1,4 @@
From 9bd9845874e61178b03aa34be8b5e5f94683e754 Mon Sep 17 00:00:00 2001 From 03ec5eeadf55eb8b890d7b7fc8740c39417a8c7d Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 24 Apr 2015 09:45:41 -0400 Date: Fri, 24 Apr 2015 09:45:41 -0400
Subject: [PATCH] RHEL: Fix list of supported sound cards to match RHEL qemu 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(-) 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/utils.ml b/lib/utils.ml diff --git a/lib/utils.ml b/lib/utils.ml
index 1eac3f3f..a478fc33 100644 index c18a467c..d3e23662 100644
--- a/lib/utils.ml --- a/lib/utils.ml
+++ b/lib/utils.ml +++ b/lib/utils.ml
@@ -59,13 +59,14 @@ let kvm_arch = function @@ -59,13 +59,14 @@ let kvm_arch = function

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

@ -1,4 +1,4 @@
From abad2ae296a7750e2d2f2467ab83672a06ee3b78 Mon Sep 17 00:00:00 2001 From e0bab87deb129541330a8f67c198847fc0eb7204 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sun, 30 Aug 2015 03:21:57 -0400 Date: Sun, 30 Aug 2015 03:21:57 -0400
Subject: [PATCH] RHEL: Fixes for libguestfs-winsupport. Subject: [PATCH] RHEL: Fixes for libguestfs-winsupport.

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

@ -1,18 +1,18 @@
From e281ec1f3d066dad9bcf59401287d72cf65488be Mon Sep 17 00:00:00 2001 From 6796448dba4631bffa9c667b8541c659b4bd870b Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 2 Mar 2017 14:21:37 +0100 Date: Thu, 2 Mar 2017 14:21:37 +0100
Subject: [PATCH] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671) Subject: [PATCH] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671)
The SDL output mode is not supported in RHEL's qemu-kvm. The SDL output mode is not supported in RHEL's qemu-kvm.
--- ---
input/input.ml | 2 +- input/input_disk.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/input/input.ml b/input/input.ml diff --git a/input/input_disk.ml b/input/input_disk.ml
index 63fa609f..14e58cb3 100644 index ab74dd64..5deb291b 100644
--- a/input/input.ml --- a/input/input_disk.ml
+++ b/input/input.ml +++ b/input/input_disk.ml
@@ -98,7 +98,7 @@ let rec disk_source options args = @@ -70,7 +70,7 @@ let rec disk_source dir options args =
s_features = [ "acpi"; "apic"; "pae" ]; s_features = [ "acpi"; "apic"; "pae" ];
s_firmware = UnknownFirmware; (* causes virt-v2v to autodetect *) s_firmware = UnknownFirmware; (* causes virt-v2v to autodetect *)
s_display = s_display =

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

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

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

@ -1,4 +1,4 @@
From 58ae67bd08fe1ea898f2c77d4799e9e029a6b94a Mon Sep 17 00:00:00 2001 From c1848a548727e0b24da0a2b7bb410ad5e4af456d Mon Sep 17 00:00:00 2001
From: Pino Toscano <ptoscano@redhat.com> From: Pino Toscano <ptoscano@redhat.com>
Date: Tue, 26 Mar 2019 09:42:25 +0100 Date: Tue, 26 Mar 2019 09:42:25 +0100
Subject: [PATCH] RHEL: point to KB for supported v2v hypervisors/guests Subject: [PATCH] RHEL: point to KB for supported v2v hypervisors/guests

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

@ -1,4 +1,4 @@
From d6d6dfd5a8f2cb3ad6746d5ddb233eb33a76b69a Mon Sep 17 00:00:00 2001 From 299c6f40236935c1cba51aa4bae106de4621b60c Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 30 Jun 2021 11:15:52 +0100 Date: Wed, 30 Jun 2021 11:15:52 +0100
Subject: [PATCH] RHEL: Disable -o glance Subject: [PATCH] RHEL: Disable -o glance
@ -7,10 +7,10 @@ Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1977539
--- ---
docs/virt-v2v-output-openstack.pod | 56 ++---------------------------- docs/virt-v2v-output-openstack.pod | 56 ++----------------------------
docs/virt-v2v.pod | 20 ----------- docs/virt-v2v.pod | 20 -----------
output/output.mli | 1 - output/output_glance.mli | 2 +-
tests/test-v2v-o-glance.sh | 3 ++ tests/test-v2v-o-glance.sh | 3 ++
v2v/v2v.ml | 7 +--- v2v/v2v.ml | 7 +---
5 files changed, 6 insertions(+), 81 deletions(-) 5 files changed, 7 insertions(+), 81 deletions(-)
diff --git a/docs/virt-v2v-output-openstack.pod b/docs/virt-v2v-output-openstack.pod diff --git a/docs/virt-v2v-output-openstack.pod b/docs/virt-v2v-output-openstack.pod
index f5a3abad..1ab356e8 100644 index f5a3abad..1ab356e8 100644
@ -144,18 +144,16 @@ index 04f3efd2..7c101513 100644
=item Writing to block devices =item Writing to block devices
This normally requires root. See the next section. This normally requires root. See the next section.
diff --git a/output/output.mli b/output/output.mli diff --git a/output/output_glance.mli b/output/output_glance.mli
index 94447947..4c4dc486 100644 index 972320a2..9befc461 100644
--- a/output/output.mli --- a/output/output_glance.mli
+++ b/output/output.mli +++ b/output/output_glance.mli
@@ -52,7 +52,6 @@ module type OUTPUT = sig @@ -18,4 +18,4 @@
end
module Disk : OUTPUT (** [-o disk] output mode. *) (** [-o glance] output mode. *)
-module Glance : OUTPUT (** [-o glance] output mode. *)
module Json : OUTPUT (** [-o json] output mode. *) -module Glance : Output.OUTPUT
module Libvirt_ : OUTPUT (** [-o libvirt] output mode. *) +(*module Glance : Output.OUTPUT*)
module Null : OUTPUT (** [-o null] output mode. *)
diff --git a/tests/test-v2v-o-glance.sh b/tests/test-v2v-o-glance.sh diff --git a/tests/test-v2v-o-glance.sh b/tests/test-v2v-o-glance.sh
index c0db9115..074b5e16 100755 index c0db9115..074b5e16 100755
--- a/tests/test-v2v-o-glance.sh --- a/tests/test-v2v-o-glance.sh
@ -171,10 +169,10 @@ index c0db9115..074b5e16 100755
set -e set -e
set -x set -x
diff --git a/v2v/v2v.ml b/v2v/v2v.ml diff --git a/v2v/v2v.ml b/v2v/v2v.ml
index caf5e5bf..f5fc946e 100644 index 55aaf514..8b85232b 100644
--- a/v2v/v2v.ml --- a/v2v/v2v.ml
+++ b/v2v/v2v.ml +++ b/v2v/v2v.ml
@@ -210,7 +210,6 @@ let rec main () = @@ -205,7 +205,6 @@ let rec main () =
if !output_mode <> `Not_set then if !output_mode <> `Not_set then
error (f_"%s option used more than once on the command line") "-o"; error (f_"%s option used more than once on the command line") "-o";
match mode with match mode with
@ -182,7 +180,7 @@ index caf5e5bf..f5fc946e 100644
| "libvirt" -> output_mode := `Libvirt | "libvirt" -> output_mode := `Libvirt
| "disk" | "local" -> output_mode := `Disk | "disk" | "local" -> output_mode := `Disk
| "json" -> output_mode := `JSON | "json" -> output_mode := `JSON
@@ -262,7 +261,7 @@ let rec main () = @@ -257,7 +256,7 @@ let rec main () =
s_"Map network ‘in’ to ‘out’"; s_"Map network ‘in’ to ‘out’";
[ L"no-trim" ], Getopt.String ("-", no_trim_warning), [ L"no-trim" ], Getopt.String ("-", no_trim_warning),
s_"Ignored for backwards compatibility"; s_"Ignored for backwards compatibility";
@ -191,7 +189,7 @@ index caf5e5bf..f5fc946e 100644
s_"Set output mode (default: libvirt)"; s_"Set output mode (default: libvirt)";
[ M"oa" ], Getopt.String ("sparse|preallocated", set_output_alloc), [ M"oa" ], Getopt.String ("sparse|preallocated", set_output_alloc),
s_"Set output allocation mode"; s_"Set output allocation mode";
@@ -330,8 +329,6 @@ virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp @@ -325,8 +324,6 @@ virt-v2v -i libvirtxml guest-domain.xml -o local -os /var/tmp
virt-v2v -i disk disk.img -o local -os /var/tmp virt-v2v -i disk disk.img -o local -os /var/tmp
@ -200,7 +198,7 @@ index caf5e5bf..f5fc946e 100644
There is a companion front-end called \"virt-p2v\" which comes as an There is a companion front-end called \"virt-p2v\" which comes as an
ISO or CD image that can be booted on physical machines. ISO or CD image that can be booted on physical machines.
@@ -390,7 +387,6 @@ read the man page virt-v2v(1). @@ -385,7 +382,6 @@ read the man page virt-v2v(1).
pr "input:libvirtxml\n"; pr "input:libvirtxml\n";
pr "input:ova\n"; pr "input:ova\n";
pr "input:vmx\n"; pr "input:vmx\n";
@ -208,14 +206,14 @@ index caf5e5bf..f5fc946e 100644
pr "output:json\n"; pr "output:json\n";
pr "output:libvirt\n"; pr "output:libvirt\n";
pr "output:local\n"; pr "output:local\n";
@@ -480,7 +476,6 @@ read the man page virt-v2v(1). @@ -475,7 +471,6 @@ read the man page virt-v2v(1).
| `Disk -> (module Output.Disk) | `Disk -> (module Output_disk.Disk)
| `Null -> (module Output.Null) | `Null -> (module Output_null.Null)
| `QEmu -> (module Output.QEMU) | `QEmu -> (module Output_qemu.QEMU)
- | `Glance -> (module Output.Glance) - | `Glance -> (module Output_glance.Glance)
| `Openstack -> (module Output.Openstack) | `Openstack -> (module Output_openstack.Openstack)
| `RHV_Upload -> (module Output.RHVUpload) | `RHV_Upload -> (module Output_rhv_upload.RHVUpload)
| `RHV -> (module Output.RHV) | `RHV -> (module Output_rhv.RHV)
-- --
2.31.1 2.31.1

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

@ -1,4 +1,4 @@
From ec5c9663bbd4424dd54adc90d94812e820c28067 Mon Sep 17 00:00:00 2001 From cf846671d2f7482ec147397d3dc860a5df61969a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com> From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 2 Dec 2021 11:56:05 +0000 Date: Thu, 2 Dec 2021 11:56:05 +0000
Subject: [PATCH] RHEL: Remove the --in-place option Subject: [PATCH] RHEL: Remove the --in-place option
@ -101,10 +101,10 @@ index 7c101513..4f89d2b2 100644
The I<--machine-readable> option can be used to make the output more The I<--machine-readable> option can be used to make the output more
diff --git a/v2v/v2v.ml b/v2v/v2v.ml diff --git a/v2v/v2v.ml b/v2v/v2v.ml
index f5fc946e..bc8717b9 100644 index 8b85232b..6f294d77 100644
--- a/v2v/v2v.ml --- a/v2v/v2v.ml
+++ b/v2v/v2v.ml +++ b/v2v/v2v.ml
@@ -188,7 +188,6 @@ let rec main () = @@ -183,7 +183,6 @@ let rec main () =
let output_storage = ref None in let output_storage = ref None in
(* Other options that we handle here. *) (* Other options that we handle here. *)
@ -112,7 +112,7 @@ index f5fc946e..bc8717b9 100644
let print_source = ref false in let print_source = ref false in
let input_mode = ref `Not_set in let input_mode = ref `Not_set in
@@ -253,8 +252,6 @@ let rec main () = @@ -248,8 +247,6 @@ let rec main () =
s_"Use password from file to connect to input hypervisor"; s_"Use password from file to connect to input hypervisor";
[ M"it" ], Getopt.String ("transport", set_string_option_once "-it" input_transport), [ M"it" ], Getopt.String ("transport", set_string_option_once "-it" input_transport),
s_"Input transport"; s_"Input transport";
@ -121,7 +121,7 @@ index f5fc946e..bc8717b9 100644
[ L"mac" ], Getopt.String ("mac:network|bridge|ip:out", add_mac), [ L"mac" ], Getopt.String ("mac:network|bridge|ip:out", add_mac),
s_"Map NIC to network or bridge or assign static IP"; s_"Map NIC to network or bridge or assign static IP";
[ S 'n'; L"network" ], Getopt.String ("in:out", add_network), [ S 'n'; L"network" ], Getopt.String ("in:out", add_network),
@@ -341,7 +338,6 @@ read the man page virt-v2v(1). @@ -336,7 +333,6 @@ read the man page virt-v2v(1).
(* Dereference the arguments. *) (* Dereference the arguments. *)
let args = List.rev !args in let args = List.rev !args in
@ -129,7 +129,7 @@ index f5fc946e..bc8717b9 100644
let input_conn = !input_conn in let input_conn = !input_conn in
let input_mode = !input_mode in let input_mode = !input_mode in
let input_transport = let input_transport =
@@ -361,9 +357,6 @@ read the man page virt-v2v(1). @@ -356,9 +352,6 @@ read the man page virt-v2v(1).
let root_choice = !root_choice in let root_choice = !root_choice in
let static_ips = !static_ips in let static_ips = !static_ips in
@ -139,7 +139,7 @@ index f5fc946e..bc8717b9 100644
(* No arguments and machine-readable mode? Print out some facts (* No arguments and machine-readable mode? Print out some facts
* about what this binary supports. * about what this binary supports.
*) *)
@@ -377,7 +370,6 @@ read the man page virt-v2v(1). @@ -372,7 +365,6 @@ read the man page virt-v2v(1).
pr "vddk\n"; pr "vddk\n";
pr "colours-option\n"; pr "colours-option\n";
pr "vdsm-compat-option\n"; pr "vdsm-compat-option\n";

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (virt-v2v-1.45.92.tar.gz) = 0a9166b023ea60d34c10891bd3610874929790526ddfad13d5514e34010b59d288a59918423ef3dd970ade435437a452bc31c2b225c72f8676fd9559254ccc58 SHA512 (virt-v2v-1.45.93.tar.gz) = d70ef9bdebf0c3579274ddbcce96681600eb263576c605fdf6f17cc6ae76bed6452a4c978e91ff662f7c2f4c6dc28fe760a49e545adce14ce5743c492bea8246
SHA512 (virt-v2v-1.45.92.tar.gz.sig) = d1bb3f101e1272e59616c971ce86675c2b35248f8a5e91dd623a31eff7a39974a88e9fd7bc14be80434e69e935222fcb6389908cd0da47a537bfdff9266614b5 SHA512 (virt-v2v-1.45.93.tar.gz.sig) = e2f6e203940490409bc234113e4b2d7cfd2be4ada08897fbd59eba52411f06bb30c4a7fba9b1ecf1c1ef9b3d5bed2f889703758e99820b2e3d4787835bc45958

6
virt-v2v.spec
View File

@ -14,7 +14,7 @@
Name: virt-v2v Name: virt-v2v
Epoch: 1 Epoch: 1
Version: 1.45.92 Version: 1.45.93
Release: 1%{?dist} Release: 1%{?dist}
Summary: Convert a virtual machine to run on KVM Summary: Convert a virtual machine to run on KVM
@ -300,8 +300,8 @@ popd
%changelog %changelog
* Thu Dec 02 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.45.92-1 * Fri Dec 03 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.45.93-1
- Rebase to upstream 1.45.92. - Rebase to upstream 1.45.93.
- Change video type to VGA (instead of QXL). - Change video type to VGA (instead of QXL).
- Remove --in-place support properly. - Remove --in-place support properly.
- Remove -o glance support properly. - Remove -o glance support properly.