[Libguestfs] [PATCH v2 1/2] v2v: ovf: add firmware and machine type element

[Tomáš Golembiovský]

Add oVirt specific elemnt to OVF. It represents the combination of
machine type (i440fx/q35) and firmware (BIOS/UEFI).

Signed-off-by: Tomáš Golembiovský <tgolembi at redhat.com>
---
 v2v/create_ovf.ml                        | 12 +++++++++++-
 v2v/create_ovf.mli                       |  2 +-
 v2v/output_rhv.ml                        |  2 +-
 v2v/output_rhv_upload.ml                 |  2 +-
 v2v/output_vdsm.ml                       |  1 +
 v2v/test-v2v-o-rhv.ovf.expected          |  1 +
 v2v/test-v2v-o-vdsm-options.ovf.expected |  1 +
 7 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml
index f2441cc3f..0ec281d62 100644
--- a/v2v/create_ovf.ml
+++ b/v2v/create_ovf.ml
@@ -462,6 +462,14 @@ let origin_of_source_hypervisor = function
    *)
   | _ -> None
 
+(* Set the <BiosType> element. Other possible values:
+ *   1  q35 + SeaBIOS
+ *   3  q35 + UEFI + Secure Boot
+ *)
+let get_ovirt_biostype = function
+  | TargetBIOS -> 0  (* i440fx + SeaBIOS *)
+  | TargetUEFI -> 2  (* q35 + UEFI *)
+
 (* Generate the .meta file associated with each volume. *)
 let create_meta_files output_alloc sd_uuid image_uuids overlays =
   (* Note: Upper case in the .meta, mixed case in the OVF. *)
@@ -506,7 +514,7 @@ let create_meta_files output_alloc sd_uuid image_uuids overlays =
   ) (List.combine overlays image_uuids)
 
 (* Create the OVF file. *)
-let rec create_ovf source targets guestcaps inspect
+let rec create_ovf source targets guestcaps inspect target_firmware
     output_alloc sd_uuid image_uuids vol_uuids vm_uuid ovf_flavour =
   assert (List.length targets = List.length vol_uuids);
 
@@ -515,6 +523,7 @@ let rec create_ovf source targets guestcaps inspect
   let vmtype = get_vmtype inspect in
   let vmtype = match vmtype with `Desktop -> "0" | `Server -> "1" in
   let ostype = get_ostype inspect in
+  let biostype = get_ovirt_biostype target_firmware in
 
   let ovf : doc =
     doc "ovf:Envelope" [
@@ -562,6 +571,7 @@ let rec create_ovf source targets guestcaps inspect
         e "VmType" [] [PCData vmtype];
         (* See https://bugzilla.redhat.com/show_bug.cgi?id=1260590#c17 *)
         e "DefaultDisplayType" [] [PCData "1"];
+        e "BiosType" [] [PCData (string_of_int biostype)];
       ] in
 
       (match source.s_cpu_model with
diff --git a/v2v/create_ovf.mli b/v2v/create_ovf.mli
index 10c2d6619..f6c7668ae 100644
--- a/v2v/create_ovf.mli
+++ b/v2v/create_ovf.mli
@@ -43,7 +43,7 @@ val ovf_flavour_to_string : ovf_flavour -> string
     create OVF for another target management system then we would need
     to heavily modify or even duplicate this code. *)
 
-val create_ovf : Types.source -> Types.target list -> Types.guestcaps -> Types.inspect -> Types.output_allocation -> string -> string list -> string list -> string ->  ovf_flavour -> DOM.doc
+val create_ovf : Types.source -> Types.target list -> Types.guestcaps -> Types.inspect -> Types.target_firmware  -> Types.output_allocation -> string -> string list -> string list -> string ->  ovf_flavour -> DOM.doc
 (** Create the OVF file.
 
     Actually a {!DOM} document is created, not a file.  It can be written
diff --git a/v2v/output_rhv.ml b/v2v/output_rhv.ml
index 768e4f699..52750f715 100644
--- a/v2v/output_rhv.ml
+++ b/v2v/output_rhv.ml
@@ -267,7 +267,7 @@ object
 
     (* Create the metadata. *)
     let ovf = Create_ovf.create_ovf source targets guestcaps inspect
-      output_alloc esd_uuid image_uuids vol_uuids vm_uuid
+      target_firmware output_alloc esd_uuid image_uuids vol_uuids vm_uuid
       Create_ovf.RHVExportStorageDomain in
 
     (* Write it to the metadata file. *)
diff --git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml
index 3bb2ca807..961f3c780 100644
--- a/v2v/output_rhv_upload.ml
+++ b/v2v/output_rhv_upload.ml
@@ -388,7 +388,7 @@ If the messages above are not sufficient to diagnose the problem then add the 
     (* Create the metadata. *)
     let ovf =
       Create_ovf.create_ovf source targets guestcaps inspect
-                            output_alloc
+                            target_firmware output_alloc
                             sd_uuid image_uuids vol_uuids vm_uuid
                             OVirt in
     let ovf = DOM.doc_to_string ovf in
diff --git a/v2v/output_vdsm.ml b/v2v/output_vdsm.ml
index dc107cf2f..eb7c581d3 100644
--- a/v2v/output_vdsm.ml
+++ b/v2v/output_vdsm.ml
@@ -237,6 +237,7 @@ object
 
     (* Create the metadata. *)
     let ovf = Create_ovf.create_ovf source targets guestcaps inspect
+      target_firmware
       output_alloc dd_uuid
       vdsm_options.image_uuids
       vdsm_options.vol_uuids
diff --git a/v2v/test-v2v-o-rhv.ovf.expected b/v2v/test-v2v-o-rhv.ovf.expected
index 7bcc456c5..c6bd05c56 100644
--- a/v2v/test-v2v-o-rhv.ovf.expected
+++ b/v2v/test-v2v-o-rhv.ovf.expected
@@ -25,6 +25,7 @@
     <IsStateless>False</IsStateless>
     <VmType>0</VmType>
     <DefaultDisplayType>1</DefaultDisplayType>
+    <BiosType>0</BiosType>
     <Section ovf:id='#VM_ID#' ovf:required='false' xsi:type='ovf:OperatingSystemSection_Type'>
       <Info>Microsoft Windows 7 Phony Edition</Info>
       <Description>Windows7</Description>
diff --git a/v2v/test-v2v-o-vdsm-options.ovf.expected b/v2v/test-v2v-o-vdsm-options.ovf.expected
index abaf37e54..f0d418b46 100644
--- a/v2v/test-v2v-o-vdsm-options.ovf.expected
+++ b/v2v/test-v2v-o-vdsm-options.ovf.expected
@@ -25,6 +25,7 @@
     <IsStateless>False</IsStateless>
     <VmType>0</VmType>
     <DefaultDisplayType>1</DefaultDisplayType>
+    <BiosType>0</BiosType>
     <OperatingSystemSection ovf:id='VM' ovf:required='false' ovirt:id='11'>
       <Info>Microsoft Windows 7 Phony Edition</Info>
       <Description>Windows7</Description>
-- 
2.19.0