All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andrew Jones <andrew.jones@linux.dev>
To: kvm@vger.kernel.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
	Thomas Huth <thuth@redhat.com>,
	Nikos Nikoleris <nikos.nikoleris@arm.com>
Subject: [kvm-unit-tests PATCH 2/3] arm/efi/run: Add Fedora's path to QEMU_EFI
Date: Wed,  7 Jun 2023 20:59:04 +0200	[thread overview]
Message-ID: <20230607185905.32810-3-andrew.jones@linux.dev> (raw)
In-Reply-To: <20230607185905.32810-1-andrew.jones@linux.dev>

Try Fedora's default path too.

Signed-off-by: Andrew Jones <andrew.jones@linux.dev>
---
 arm/efi/run | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/arm/efi/run b/arm/efi/run
index c61da31183a7..f75ef157acf3 100755
--- a/arm/efi/run
+++ b/arm/efi/run
@@ -15,8 +15,14 @@ source config.mak
 source scripts/arch-run.bash
 source scripts/common.bash
 
+if [ -f /usr/share/qemu-efi-aarch64/QEMU_EFI.fd ]; then
+	DEFAULT_UEFI=/usr/share/qemu-efi-aarch64/QEMU_EFI.fd
+elif [ -f /usr/share/edk2/aarch64/QEMU_EFI.silent.fd ]; then
+	DEFAULT_UEFI=/usr/share/edk2/aarch64/QEMU_EFI.silent.fd
+fi
+
 : "${EFI_SRC:=$(realpath "$(dirname "$0")/../")}"
-: "${EFI_UEFI:=/usr/share/qemu-efi-aarch64/QEMU_EFI.fd}"
+: "${EFI_UEFI:=$DEFAULT_UEFI}"
 : "${EFI_TEST:=efi-tests}"
 : "${EFI_CASE:=$(basename $1 .efi)}"
 : "${EFI_VAR_GUID:=97ef3e03-7329-4a6a-b9ba-6c1fdcc5f823}"
@@ -24,9 +30,8 @@ source scripts/common.bash
 [ "$EFI_USE_ACPI" = "y" ] || EFI_USE_DTB=y
 
 if [ ! -f "$EFI_UEFI" ]; then
-	echo "UEFI firmware not found: $EFI_UEFI"
-	echo "Please install the UEFI firmware to this path"
-	echo "Or specify the correct path with the env variable EFI_UEFI"
+	echo "UEFI firmware not found."
+	echo "Please specify the path with the env variable EFI_UEFI"
 	exit 2
 fi
 
-- 
2.40.1


  parent reply	other threads:[~2023-06-07 18:59 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-07 18:59 [kvm-unit-tests PATCH 0/3] EFI runtime fixes Andrew Jones
2023-06-07 18:59 ` [kvm-unit-tests PATCH 1/3] arch-run: Extend timeout when booting with UEFI Andrew Jones
2023-06-15 14:46   ` Nikos Nikoleris
2023-06-07 18:59 ` Andrew Jones [this message]
2023-06-15 14:47   ` [kvm-unit-tests PATCH 2/3] arm/efi/run: Add Fedora's path to QEMU_EFI Nikos Nikoleris
2023-06-07 18:59 ` [kvm-unit-tests PATCH 3/3] configure: efi: Link correct run script Andrew Jones
2023-06-15 14:48   ` Nikos Nikoleris
2023-06-23 15:37 ` [kvm-unit-tests PATCH 0/3] EFI runtime fixes Andrew Jones

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230607185905.32810-3-andrew.jones@linux.dev \
    --to=andrew.jones@linux.dev \
    --cc=kvm@vger.kernel.org \
    --cc=nikos.nikoleris@arm.com \
    --cc=pbonzini@redhat.com \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.