search for: targetbio

...ml +++ b/v2v/v2v.ml @@ -103,26 +103,7 @@ let rec main () = g#shutdown (); g#close (); - (* Does the guest require UEFI on the target? *) - message (f_"Checking if the guest needs BIOS or UEFI to boot"); - let target_firmware = - match source.s_firmware with - | BIOS -> TargetBIOS - | UEFI -> TargetUEFI - | UnknownFirmware -> - if inspect.i_uefi then TargetUEFI else TargetBIOS in - let supported_firmware = output#supported_firmware in - if not (List.mem target_firmware supported_firmware) then - error (f_"this guest cannot run on the target, beca...

...eate_ovf.ml index 2cf610333..1cab11dfd 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -462,6 +462,22 @@ let origin_of_source_hypervisor = function *) | _ -> None +let get_ovirt_biostype guestcaps target_firmware = + let uefi_firmware = + match target_firmware with + | TargetBIOS -> None + | TargetUEFI -> Some (find_uefi_firmware guestcaps.gcaps_arch) in + let secure_boot_required = + match uefi_firmware with + | Some { Uefi.flags = flags } + when List.mem Uefi.UEFI_FLAG_SECURE_BOOT_REQUIRED flags -> true + | _ -> false in + match target_f...

.../v2v/output_libvirt.ml +++ b/v2v/output_libvirt.ml @@ -76,8 +76,6 @@ class output_libvirt oc output_pool = object | None -> sprintf "-o libvirt -os %s" output_pool | Some uri -> sprintf "-o libvirt -oc %s -os %s" uri output_pool - method supported_firmware = [ TargetBIOS; TargetUEFI ] - method prepare_targets source targets = (* Get the capabilities from libvirt. *) let xml = Libvirt_utils.capabilities ?conn:oc () in @@ -140,6 +138,8 @@ class output_libvirt oc output_pool = object { t with target_file = target_file } ) targets + metho...

..._serial_console = guestcaps +let get_target_firmware inspect guestcaps source output = + (* Does the guest require UEFI on the target? *) + message (f_"Checking if the guest needs BIOS or UEFI to boot"); + let target_firmware = + match source.s_firmware with + | BIOS -> TargetBIOS + | UEFI -> TargetUEFI + | UnknownFirmware -> + if inspect.i_uefi then TargetUEFI else TargetBIOS in + let supported_firmware = output#supported_firmware in + if not (List.mem target_firmware supported_firmware) then + error (f_"this guest cannot run on the target, beca...

changes in v2: - split patch in two - changed as per suggestions Tomáš Golembiovský (2): v2v: ovf: add firmware and machine type element v2v: enable UEFI for oVirt/RHV outputs v2v/create_ovf.ml | 12 +++++++++++- v2v/create_ovf.mli | 2 +- v2v/output_rhv.ml | 6 ++---- v2v/output_rhv_upload.ml | 4 ++--

...- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/v2v/output_glance.ml b/v2v/output_glance.ml index b712d68..cfb19b4 100644 --- a/v2v/output_glance.ml +++ b/v2v/output_glance.ml @@ -41,7 +41,7 @@ object method as_options = "-o glance" - method supported_firmware = [ TargetBIOS ] + method supported_firmware = [ TargetBIOS; TargetUEFI ] method prepare_targets source targets = (* This does nothing useful except to check that the user has @@ -66,9 +66,6 @@ object ) targets method create_metadata source targets _ guestcaps inspect target_firmware = -...

...rings in this list. > } > (** Inspection information. *) > > diff --git a/v2v/v2v.ml b/v2v/v2v.ml > index fe81df5..2527633 100644 > --- a/v2v/v2v.ml > +++ b/v2v/v2v.ml > @@ -555,7 +555,7 @@ and get_target_firmware inspect guestcaps source output = > | BIOS -> TargetBIOS > | UEFI -> TargetUEFI > | UnknownFirmware -> > - if inspect.i_uefi then TargetUEFI else TargetBIOS in > + if inspect.i_uefi = None then TargetBIOS else TargetUEFI in > let supported_firmware = output#supported_firmware in > if not (List.mem targ...

It seems we're missing this in rhv-upload. Unfortunately I'm not able to test it at the moment. Tomáš Golembiovský (1): v2v: -o rhv-upload: install RHV tools v2v/output_rhv_upload.ml | 3 +++ 1 file changed, 3 insertions(+) -- 2.17.0

...Does it require other changes? I'd split the addition of <BiosType> to the OVF in an own patch, and the enablement of UEFI for oVirt in a different one. > +let get_ovirt_biostype guestcaps target_firmware = > + let uefi_firmware = > + match target_firmware with > + | TargetBIOS -> None > + | TargetUEFI -> Some (find_uefi_firmware guestcaps.gcaps_arch) in > + let secure_boot_required = > + match uefi_firmware with > + | Some { Uefi.flags = flags } > + when List.mem Uefi.UEFI_FLAG_SECURE_BOOT_REQUIRED flags -> true > + | _ -&...

