[PATCH] test: Fix QEMU_EFI.fd not found error on non-ARM platforms

[PATCH] test: Fix QEMU_EFI.fd not found error on non-ARM platforms

[Yumei Huang]

Fix the following error when running `make assets` under test on
non-ARM platforms:

./find-arm64-firmware.sh QEMU_EFI.fd
Couldn't find QEMU_EFI.fd
make: *** [Makefile:68: QEMU_EFI.fd] Error 1

Signed-off-by: Yumei Huang <yuhuang@redhat.com>
---
 test/Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test/Makefile b/test/Makefile
index a774285..32d6b43 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -109,7 +109,11 @@ nstool: nstool.c
 	$(CC) $(CFLAGS) -o $@ $^
 
 QEMU_EFI.fd:
-	./find-arm64-firmware.sh $@
+	if [ "$(shell uname -m)" = "aarch64" ]; then \
+		./find-arm64-firmware.sh $@; \
+	else \
+		echo "QEMU_EFI.fd not needed on $(shell uname -m)" && touch $@; \
+	fi
 
 prepared-%.qcow2: %.qcow2 ./prepare-distro-img.sh
 	qemu-img create -f qcow2 -F qcow2 -b $< $@
-- 
@@ -109,7 +109,11 @@ nstool: nstool.c
 	$(CC) $(CFLAGS) -o $@ $^
 
 QEMU_EFI.fd:
-	./find-arm64-firmware.sh $@
+	if [ "$(shell uname -m)" = "aarch64" ]; then \
+		./find-arm64-firmware.sh $@; \
+	else \
+		echo "QEMU_EFI.fd not needed on $(shell uname -m)" && touch $@; \
+	fi
 
 prepared-%.qcow2: %.qcow2 ./prepare-distro-img.sh
 	qemu-img create -f qcow2 -F qcow2 -b $< $@
-- 
2.47.0

Re: [PATCH] test: Fix QEMU_EFI.fd not found error on non-ARM platforms

[Stefano Brivio]

On Mon,  8 Sep 2025 15:33:09 +0800
Yumei Huang <yuhuang@redhat.com> wrote:

> Fix the following error when running `make assets` under test on
> non-ARM platforms:
> 
> ./find-arm64-firmware.sh QEMU_EFI.fd
> Couldn't find QEMU_EFI.fd
> make: *** [Makefile:68: QEMU_EFI.fd] Error 1

Hmm, wait, this is needed to run ARM guests, but not necessarily on
ARM.

The test/distro tests (currently skipped) can use QEMU TCG to run ARM
guests on (kind of) any host architecture, and actually the only usage
I've ever made of find-arm64-firmware.sh is on x86_64.

It still works for me there. On Fedora and related, you need to install
the edk2-aarch64 package, and it's qemu-efi-aarch64 on Debian and
Debian-based distributions.

-- 
Stefano

Re: [PATCH] test: Fix QEMU_EFI.fd not found error on non-ARM platforms

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1465 bytes --]

On Mon, Sep 08, 2025 at 10:10:17AM +0200, Stefano Brivio wrote:
> On Mon,  8 Sep 2025 15:33:09 +0800
> Yumei Huang <yuhuang@redhat.com> wrote:
> 
> > Fix the following error when running `make assets` under test on
> > non-ARM platforms:
> > 
> > ./find-arm64-firmware.sh QEMU_EFI.fd
> > Couldn't find QEMU_EFI.fd
> > make: *** [Makefile:68: QEMU_EFI.fd] Error 1
> 
> Hmm, wait, this is needed to run ARM guests, but not necessarily on
> ARM.

Right.

> The test/distro tests (currently skipped) can use QEMU TCG to run ARM
> guests on (kind of) any host architecture, and actually the only usage
> I've ever made of find-arm64-firmware.sh is on x86_64.
> 
> It still works for me there. On Fedora and related, you need to install
> the edk2-aarch64 package, and it's qemu-efi-aarch64 on Debian and
> Debian-based distributions.

The firmware package should be installed as a dependency of
qemu-system-aarch64, which is also necessary to run those ARM TCG
tests.

