From d76acb13ae1d4ee5a86ca233bd89eeaebccf7771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= Date: Wed, 10 Oct 2018 19:25:50 +0200 Subject: [PATCH] v2v: enable UEFI for oVirt/RHV outputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tomáš Golembiovský RWMJ: Update documentation with versions of oVirt/RHV and virt-v2v required for UEFI support. --- v2v/output_rhv.ml | 4 +--- v2v/output_rhv_upload.ml | 2 +- v2v/output_vdsm.ml | 5 +---- v2v/virt-v2v.pod | 4 ++-- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/v2v/output_rhv.ml b/v2v/output_rhv.ml index 52750f715..18f0104b7 100644 --- a/v2v/output_rhv.ml +++ b/v2v/output_rhv.ml @@ -115,7 +115,7 @@ object method as_options = sprintf "-o rhv -os %s" os - method supported_firmware = [ TargetBIOS ] + method supported_firmware = [ TargetBIOS; TargetUEFI ] (* RHV doesn't support serial consoles. This causes the conversion * step to remove it. @@ -262,8 +262,6 @@ object (* This is called after conversion to write the OVF metadata. *) method create_metadata source targets _ guestcaps inspect target_firmware = - (* See #supported_firmware above. *) - assert (target_firmware = TargetBIOS); (* Create the metadata. *) let ovf = Create_ovf.create_ovf source targets guestcaps inspect diff --git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml index 961f3c780..baf033c32 100644 --- a/v2v/output_rhv_upload.ml +++ b/v2v/output_rhv_upload.ml @@ -240,7 +240,7 @@ object sprintf " -oc %s -op %s -os %s" output_conn output_password output_storage - method supported_firmware = [ TargetBIOS ] + method supported_firmware = [ TargetBIOS; TargetUEFI ] (* rhev-apt.exe will be installed (if available). *) method install_rhev_apt = true diff --git a/v2v/output_vdsm.ml b/v2v/output_vdsm.ml index eb7c581d3..d9fb290a8 100644 --- a/v2v/output_vdsm.ml +++ b/v2v/output_vdsm.ml @@ -123,7 +123,7 @@ object | flav -> sprintf "-oo vdsm-ovf-flavour=%s" (Create_ovf.ovf_flavour_to_string flav)) - method supported_firmware = [ TargetBIOS ] + method supported_firmware = [ TargetBIOS; TargetUEFI ] (* RHV doesn't support serial consoles. This causes the conversion * step to remove it. @@ -232,9 +232,6 @@ object (* This is called after conversion to write the OVF metadata. *) method create_metadata source targets _ guestcaps inspect target_firmware = - (* See #supported_firmware above. *) - assert (target_firmware = TargetBIOS); - (* Create the metadata. *) let ovf = Create_ovf.create_ovf source targets guestcaps inspect target_firmware diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod index 82c366114..ae885510d 100644 --- a/v2v/virt-v2v.pod +++ b/v2v/virt-v2v.pod @@ -1225,9 +1225,9 @@ On RHEL E 7.3, only qemu-kvm-rhev (not qemu-kvm) is supported. Not supported. -=item UEFI on RHV +=item UEFI on oVirt or RHV -Not supported. +Supported since oVirt/RHV E 4.2 and virt-v2v E 1.39.12. =back