From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 38DD2AC0DEB for ; Thu, 3 Aug 2023 11:44:51 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=2xwkboo1dn6LA96Mpph4d5d+0+puk4ouUSEJ/H0q+pU=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1691063089; v=1; b=uppwlY8YupmZB9krr8u7CUC5BIBTDqk13Nvh6wBDc4RbYsdrm961vW84tNxakQOTN6D+CmBl kUxtVy4RF3ZrcBd74KAhdCUlsiUEEI1UX8qL0YHUSin0mT7HanFV7O8YNH7TdHp+IkVCGU1Fmwc 532fkiuJwMAZT58bw/aPGYHk= X-Received: by 127.0.0.2 with SMTP id oGXQYY7687511xgzQ601Lpn0; Thu, 03 Aug 2023 04:44:49 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.12670.1691063089225604767 for ; Thu, 03 Aug 2023 04:44:49 -0700 X-Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-664-h5BLvhFkN3O6mBZ_Lj8kgA-1; Thu, 03 Aug 2023 07:44:45 -0400 X-MC-Unique: h5BLvhFkN3O6mBZ_Lj8kgA-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B8DB63C01BAD; Thu, 3 Aug 2023 11:44:44 +0000 (UTC) X-Received: from osteffen-laptop.redhat.com (unknown [10.39.194.106]) by smtp.corp.redhat.com (Postfix) with ESMTP id DAF5840C1258; Thu, 3 Aug 2023 11:44:42 +0000 (UTC) From: "Oliver Steffen" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Bob Feng , Gerd Hoffmann , Jiewen Yao , Jordan Justen , Liming Gao , Michael D Kinney , Michael Kubacki , Rebecca Cran , Sean Brogan , Yuwei Chen , Laszlo Ersek , Oliver Steffen Subject: [edk2-devel] [PATCH v1 2/4] OvmfPkg/PlatformCI VS2019: Disable workaround for cpuhp bugfix Date: Thu, 3 Aug 2023 13:44:23 +0200 Message-ID: <20230803114425.318246-3-osteffen@redhat.com> In-Reply-To: <20230803114425.318246-1-osteffen@redhat.com> References: <20230803114425.318246-1-osteffen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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,osteffen@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: FGLaKxbLuOVbwb4tWdjYjQzAx7686176AA= Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=uppwlY8Y; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io This reverts commit 3beb8c965455f4c1cc3184e36c627ef1d9bfe5f9. Both Windows and Linux CI jobs are now using Qemu 8, this workaround is no longer needed. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4324 Signed-off-by: Oliver Steffen --- .../PlatformCI/.azurepipelines/Windows-VS2019.yml | 2 +- OvmfPkg/PlatformCI/PlatformBuildLib.py | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml index f7cba193d737..cada81023548 100644 --- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml +++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml @@ -24,7 +24,7 @@ jobs: package: 'OvmfPkg' vm_image: 'windows-2019' should_run: true - run_flags: "MAKE_STARTUP_NSH=TRUE QEMU_HEADLESS=TRUE QEMU_CPUHP_QUIRK=TRUE" + run_flags: "MAKE_STARTUP_NSH=TRUE QEMU_HEADLESS=TRUE" #Use matrix to speed up the build process strategy: diff --git a/OvmfPkg/PlatformCI/PlatformBuildLib.py b/OvmfPkg/PlatformCI/PlatformBuildLib.py index 64fca48a7d1d..c8e805c56616 100644 --- a/OvmfPkg/PlatformCI/PlatformBuildLib.py +++ b/OvmfPkg/PlatformCI/PlatformBuildLib.py @@ -170,7 +170,6 @@ class PlatformBuilder( UefiBuilder, BuildSettingsManager): self.env.SetValue("PRODUCT_NAME", "OVMF", "Platform Hardcoded") self.env.SetValue("MAKE_STARTUP_NSH", "FALSE", "Default to false") self.env.SetValue("QEMU_HEADLESS", "FALSE", "Default to false") - self.env.SetValue("QEMU_CPUHP_QUIRK", "FALSE", "Default to false") return 0 def PlatformPreBuild(self): @@ -211,17 +210,6 @@ class PlatformBuilder( UefiBuilder, BuildSettingsManager): args += " -pflash " + os.path.join(OutputPath_FV, "OVMF.fd") # path to firmware - ### - ### NOTE This is a temporary workaround to allow platform CI to cope with - ### a QEMU bug in the CPU hotplug code. Once the CI environment has - ### been updated to carry a fixed version of QEMU, this can be - ### removed again - ### - ### Bugzilla: https://bugzilla.tianocore.org/show_bug.cgi?id=4250 - ### - if (self.env.GetValue("QEMU_CPUHP_QUIRK").upper() == "TRUE"): - args += " -fw_cfg name=opt/org.tianocore/X-Cpuhp-Bugcheck-Override,string=yes" - if (self.env.GetValue("MAKE_STARTUP_NSH").upper() == "TRUE"): f = open(os.path.join(VirtualDrive, "startup.nsh"), "w") f.write("BOOT SUCCESS !!! \n") -- 2.41.0 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#107535): https://edk2.groups.io/g/devel/message/107535 Mute This Topic: https://groups.io/mt/100524065/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-