search for: find_uefi_firmwar

...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_firmware, secure_boot_required with + | TargetUEFI, true -&g...

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.

...| 7 +++---- 5 files changed, 48 insertions(+), 25 deletions(-) diff --git a/src/appliance.c b/src/appliance.c index 1dbf9c7..dbde35e 100644 --- a/src/appliance.c +++ b/src/appliance.c @@ -443,32 +443,15 @@ dir_contains_files (const char *dir, ...) * * XXX See also v2v/utils.ml:find_uefi_firmware */ -#ifdef __aarch64__ - -static const char *uefi_firmware[] = { - "/usr/share/AAVMF/AAVMF_CODE.fd", - "/usr/share/AAVMF/AAVMF_VARS.fd", - - "/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw", - "/usr/share/edk2.git/aarch64/vars-template-pflash.raw", -...

First version was posted here: https://www.redhat.com/archives/libguestfs/2016-August/thread.html#00100 This is semantically the same as the first version. However I've split the patch up into two parts. In the first part, I factor out the UEFI paths so now they are created by the generator and written in the library and v2v/ directory directly, instead of the complex business of having a C

...- "/usr/share/edk2.git/ovmf-ia32/OVMF_VARS-pure-efi.fd", - []; - "x86_64", "/usr/share/OVMF/OVMF_CODE.fd", None, diff --git a/v2v/utils.ml b/v2v/utils.ml index 58331207f..372ad8aaa 100644 --- a/v2v/utils.ml +++ b/v2v/utils.ml @@ -64,7 +64,6 @@ let find_uefi_firmware guest_arch = let files = (* The lists of firmware are actually defined in common/utils/uefi.c. *) match guest_arch with - | "i386" | "i486" | "i586" | "i686" -> Uefi.uefi_i386_firmware | "x86_64" -> Uefi.uefi_x86_64_firmw...

...n 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 > + | _ -> false in > + match target_firmware, secure_boot_required...

....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 these are required by secure boot, but in theory they - * m...

