From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BBA5C433DF for ; Fri, 7 Aug 2020 13:07:38 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 56392221E2 for ; Fri, 7 Aug 2020 13:07:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Hn48uD0A" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 56392221E2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k425x-0005Yr-In for qemu-devel@archiver.kernel.org; Fri, 07 Aug 2020 09:07:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k425H-00059L-HV for qemu-devel@nongnu.org; Fri, 07 Aug 2020 09:06:55 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:57360 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k425F-0003hn-QM for qemu-devel@nongnu.org; Fri, 07 Aug 2020 09:06:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596805612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=LyrouOhP/W4YWMuhMM8jCR+yciv1oG1rPHrhhFlP67Y=; b=Hn48uD0AJvyAibH3aYFrCCSmYGZIktmJMu6SsBtrkKlHpBk4TA474pxjhqnsUZo9Ax4f5G YdV19dRuEW5rYXXYHDfWQeaA6zFOrYtRnGptOyDayxMRo9uIL4k6g85wrISNQ5QTndMgCY Mp8zERtlO+bJDMkhTUlDIi03s4hZpDQ= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-312-oDlUe4n2MeextPKvM4S2sg-1; Fri, 07 Aug 2020 09:06:51 -0400 X-MC-Unique: oDlUe4n2MeextPKvM4S2sg-1 Received: by mail-wm1-f70.google.com with SMTP id s4so661365wmh.1 for ; Fri, 07 Aug 2020 06:06:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:autocrypt:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=LyrouOhP/W4YWMuhMM8jCR+yciv1oG1rPHrhhFlP67Y=; b=A8Zj2m86JkpDovDythV0MJxjw5c/ic9Yv/t0ViT1yYBNVypW63eZ6sN4G7ERr0xbMZ 8Zg9v0my2eUVB18yJ3vXFCRF7G9sjQ94QPTcOgv+uCKtcV2TB0HbKVIi/uG6bUZCh9Cb eqLSu0oQA3fcfmZGIYspyUMPMvlu0H0rFoCJWS9tf9PVePgCinKLFmAEL8TIiT+PTIrT ERqmMf37IQtSQ0QybNwfCkP52+qLzBBUL6XDOIOxAYPit/9bXXXPdmaPvRHMA6xuhGOq H6GUZC1m9uNylRVxUBcKUpbXpRPuqe5UM46/mLLLGT0sUfa3SPIbcWtPG/PKBMkXQdU2 x7cg== X-Gm-Message-State: AOAM5338p+sIiEnM4doSb8KuRrk29qRPbVMzZJY4SDmdidEceIgUHX8g qCVsF1vReX+fNgnIUseXHB+Y1ORERz1nE9m1yIjXnebHzPV5Pu8AxWSNY+JU6RDJ8FqAfV6mHlU 7Y8cy2KePiMbmfhk= X-Received: by 2002:adf:e550:: with SMTP id z16mr12066820wrm.329.1596805609621; Fri, 07 Aug 2020 06:06:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxfCFsk5JuaSMCeyy8CTHzEAZv2qFgD4Dpx9FvK3xR6X8QFzUXG7G74YwYMjAIX/vCLCsl02A== X-Received: by 2002:adf:e550:: with SMTP id z16mr12066799wrm.329.1596805609355; Fri, 07 Aug 2020 06:06:49 -0700 (PDT) Received: from [192.168.1.36] (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id k4sm11215072wrd.72.2020.08.07.06.06.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 07 Aug 2020 06:06:48 -0700 (PDT) Subject: Re: [PATCH 007/143] tests/vm: do not pollute configure with --efi-aarch64 To: Paolo Bonzini , qemu-devel@nongnu.org References: <1596741379-12902-1-git-send-email-pbonzini@redhat.com> <1596741379-12902-8-git-send-email-pbonzini@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Autocrypt: addr=philmd@redhat.com; keydata= mQINBDXML8YBEADXCtUkDBKQvNsQA7sDpw6YLE/1tKHwm24A1au9Hfy/OFmkpzo+MD+dYc+7 bvnqWAeGweq2SDq8zbzFZ1gJBd6+e5v1a/UrTxvwBk51yEkadrpRbi+r2bDpTJwXc/uEtYAB GvsTZMtiQVA4kRID1KCdgLa3zztPLCj5H1VZhqZsiGvXa/nMIlhvacRXdbgllPPJ72cLUkXf z1Zu4AkEKpccZaJspmLWGSzGu6UTZ7UfVeR2Hcc2KI9oZB1qthmZ1+PZyGZ/Dy+z+zklC0xl XIpQPmnfy9+/1hj1LzJ+pe3HzEodtlVA+rdttSvA6nmHKIt8Ul6b/h1DFTmUT1lN1WbAGxmg CH1O26cz5nTrzdjoqC/b8PpZiT0kO5MKKgiu5S4PRIxW2+RA4H9nq7nztNZ1Y39bDpzwE5Sp bDHzd5owmLxMLZAINtCtQuRbSOcMjZlg4zohA9TQP9krGIk+qTR+H4CV22sWldSkVtsoTaA2 qNeSJhfHQY0TyQvFbqRsSNIe2gTDzzEQ8itsmdHHE/yzhcCVvlUzXhAT6pIN0OT+cdsTTfif MIcDboys92auTuJ7U+4jWF1+WUaJ8gDL69ThAsu7mGDBbm80P3vvUZ4fQM14NkxOnuGRrJxO qjWNJ2ZUxgyHAh5TCxMLKWZoL5hpnvx3dF3Ti9HW2dsUUWICSQARAQABtDJQaGlsaXBwZSBN YXRoaWV1LURhdWTDqSAoUGhpbCkgPHBoaWxtZEByZWRoYXQuY29tPokCVQQTAQgAPwIbDwYL CQgHAwIGFQgCCQoLBBYCAwECHgECF4AWIQSJweePYB7obIZ0lcuio/1u3q3A3gUCXsfWwAUJ KtymWgAKCRCio/1u3q3A3ircD/9Vjh3aFNJ3uF3hddeoFg1H038wZr/xi8/rX27M1Vj2j9VH 0B8Olp4KUQw/hyO6kUxqkoojmzRpmzvlpZ0cUiZJo2bQIWnvScyHxFCv33kHe+YEIqoJlaQc JfKYlbCoubz+02E2A6bFD9+BvCY0LBbEj5POwyKGiDMjHKCGuzSuDRbCn0Mz4kCa7nFMF5Jv piC+JemRdiBd6102ThqgIsyGEBXuf1sy0QIVyXgaqr9O2b/0VoXpQId7yY7OJuYYxs7kQoXI 6WzSMpmuXGkmfxOgbc/L6YbzB0JOriX0iRClxu4dEUg8Bs2pNnr6huY2Ft+qb41RzCJvvMyu gS32LfN0bTZ6Qm2A8ayMtUQgnwZDSO23OKgQWZVglGliY3ezHZ6lVwC24Vjkmq/2yBSLakZE 6DZUjZzCW1nvtRK05ebyK6tofRsx8xB8pL/kcBb9nCuh70aLR+5cmE41X4O+MVJbwfP5s/RW 9BFSL3qgXuXso/3XuWTQjJJGgKhB6xXjMmb1J4q/h5IuVV4juv1Fem9sfmyrh+Wi5V1IzKI7 RPJ3KVb937eBgSENk53P0gUorwzUcO+ASEo3Z1cBKkJSPigDbeEjVfXQMzNt0oDRzpQqH2vp apo2jHnidWt8BsckuWZpxcZ9+/9obQ55DyVQHGiTN39hkETy3Emdnz1JVHTU0Q== Message-ID: <034b45cb-8b41-377d-778e-fec813357b2f@redhat.com> Date: Fri, 7 Aug 2020 15:06:47 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <1596741379-12902-8-git-send-email-pbonzini@redhat.com> Content-Language: en-US Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=205.139.110.120; envelope-from=philmd@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/07 04:00:03 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 > --- > 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)) > >