...diff --git a/v2v/output_openstack.ml b/v2v/output_openstack.ml index 179b0edf63..fdc04b02f8 100644 --- a/v2v/output_openstack.ml +++ b/v2v/output_openstack.ml @@ -390,7 +390,7 @@ object | None -> "" | Some op -> " -op " ^ op) - method supported_firmware = [ TargetBIOS ] + method supported_firmware = [ TargetBIOS; TargetUEFI ] (* List of Cinder volume IDs. *) val mutable volume_ids = [] -- 2.28.0.rc2

...%d.%d" x y) + ); + if guestcaps.gcaps_virtio_rng then + push_back properties ("hw_rng_model", "virtio"); + (* XXX Neither memory balloon nor pvpanic are supported by + * Glance at this time. + *) + (match target_firmware with + | TargetBIOS -> () + | TargetUEFI -> + push_back properties ("hw_firmware_type", "uefi") + ); + + !properties in + (* The first disk, assumed to be the system disk, will be called * "guestname". Subsequent disks, assumed to be data disks,...

This changes the infrastructure to allow the target_file to be a QEMU URI. Rich.

...et tmpdir = > - let base_dir = (open_guestfs ())#get_cachedir () in > - let t = Mkdtemp.temp_dir ~base_dir "glance." in > - rmdir_on_exit t; > - t in > object > inherit output > > @@ -60,8 +50,12 @@ object > method supported_firmware = [ TargetBIOS; TargetUEFI ] > > method prepare_targets _ overlays _ = > - (* Write targets to a temporary local file - see above for reason. *) > - List.map (fun (_, ov) -> TargetFile (tmpdir // ov.ov_sd)) overlays > + (* Although glance can slurp in a stream from stdin, unfort...

This is just a bit of preparatory refactoring ... Rich.

This is only lightly tested. In particularly I only tested that the non-secure-boot path still works. I didn't test it on RHEL 7.3 yet because I haven't got enough free disk space for these giant source *.ova files :-( Will try to give that a go later. Rich.

...true; } in diff --git a/v2v/create_libvirt_xml.ml b/v2v/create_libvirt_xml.ml index cf2cad0a2..ac07f9e9e 100644 --- a/v2v/create_libvirt_xml.ml +++ b/v2v/create_libvirt_xml.ml @@ -86,15 +86,17 @@ let create_libvirt_xml ?pool source target_buses guestcaps match target_firmware with | TargetBIOS -> None | TargetUEFI -> Some (find_uefi_firmware guestcaps.gcaps_arch) in - let secure_boot_required = - match uefi_firmware with - | Some { Uefi.flags = flags } - when List.mem Uefi.UEFI_FLAG_SECURE_BOOT_REQUIRED flags -> true - | _ -> false in - (* Currently t...

I'm going to push this because it's a test blocker, but FYI. Rich.

...> --- v2v/output_rhv_upload.ml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml index dc0d96d53..0152b8d5a 100644 --- a/v2v/output_rhv_upload.ml +++ b/v2v/output_rhv_upload.ml @@ -247,6 +247,9 @@ object method supported_firmware = [ TargetBIOS ] + (* rhev-apt.exe will be installed (if available). *) + method install_rhev_apt = true + method prepare_targets source targets = let output_name = source.s_name in let json_params = -- 2.17.0

...;threads", JSON.Int (Int64.of_int s_cpu_threads); + ] in + List.push_back cpu ("topology", JSON.Dict attrs) + ); + + List.push_back doc ("cpu", JSON.Dict !cpu); + ); + + let firmware = + let firmware_type = + match target_firmware with + | TargetBIOS -> "bios" + | TargetUEFI -> "uefi" in + + let fw = ref [ + "type", JSON.String firmware_type; + ] in + + (match target_firmware with + | TargetBIOS -> () + | TargetUEFI -> + let uefi_firmware = find_uefi_firmware guestcaps....

...;threads", JSON.Int (Int64.of_int s_cpu_threads); + ] in + List.push_back cpu ("topology", JSON.Dict attrs) + ); + + List.push_back doc ("cpu", JSON.Dict !cpu); + ); + + let firmware = + let firmware_type = + match target_firmware with + | TargetBIOS -> "bios" + | TargetUEFI -> "uefi" in + + let fw = ref [ + "type", JSON.String firmware_type; + ] in + + (match target_firmware with + | TargetBIOS -> () + | TargetUEFI -> + let uefi_firmware = find_uefi_firmware guestcaps....