|
 |
ffd6ed |
From a44d5274ff35d33aea74f49d80c02f2202c766eb Mon Sep 17 00:00:00 2001
|
|
|
ffd6ed |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
ffd6ed |
Date: Thu, 30 Apr 2015 17:20:26 -0400
|
|
|
ffd6ed |
Subject: [PATCH] RHEL 7: v2v: efi: Remove references to Fedora / kraxel's OVMF
|
|
|
ffd6ed |
packages.
|
|
|
ffd6ed |
|
|
|
ffd6ed |
---
|
|
|
ffd6ed |
v2v/utils.ml | 13 +++----------
|
|
|
ffd6ed |
1 file changed, 3 insertions(+), 10 deletions(-)
|
|
|
ffd6ed |
|
|
|
ffd6ed |
diff --git a/v2v/utils.ml b/v2v/utils.ml
|
|
|
ffd6ed |
index e9d3262..ebf799f 100644
|
|
|
ffd6ed |
--- a/v2v/utils.ml
|
|
|
ffd6ed |
+++ b/v2v/utils.ml
|
|
|
ffd6ed |
@@ -88,25 +88,18 @@ let qemu_supports_sound_card = function
|
|
|
ffd6ed |
let find_uefi_firmware guest_arch =
|
|
|
ffd6ed |
let files =
|
|
|
ffd6ed |
match guest_arch with
|
|
|
ffd6ed |
- | "i386" | "i486" | "i586" | "i686" ->
|
|
|
ffd6ed |
- [ "/usr/share/edk2.git/ovmf-ia32/OVMF_CODE-pure-efi.fd",
|
|
|
ffd6ed |
- "/usr/share/edk2.git/ovmf-ia32/OVMF_VARS-pure-efi.fd" ]
|
|
|
ffd6ed |
| "x86_64" ->
|
|
|
ffd6ed |
[ "/usr/share/OVMF/OVMF_CODE.fd",
|
|
|
ffd6ed |
- "/usr/share/OVMF/OVMF_VARS.fd";
|
|
|
ffd6ed |
- "/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd",
|
|
|
ffd6ed |
- "/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd" ]
|
|
|
ffd6ed |
+ "/usr/share/OVMF/OVMF_VARS.fd" ]
|
|
|
ffd6ed |
| "aarch64" ->
|
|
|
ffd6ed |
[ "/usr/share/AAVMF/AAVMF_CODE.fd",
|
|
|
ffd6ed |
- "/usr/share/AAVMF/AAVMF_VARS.fd";
|
|
|
ffd6ed |
- "/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw",
|
|
|
ffd6ed |
- "/usr/share/edk2.git/aarch64/vars-template-pflash.raw" ]
|
|
|
ffd6ed |
+ "/usr/share/AAVMF/AAVMF_VARS.fd" ]
|
|
|
ffd6ed |
| arch ->
|
|
|
ffd6ed |
error (f_"don't know how to convert UEFI guests for architecture %s")
|
|
|
ffd6ed |
guest_arch in
|
|
|
ffd6ed |
let rec loop = function
|
|
|
ffd6ed |
| [] ->
|
|
|
ffd6ed |
- error (f_"cannot find firmware for UEFI guests.\n\nYou probably need to install OVMF, or Gerd's firmware repo (https://www.kraxel.org/repos/), or AAVMF (if using aarch64)")
|
|
|
ffd6ed |
+ error (f_"cannot find firmware for UEFI guests.\n\nYou probably need to install OVMF, or AAVMF (if using aarch64)")
|
|
|
ffd6ed |
| ((code, vars_template) as ret) :: rest ->
|
|
|
ffd6ed |
if Sys.file_exists code && Sys.file_exists vars_template then ret
|
|
|
ffd6ed |
else loop rest
|
|
|
ffd6ed |
--
|
|
|
ffd6ed |
1.8.3.1
|
|
|
ffd6ed |
|