Since this is only used by the distro tests, we could also disable
this for the time being, with the intent to bring it back with the
rest of the distro images.  However, unlike the distro images it's
much easier and quicker to install, so there's not so much incentive.

-- 
David Gibson (he or they)	| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you, not the other way
				| around.
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] test: Fix QEMU_EFI.fd not found error on non-ARM platforms

[Yumei Huang]

On Mon, Sep 8, 2025 at 4:24 PM David Gibson <david@gibson.dropbear.id.au> wrote:
>
> On Mon, Sep 08, 2025 at 10:10:17AM +0200, Stefano Brivio wrote:
> > On Mon,  8 Sep 2025 15:33:09 +0800
> > Yumei Huang <yuhuang@redhat.com> wrote:
> >
> > > Fix the following error when running `make assets` under test on
> > > non-ARM platforms:
> > >
> > > ./find-arm64-firmware.sh QEMU_EFI.fd
> > > Couldn't find QEMU_EFI.fd
> > > make: *** [Makefile:68: QEMU_EFI.fd] Error 1
> >
> > Hmm, wait, this is needed to run ARM guests, but not necessarily on
> > ARM.
>
> Right.
>
> > The test/distro tests (currently skipped) can use QEMU TCG to run ARM
> > guests on (kind of) any host architecture, and actually the only usage
> > I've ever made of find-arm64-firmware.sh is on x86_64.
> >
> > It still works for me there. On Fedora and related, you need to install
> > the edk2-aarch64 package, and it's qemu-efi-aarch64 on Debian and
> > Debian-based distributions.
>
> The firmware package should be installed as a dependency of
> qemu-system-aarch64, which is also necessary to run those ARM TCG
> tests.
>
> Since this is only used by the distro tests, we could also disable
> this for the time being, with the intent to bring it back with the
> rest of the distro images.  However, unlike the distro images it's
> much easier and quicker to install, so there's not so much incentive.
>
I see. Thanks Stefano and David.  Withdrawing this patch.
> --
> David Gibson (he or they)       | I'll have my music baroque, and my code
> david AT gibson.dropbear.id.au  | minimalist, thank you, not the other way
>                                 | around.
> http://www.ozlabs.org/~dgibson



-- 
Thanks,

Yumei Huang

Re: [PATCH] test: Fix QEMU_EFI.fd not found error on non-ARM platforms

[Stefano Brivio]

On Mon, 8 Sep 2025 18:23:02 +1000
David Gibson <david@gibson.dropbear.id.au> wrote:

> On Mon, Sep 08, 2025 at 10:10:17AM +0200, Stefano Brivio wrote:
> > On Mon,  8 Sep 2025 15:33:09 +0800
> > Yumei Huang <yuhuang@redhat.com> wrote:
> >   
> > > Fix the following error when running `make assets` under test on
> > > non-ARM platforms:
> > > 
> > > ./find-arm64-firmware.sh QEMU_EFI.fd
> > > Couldn't find QEMU_EFI.fd
> > > make: *** [Makefile:68: QEMU_EFI.fd] Error 1  
> > 
> > Hmm, wait, this is needed to run ARM guests, but not necessarily on
> > ARM.  
> 
> Right.
> 
> > The test/distro tests (currently skipped) can use QEMU TCG to run ARM
> > guests on (kind of) any host architecture, and actually the only usage
> > I've ever made of find-arm64-firmware.sh is on x86_64.
> > 
> > It still works for me there. On Fedora and related, you need to install
> > the edk2-aarch64 package, and it's qemu-efi-aarch64 on Debian and
> > Debian-based distributions.  
> 
> The firmware package should be installed as a dependency of
> qemu-system-aarch64, which is also necessary to run those ARM TCG
> tests.

It's also mentioned in test/README.md (at least the Debian name for
it).

We should fix that document altogether, because it doesn't mention
'make' under test/ at all. It's on my list, but I didn't start yet, so
it's up for grabs (yes, I should file some more tickets, but I didn't
find a moment for that yet).

-- 
Stefano