...bl.add h x true; x :: loop xs - in - loop xs - let du filename = (* There's no OCaml binding for st_blocks, so run coreutils 'du'. *) let cmd = diff --git a/v2v/utils.mli b/v2v/utils.mli index bea9cf3..7f57eec 100644 --- a/v2v/utils.mli +++ b/v2v/utils.mli @@ -38,9 +38,6 @@ val find_uefi_firmware : string -> Uefi.uefi_firmware val compare_app2_versions : Guestfs.application2 -> Guestfs.application2 -> int (** Compare two app versions. *) -val remove_duplicates : 'a list -> 'a list -(** Remove duplicates from a list. *) - val du : string -> int64 (** Return the...

...rgetBIOS; TargetUEFI ] + + method check_target_firmware guestcaps target_firmware = + match target_firmware with + | TargetBIOS -> () + | TargetUEFI -> + (* This will fail with an error if the target firmware is + * not installed on the host. + *) + ignore (find_uefi_firmware guestcaps.gcaps_arch) + method create_metadata source _ target_buses guestcaps _ target_firmware = (* We don't know what target features the hypervisor supports, but * assume a common set that libvirt supports. diff --git a/v2v/output_qemu.ml b/v2v/output_qemu.ml index 3e28ad0..8...

Just refactoring. Rich.

...bl.add h x true; x :: loop xs - in - loop xs - let du filename = (* There's no OCaml binding for st_blocks, so run coreutils 'du'. *) let cmd = diff --git a/v2v/utils.mli b/v2v/utils.mli index 97d98ff..2bd1329 100644 --- a/v2v/utils.mli +++ b/v2v/utils.mli @@ -46,9 +46,6 @@ val find_uefi_firmware : string -> Uefi.uefi_firmware val compare_app2_versions : Guestfs.application2 -> Guestfs.application2 -> int (** Compare two app versions. *) -val remove_duplicates : 'a list -> 'a list -(** Remove duplicates from a list. *) - val du : string -> int64 (** Return the...

https://bugzilla.redhat.com/show_bug.cgi?id=1338083 Now that UEFI is fully open source the UEFI firmware can be included in Fedora. The location will be slightly different. These patches do a bit of code rearrangement and add the new paths. Rich.

...cannot open virtio-win ISO file: %s") virtio_win msg + ) and install_virtio_drivers root current_cs = (* Copy the virtio drivers to the guest. *) diff --git a/v2v/utils.ml b/v2v/utils.ml index 4e6befc..7db4448 100644 --- a/v2v/utils.ml +++ b/v2v/utils.ml @@ -110,161 +110,77 @@ let find_uefi_firmware guest_arch = in loop files -(* Find virtio-win driver files from an unpacked or mounted virtio-win - * directory, or from a virtio-win.iso file. The location of drivers - varies between releases of virtio-win and also across Fedora and - RHEL so try to be robust to changes. - *) -type vi...

...cannot open virtio-win ISO file: %s") virtio_win msg + ) and install_virtio_drivers root current_cs = (* Copy the virtio drivers to the guest. *) diff --git a/v2v/utils.ml b/v2v/utils.ml index 2998d90..3d0bec8 100644 --- a/v2v/utils.ml +++ b/v2v/utils.ml @@ -159,161 +159,77 @@ let find_uefi_firmware guest_arch = in loop files -(* Find virtio-win driver files from an unpacked or mounted virtio-win - * directory, or from a virtio-win.iso file. The location of drivers - varies between releases of virtio-win and also across Fedora and - RHEL so try to be robust to changes. - *) -type vi...

...(block, net) + (block, net) and add_viostor_to_critical_device_database root current_cs = let { i_major_version = major; i_minor_version = minor; diff --git a/v2v/utils.ml b/v2v/utils.ml index 43052bd..1f8c357 100644 --- a/v2v/utils.ml +++ b/v2v/utils.ml @@ -109,6 +109,158 @@ let find_uefi_firmware guest_arch = in loop files +(* Find virtio-win driver files from an unpacked or mounted virtio-win + * directory, or from a virtio-win.iso file. The location of drivers + varies between releases of virtio-win and also across Fedora and + RHEL so try to be robust to changes. + *) +type vi...

In version 2: - Add a bunch of debugging output. - Recognize Windows Vista, Windows 10. - Compare driver paths case-insensitively.

Starting with 5.2.0, libvirt has a way to select the firmware by specifying its type, provided configuration files for the firmware are shipped. Currently we start the appliance as UEFI if any of the firmware are found, so instead we can try to just set the firmware type iff: - the libvirt autoselection works - the 'efi' firmware is available The only behaviour change is that the default

...(block, net) + (block, net) and add_viostor_to_critical_device_database root current_cs = let { i_major_version = major; i_minor_version = minor; diff --git a/v2v/utils.ml b/v2v/utils.ml index 43052bd..8189ed2 100644 --- a/v2v/utils.ml +++ b/v2v/utils.ml @@ -109,6 +109,131 @@ let find_uefi_firmware guest_arch = in loop files +(* Find virtio-win driver files from an unpacked or mounted virtio-win + * directory, or from a virtio-win.iso file. The location of drivers + varies between releases of virtio-win and also across Fedora and + RHEL so try to be robust to changes. + *) +type vi...

Libguestfs supports passing an ISO image as a source of virtio windows drivers to v2v. That support, however, looks too heavy-weight: in order to access those drivers, a separate guestfs handle is created (and thus a new emulator process is started), which runs until v2v completes. This series attempts to make it simpler and lighter-weight, by making the relevant code more local, and by

Libguestfs supports passing an ISO image as a source of virtio windows drivers to v2v. This series attempts to make it simpler and better scoped. Roman Kagan (3): v2v: consolidate virtio-win file copying v2v: copy virtio drivers without guestfs handle leak v2v: drop useless forced gc --- changes since v2: - drop patch 4 (reuse of the master guestfs handle for hot-adding the ISO image)