From nobody Wed May 15 04:00:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+108320+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+108320+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1693993079; cv=none; d=zohomail.com; s=zohoarc; b=JAUe2ooTSM/rMDTswUuea1ZVzW3Vv0350OoTFzg7cqvj2mlw4nSc5YM9aon9AeYsvZpayovo0UZs+SggToMwkmOdRUJMVxl6B71jPmzdnl9lcKgMGeHR7XMitVHsw0JWZuGpBvCpLy6GGi4IZegh34X/mnOfETaSsa7nt96F5WA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693993079; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=NTRsbi8GpDI+NzvI391e6ZHhaHGNH4yGBf7n+xf9mRQ=; b=UI0YpSYdJDwacfozd85EEf1ApMy4oYT8+EhZsuIEwS2d3VU9GvxwAGz3t9p+AzHEpUnNB9sgywpJsFbTfhSjmIvhPj6fjuDx+Tfyfkl/FQ6RVmMhI4v76OlfW30oQxVRG4ZMHwyRBp2XlCewJIDrMjDH7MO5XBqUy4lCcKvILHI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+108320+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 169399307938579.24916537406682; Wed, 6 Sep 2023 02:37:59 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=0ud/4pAvso6GIhhaJZftj3Rm03YIQUNOIB9/db5+gZs=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1693993078; v=1; b=vr2a4nvWTMH/FNbL+JXbarCRiYxzqIEZyna98jn7iklNuVFyzHVWz6MVgB+6u/X6oRv1WcdT JuWQ7mvKoGwMj1gbehGpkPO7I4NrgyCPNhjdFylFK5WlciUOagPrF2sx4yAu7m74ulXiZGIkoQw 67NQyKSIMbX7R9NCuvgVeTEI= X-Received: by 127.0.0.2 with SMTP id IGBoYY1788612xDmLr6na440; Wed, 06 Sep 2023 02:37:58 -0700 X-Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.web11.4609.1693993077767536710 for ; Wed, 06 Sep 2023 02:37:58 -0700 X-Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-402d499580dso18336015e9.1 for ; Wed, 06 Sep 2023 02:37:57 -0700 (PDT) X-Gm-Message-State: cemeCA0wufICKjOQTYyCMftsx1787277AA= X-Google-Smtp-Source: AGHT+IGNoG3QbIxkD837eray8+VW0/ZHVQvGQd3DTXlIfU05J971ew3YK+CetWVa7JwW1MVyEGFoYg== X-Received: by 2002:a7b:c855:0:b0:401:b0f2:88cc with SMTP id c21-20020a7bc855000000b00401b0f288ccmr1920120wml.41.1693993075618; Wed, 06 Sep 2023 02:37:55 -0700 (PDT) X-Received: from PC-OPTI-84.grb.uk.com (host217-40-85-4.in-addr.btopenworld.com. [217.40.85.4]) by smtp.gmail.com with ESMTPSA id hn8-20020a05600ca38800b003fee6e170f9sm19258774wmb.45.2023.09.06.02.37.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 02:37:55 -0700 (PDT) From: "Mike Beaton" To: devel@edk2.groups.io Cc: Rebecca Cran , Ard Biesheuvel , Jiewen Yao , Jordan Justen , Gerd Hoffmann , Mike Beaton Subject: [edk2-devel] [PATCH v3] Revert "OvmfPkg: Update build.sh to allow building OVMF then running QEMU" Date: Wed, 6 Sep 2023 10:37:16 +0100 Message-Id: <20230906093715.1589-1-mjsbeaton@gmail.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,mjsbeaton@gmail.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1693993079679100003 Content-Type: text/plain; charset="utf-8" This reverts commit 173a7a7daaad560cd69e1000faca1d2b91774c46 Fixes https://bugzilla.tianocore.org/show_bug.cgi?id=3D4528 The build.sh qemu option starts the correct qemu executable for the selected architecture (build.sh -a option, or implicit) and uses the correct previou= sly built OVMF image for the selected architecture and build target (build.sh -b option, or implicit). With this revert, the above step will fail if there is no matching previous= ly built OVMF image. This is advantageous over rebuilding each time the build.= sh qemu option is used (as in the reverted commit), because it provides a quick way to run a just-built OVMF image in place, while: a) Starting immediately (saving the time required for a rebuild on each usage, if the VM is started multiple times) b) Preserving the NVRAM contents between multiple runs (i.e. until the image is next rebuilt) Signed-off-by: Mike Beaton --- OvmfPkg/build.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh index b0334fb76e..279f0d099a 100755 --- a/OvmfPkg/build.sh +++ b/OvmfPkg/build.sh @@ -246,11 +246,11 @@ else fi =20 # -# Build the edk2 OvmfPkg +# Run previously built OVMF image for current build options, in place. +# Do not rebuild first, rather allow multiple runs of a previously built +# image to start quickly (without rebuild), and with preserved NVRAM conte= nts +# between runs (until the next rebuild). # -echo Running edk2 build for OvmfPkg$Processor -build -p $PLATFORMFILE $BUILD_OPTIONS -b $BUILDTARGET -t $TARGET_TOOLS -n = $THREADNUMBER -DDEBUG_ON_SERIAL_PORT=3DTRUE - if [[ "$RUN_QEMU" =3D=3D "yes" ]]; then if [[ ! -d $QEMU_FIRMWARE_DIR ]]; then mkdir $QEMU_FIRMWARE_DIR @@ -265,3 +265,10 @@ if [[ "$RUN_QEMU" =3D=3D "yes" ]]; then $QEMU_COMMAND "$@" exit $? fi + +# +# Build the edk2 OvmfPkg +# +echo Running edk2 build for OvmfPkg$Processor +build -p $PLATFORMFILE $BUILD_OPTIONS -b $BUILDTARGET -t $TARGET_TOOLS -n = $THREADNUMBER +exit $? --=20 2.40.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#108320): https://edk2.groups.io/g/devel/message/108320 Mute This Topic: https://groups.io/mt/101189234/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-