[Libguestfs] [PATCH v2 2/2] v2v: enable UEFI for oVirt/RHV outputs

Signed-off-by: Tomáš Golembiovský <tgolembi(a)redhat.com&gt; --- v2v/output_rhv.ml | 4 +--- v2v/output_rhv_upload.ml | 2 +- v2v/output_vdsm.ml | 5 +---- 3 files changed, 3 insertions(+), 8 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 -- 2.19.0