From: Andrew Jones <andrew.jones@linux.dev>
To: kvm@vger.kernel.org, kvmarm@lists.linux.dev
Cc: alexandru.elisei@arm.com, eric.auger@redhat.com,
nikos.nikoleris@arm.com, shahuang@redhat.com,
pbonzini@redhat.com, thuth@redhat.com
Subject: [kvm-unit-tests PATCH v2 07/18] arm64: efi: Remove EFI_USE_DTB
Date: Tue, 27 Feb 2024 20:21:17 +0100 [thread overview]
Message-ID: <20240227192109.487402-27-andrew.jones@linux.dev> (raw)
In-Reply-To: <20240227192109.487402-20-andrew.jones@linux.dev>
We don't need two variables for one boolean property. Just use
!EFI_USE_ACPI to infer efi-use-dtb.
Signed-off-by: Andrew Jones <andrew.jones@linux.dev>
---
arm/efi/run | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arm/efi/run b/arm/efi/run
index 494ba9e7efe7..b7a8418a07f8 100755
--- a/arm/efi/run
+++ b/arm/efi/run
@@ -27,8 +27,6 @@ fi
: "${EFI_CASE_DIR:="$EFI_TEST/$EFI_TESTNAME"}"
: "${EFI_VAR_GUID:=97ef3e03-7329-4a6a-b9ba-6c1fdcc5f823}"
-[ "$EFI_USE_ACPI" = "y" ] || EFI_USE_DTB=y
-
if [ ! -f "$EFI_UEFI" ]; then
echo "UEFI firmware not found."
echo "Please specify the path with the env variable EFI_UEFI"
@@ -68,7 +66,7 @@ uefi_shell_run()
mkdir -p "$EFI_CASE_DIR"
cp "$EFI_SRC/$EFI_CASE.efi" "$EFI_CASE_DIR/"
echo "@echo -off" > "$EFI_CASE_DIR/startup.nsh"
- if [ "$EFI_USE_DTB" = "y" ]; then
+ if [ "$EFI_USE_ACPI" != "y" ]; then
qemu_args+=(-machine acpi=off)
FDT_BASENAME="dtb"
UEFI_SHELL_RUN=y $TEST_DIR/run -machine dumpdtb="$EFI_CASE_DIR/$FDT_BASENAME" "${qemu_args[@]}"
--
2.43.0
next prev parent reply other threads:[~2024-02-27 19:21 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-27 19:21 [kvm-unit-tests PATCH v2 00/18] arm64: EFI improvements Andrew Jones
2024-02-27 19:21 ` [kvm-unit-tests PATCH v2 01/18] runtime: Update MAX_SMP probe Andrew Jones
2024-03-03 21:43 ` Nikos Nikoleris
2024-02-27 19:21 ` [kvm-unit-tests PATCH v2 02/18] runtime: Add yet another 'no kernel' error message Andrew Jones
2024-03-03 21:50 ` Nikos Nikoleris
2024-02-27 19:21 ` [kvm-unit-tests PATCH v2 03/18] arm64: efi: Don't create dummy test Andrew Jones
2024-03-03 21:57 ` Nikos Nikoleris
2024-02-27 19:21 ` [kvm-unit-tests PATCH v2 04/18] arm64: efi: Make running tests on EFI can be parallel Andrew Jones
2024-03-03 22:06 ` Nikos Nikoleris
2024-02-27 19:21 ` [kvm-unit-tests PATCH v2 05/18] arm64: efi: Remove redundant dtb generation Andrew Jones
2024-03-04 7:16 ` Nikos Nikoleris
2024-02-27 19:21 ` [kvm-unit-tests PATCH v2 06/18] arm64: efi: Move run code into a function Andrew Jones
2024-03-04 7:19 ` Nikos Nikoleris
2024-02-27 19:21 ` Andrew Jones [this message]
2024-03-04 7:20 ` [kvm-unit-tests PATCH v2 07/18] arm64: efi: Remove EFI_USE_DTB Nikos Nikoleris
2024-02-27 19:21 ` [kvm-unit-tests PATCH v2 08/18] arm64: efi: Improve device tree discovery Andrew Jones
2024-03-04 7:34 ` Nikos Nikoleris
2024-03-04 9:35 ` Andrew Jones
2024-02-27 19:21 ` [kvm-unit-tests PATCH v2 09/18] lib/efi: Add support for loading the initrd Andrew Jones
2024-03-04 7:44 ` Nikos Nikoleris
2024-02-27 19:21 ` [kvm-unit-tests PATCH v2 10/18] arm64: efi: Allow running tests directly Andrew Jones
2024-03-04 7:52 ` Nikos Nikoleris
2024-03-04 9:43 ` Andrew Jones
2024-02-27 19:21 ` [kvm-unit-tests PATCH v2 11/18] arm/arm64: Factor out some initial setup Andrew Jones
2024-03-04 7:59 ` Nikos Nikoleris
2024-02-27 19:21 ` [kvm-unit-tests PATCH v2 12/18] arm/arm64: Factor out allocator init from mem_init Andrew Jones
2024-03-04 8:01 ` Nikos Nikoleris
2024-02-27 19:21 ` [kvm-unit-tests PATCH v2 13/18] arm64: Simplify efi_mem_init Andrew Jones
2024-03-04 8:10 ` Nikos Nikoleris
2024-03-04 9:55 ` Andrew Jones
2024-03-04 10:01 ` Nikos Nikoleris
2024-02-27 19:21 ` [kvm-unit-tests PATCH v2 14/18] arm64: Add memregions_efi_init Andrew Jones
2024-03-04 8:16 ` Nikos Nikoleris
2024-02-27 19:21 ` [kvm-unit-tests PATCH v2 15/18] arm64: efi: Don't map reserved regions Andrew Jones
2024-03-04 8:18 ` Nikos Nikoleris
2024-02-27 19:21 ` [kvm-unit-tests PATCH v2 16/18] arm64: efi: Fix _start returns from failed _relocate Andrew Jones
2024-03-04 8:58 ` Nikos Nikoleris
2024-02-27 19:21 ` [kvm-unit-tests PATCH v2 17/18] arm64: efi: Switch to our own stack Andrew Jones
2024-03-04 9:03 ` Nikos Nikoleris
2024-02-27 19:21 ` [kvm-unit-tests PATCH v2 18/18] arm64: efi: Add gitlab CI Andrew Jones
2024-03-04 9:06 ` Nikos Nikoleris
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=20240227192109.487402-27-andrew.jones@linux.dev \
--to=andrew.jones@linux.dev \
--cc=alexandru.elisei@arm.com \
--cc=eric.auger@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=nikos.nikoleris@arm.com \
--cc=pbonzini@redhat.com \
--cc=shahuang@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox