On 8/6/20 9:14 PM, Paolo Bonzini wrote: > Just make EFI_AARCH64 a variable in the makefile that defaults to the efi > firmware included with QEMU. It can be redefined on the "make" command > line. > > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > configure | 19 ------------------- > tests/vm/Makefile.include | 2 ++ > 2 files changed, 2 insertions(+), 19 deletions(-) > > diff --git a/configure b/configure > index 2acc4d1..1c17a0f 100755 > --- a/configure > +++ b/configure > @@ -418,7 +418,6 @@ prefix="/usr/local" > mandir="\${prefix}/share/man" > datadir="\${prefix}/share" > firmwarepath="\${prefix}/share/qemu-firmware" > -efi_aarch64="" > qemu_docdir="\${prefix}/share/doc/qemu" > bindir="\${prefix}/bin" > libdir="\${prefix}/lib" > @@ -1109,8 +1108,6 @@ for opt do > ;; > --firmwarepath=*) firmwarepath="$optarg" > ;; > - --efi-aarch64=*) efi_aarch64="$optarg" > - ;; > --host=*|--build=*|\ > --disable-dependency-tracking|\ > --sbindir=*|--sharedstatedir=*|\ > @@ -3650,20 +3647,6 @@ EOF > fi > fi > > -############################################ > -# efi-aarch64 probe > -# Check for efi files needed by aarch64 VMs. > -# By default we will use the efi included with QEMU. > -# Allow user to override the path for efi also. > -if ! test -f "$efi_aarch64"; then > - if test -f $source_path/pc-bios/edk2-aarch64-code.fd.bz2; then > - # valid after build > - efi_aarch64=$PWD/pc-bios/edk2-aarch64-code.fd > - else > - efi_aarch64="" > - fi > -fi > - > ########################################## > # libcap-ng library probe > if test "$cap_ng" != "no" ; then > @@ -6861,7 +6844,6 @@ if test "$docs" != "no"; then > echo "sphinx-build $sphinx_build" > fi > echo "genisoimage $genisoimage" > -echo "efi_aarch64 $efi_aarch64" > echo "python_yaml $python_yaml" > echo "slirp support $slirp $(echo_version $slirp $slirp_version)" > if test "$slirp" != "no" ; then > @@ -7963,7 +7945,6 @@ echo "PYTHON=$python" >> $config_host_mak > echo "SPHINX_BUILD=$sphinx_build" >> $config_host_mak > echo "SPHINX_WERROR=$sphinx_werror" >> $config_host_mak > echo "GENISOIMAGE=$genisoimage" >> $config_host_mak > -echo "EFI_AARCH64=$efi_aarch64" >> $config_host_mak > echo "PYTHON_YAML=$python_yaml" >> $config_host_mak > echo "CC=$cc" >> $config_host_mak > if $iasl -h > /dev/null 2>&1; then > diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include > index f21948c..29f5a1f 100644 > --- a/tests/vm/Makefile.include > +++ b/tests/vm/Makefile.include > @@ -10,6 +10,8 @@ IMAGES += ubuntu.aarch64 centos.aarch64 > endif > endif > > +EFI_AARCH64 = $(wildcard $(SRC_PATH)/pc-bios/edk2-aarch64-code.fd)
I'm not sure this is correct. Shouldn't we use the '?=' operator to allow override? I think we want to test $(BUILD_DIR)/pc-bios/edk2-aarch64-code.fd instead. > + > IMAGES_DIR := $(HOME)/.cache/qemu-vm/images > IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES)) > >