From nobody Tue May 14 10:10:47 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+98183+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+98183+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1673272775; cv=none; d=zohomail.com; s=zohoarc; b=W162Lg5v4JBuhiGoYR1qco84WOSr+pOsbNVocjaUf+bUbEeIQkngTnq+QG02Sp/3eXHHw4RZEE5UC88eSqn+WwlLo8H/ey8z4HzovXHwEQa9utnFfhLBxnl9lKitSNCTknKq1bmQZlbJ0jjj7lVADC+8Ic5RoG4kCsfW3moum+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673272775; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=YKiXw3dLzgm32XZZnRfohMdk65FZMT3ayGmrT0QyAG4=; b=KNb+zNhbQxr3MwVn6AiVgNS5dWjC0HksR81qgpmmtQVykku2kVJu8EBO5etmfUO9/OOk8yC0OKXdioK1DuwNf0Nm9+eJJhV+xM3iaI/G/yv79I3F+IcBVPMPJ/ZnBSky2WO61BVwqj/PkFBUYiVKgW3HLjyqmZBKCZtAOgaqzPk= 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+98183+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 1673272775777457.22054868042517; Mon, 9 Jan 2023 05:59:35 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id fOZFYY1788612xZuvZNmUx7R; Mon, 09 Jan 2023 05:59:35 -0800 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web10.72165.1673272772911918638 for ; Mon, 09 Jan 2023 05:59:35 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="306394378" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="306394378" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2023 05:59:34 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="634217671" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="634217671" X-Received: from mxu9-mobl1.ccr.corp.intel.com ([10.255.30.4]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2023 05:59:32 -0800 From: "Min Xu" To: devel@edk2.groups.io Cc: Min M Xu , Laszlo Ersek , Erdem Aktas , James Bottomley , Jiewen Yao , Gerd Hoffmann , Tom Lendacky , Sebastien Boeuf Subject: [edk2-devel] [PATCH V2 1/6] OvmfPkg/AcpiPlatformDxe: Remove QEMU_ACPI_TABLE_NOTIFY_PROTOCOL Date: Mon, 9 Jan 2023 21:59:12 +0800 Message-Id: <20230109135917.1752-2-min.m.xu@intel.com> In-Reply-To: <20230109135917.1752-1-min.m.xu@intel.com> References: <20230109135917.1752-1-min.m.xu@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,min.m.xu@intel.com X-Gm-Message-State: eh0Fk7rlnlOTBeq7iU5goeWRx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1673272775; bh=rFG/BYwbM7ZV6eKLDcPvqHI/0uLLQ0/tHbv01RGuVUg=; h=Cc:Date:From:Reply-To:Subject:To; b=LSLIhRjvq5/Kf+RHRn+GkuT35ByFhMBnp1+qiuPsFnVBqAwXnEWk2MLiS9Vfcmdxjxm r3af6U5tuv0dPfvYi4gVGmiNHmaWRmf1IYSchWmv4/SIEp3SDjRf/0XIcsBprucOAHcSV swEuVeIUGPbgk52t0/66YNH9ePP+FbH5q4Q= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1673272777107100002 Content-Type: text/plain; charset="utf-8" From: Min M Xu BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4237 The QEMU_ACPI_TABLE_NOTIFY_PROTOCOL structure is superfluous because NULL protocol interfaces have been used in edk2 repeatedly. A protocol instance can exist in the protocol database with a NULL associated interface. Therefore the QEMU_ACPI_TABLE_NOTIFY_PROTOCOL type, the "QemuAcpiTableNotify.h" header, and the "mAcpiNotifyProtocol" global variable can be removed. Cc: Laszlo Ersek Cc: Erdem Aktas Cc: James Bottomley Cc: Jiewen Yao Cc: Gerd Hoffmann Cc: Tom Lendacky Cc: Sebastien Boeuf Reported-by: Laszlo Ersek Signed-off-by: Min Xu Reviewed-by: Laszlo Ersek --- OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c | 7 ++--- OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c | 6 ++--- .../Include/Protocol/QemuAcpiTableNotify.h | 27 ------------------- 3 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 OvmfPkg/Include/Protocol/QemuAcpiTableNotify.h diff --git a/OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c b/OvmfPkg/AcpiPlatformDx= e/CloudHvAcpi.c index cbe8bb9b0c75..ad39e4253478 100644 --- a/OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c +++ b/OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c @@ -15,15 +15,12 @@ #include // PcdGet32() #include // GetFirstGuidH= ob(), GetNextGuidHob() #include // gBS - #include #include -#include // QEMU_ACPI_TAB= LE_NOTIFY_PROTOCOL =20 #include "AcpiPlatform.h" =20 -EFI_HANDLE mChAcpiHandle =3D NULL; -QEMU_ACPI_TABLE_NOTIFY_PROTOCOL mChAcpiNotifyProtocol; +EFI_HANDLE mChAcpiHandle =3D NULL; =20 EFI_STATUS EFIAPI @@ -96,7 +93,7 @@ InstallCloudHvTablesTdx ( &mChAcpiHandle, &gQemuAcpiTableNotifyProtocolGuid, EFI_NATIVE_INTERFACE, - &mChAcpiNotifyProtocol + NULL ); =20 return EFI_SUCCESS; diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c b/OvmfPkg/AcpiPlatform= Dxe/QemuFwCfgAcpi.c index c8dee17c13e6..1a3852904df9 100644 --- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c +++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c @@ -19,10 +19,8 @@ #include // QemuFwCfgS3Enabled() #include // gBS =20 -#include #include "AcpiPlatform.h" -EFI_HANDLE mQemuAcpiHandle =3D NULL; -QEMU_ACPI_TABLE_NOTIFY_PROTOCOL mAcpiNotifyProtocol; +EFI_HANDLE mQemuAcpiHandle =3D NULL; =20 // // The user structure for the ordered collection that will track the fw_cfg @@ -1284,7 +1282,7 @@ UninstallAcpiTables: &mQemuAcpiHandle, &gQemuAcpiTableNotifyProtocolGuid, EFI_NATIVE_INTERFACE, - &mAcpiNotifyProtocol + NULL ); } =20 diff --git a/OvmfPkg/Include/Protocol/QemuAcpiTableNotify.h b/OvmfPkg/Inclu= de/Protocol/QemuAcpiTableNotify.h deleted file mode 100644 index a3dd2fc1dc91..000000000000 --- a/OvmfPkg/Include/Protocol/QemuAcpiTableNotify.h +++ /dev/null @@ -1,27 +0,0 @@ -/** @file - - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#ifndef QEMU_ACPI_TABLE_NOTIFY_H_ -#define QEMU_ACPI_TABLE_NOTIFY_H_ - -#define QEMU_ACPI_TABLE_NOTIFY_GUID \ - { 0x928939b2, 0x4235, 0x462f, { 0x95, 0x80, 0xf6, 0xa2, 0xb2, 0xc2, 0x1a= , 0x4f } }; - -/// -/// Forward declaration -/// -typedef struct _QEMU_ACPI_TABLE_NOTIFY_PROTOCOL QEMU_ACPI_TABLE_NOTIFY_PRO= TOCOL; - -/// -/// Protocol structure -/// -struct _QEMU_ACPI_TABLE_NOTIFY_PROTOCOL { - UINT8 Notify; -}; - -extern EFI_GUID gQemuAcpiTableNotifyProtocolGuid; - -#endif --=20 2.29.2.windows.2 -=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 (#98183): https://edk2.groups.io/g/devel/message/98183 Mute This Topic: https://groups.io/mt/96152493/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- From nobody Tue May 14 10:10:47 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+98184+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+98184+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1673272805; cv=none; d=zohomail.com; s=zohoarc; b=N1LE2jM8Wg9acIcsEZx+rVKX1DoY09mFmH+CJViHMkEjoHBz3jlttptjfehdjX5FXWt9NcxhJLqpkqmuRi5vJbAOnis4bDZdyx5nOJroMJiCxBuyVu7TqSa8ICt5xTdZuSka8NgWVZfCjfkRCyqCPqF/3XE4c2g9/xQNcumgsUI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673272805; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=YKnVolUXkFVHXc/FK0LbwnU+753Z/QMeJl7Bpk4P0sY=; b=NcJHXNj4F8PLmAvA+e63A4tX3MGLmIDJwuTo7EjtHBLkUZN4il32qOY8dvzw8Lg+bBLeNudIDi9BT43hc2iM33Bbtespy75569WOFsss4ICljUMgUBMY+TCO701EHaqL4+Ol8S1IqIKvEss63KbEYQs46QqzJWepLu2/nLyygtM= 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+98184+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 1673272805617357.3842996280471; Mon, 9 Jan 2023 06:00:05 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id OCFrYY1788612xMCog2agW5Z; Mon, 09 Jan 2023 06:00:05 -0800 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web10.72183.1673272804664614480 for ; Mon, 09 Jan 2023 06:00:04 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="306394414" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="306394414" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2023 05:59:37 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="634217677" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="634217677" X-Received: from mxu9-mobl1.ccr.corp.intel.com ([10.255.30.4]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2023 05:59:34 -0800 From: "Min Xu" To: devel@edk2.groups.io Cc: Min M Xu , Laszlo Ersek , Erdem Aktas , James Bottomley , Jiewen Yao , Gerd Hoffmann , Tom Lendacky , Sebastien Boeuf Subject: [edk2-devel] [PATCH V2 2/6] OvmfPkg/AcpiPlatformDxe: Use local variable in CloudHvAcpi.c Date: Mon, 9 Jan 2023 21:59:13 +0800 Message-Id: <20230109135917.1752-3-min.m.xu@intel.com> In-Reply-To: <20230109135917.1752-1-min.m.xu@intel.com> References: <20230109135917.1752-1-min.m.xu@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,min.m.xu@intel.com X-Gm-Message-State: YZ2qrlqTqmg4PUdytxPn2bVjx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1673272805; bh=cUaR2LDc78ac4Usqq4t0fkevqvrWLN+9kU/I18fThng=; h=Cc:Date:From:Reply-To:Subject:To; b=seppnfy0Nm2oNR0GG6gAYahUGF4izRnNkL/HdSKuh4RqfaAoJjOHKH1QAGNTClnaop6 RwRd03N4VTT8ImroJW5zlZb1AQiSu3sOkw4umoBBvXk/Qtfve2q2mnJto61W+EcjZkV+F 7tM4dRwM7nHCAOYNdOP+YG8bhP0ewTPr8l4= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1673272807285100001 Content-Type: text/plain; charset="utf-8" From: Min M Xu BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4237 The handle of mChAcpiHandle is not needed for anything, beyond the scope of the InstallCloudHvTablesTdx (). A local variable (ChAcpiHandle) suffices for storing the handle. Cc: Laszlo Ersek Cc: Erdem Aktas Cc: James Bottomley Cc: Jiewen Yao Cc: Gerd Hoffmann Cc: Tom Lendacky Cc: Sebastien Boeuf Reported-by: Laszlo Ersek Signed-off-by: Min Xu --- OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c b/OvmfPkg/AcpiPlatformDx= e/CloudHvAcpi.c index ad39e4253478..d849a59526b5 100644 --- a/OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c +++ b/OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c @@ -20,8 +20,6 @@ =20 #include "AcpiPlatform.h" =20 -EFI_HANDLE mChAcpiHandle =3D NULL; - EFI_STATUS EFIAPI InstallCloudHvTablesTdx ( @@ -30,13 +28,15 @@ InstallCloudHvTablesTdx ( { EFI_STATUS Status; UINTN TableHandle; + EFI_HANDLE ChAcpiHandle; =20 EFI_PEI_HOB_POINTERS Hob; EFI_ACPI_DESCRIPTION_HEADER *CurrentTable; EFI_ACPI_DESCRIPTION_HEADER *DsdtTable; =20 - DsdtTable =3D NULL; - TableHandle =3D 0; + DsdtTable =3D NULL; + TableHandle =3D 0; + ChAcpiHandle =3D NULL; =20 Hob.Guid =3D (EFI_HOB_GUID_TYPE *)GetFirstGuidHob (&gUefiOvmfPkgTdxAcpiH= obGuid); =20 @@ -90,7 +90,7 @@ InstallCloudHvTablesTdx ( // ready. // gBS->InstallProtocolInterface ( - &mChAcpiHandle, + &ChAcpiHandle, &gQemuAcpiTableNotifyProtocolGuid, EFI_NATIVE_INTERFACE, NULL --=20 2.29.2.windows.2 -=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 (#98184): https://edk2.groups.io/g/devel/message/98184 Mute This Topic: https://groups.io/mt/96152529/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- From nobody Tue May 14 10:10:47 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+98185+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+98185+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1673272806; cv=none; d=zohomail.com; s=zohoarc; b=kYdwI+hz6FTVc0bYkdpywpZXukA7pDBojb075gDnq8O1zftC73zedIFzTzhRNZDtSRormAij9JpQIDPQPPUTwGvhFDETgyOFHjiuOVIFUlid3UAIkSc6ktbvPHhYgeGLNl1SGQRI4HQitvbx/ZVscHu2806R0nPffjnVFsxtpm8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673272806; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=uCJwm9lGxCghoefWSPAblxepwTUq7kUAh3aGnaLzmJM=; b=lFrwLCQEToicW/8ijjE0XW/ysuFbrlOkton9cT7nTTAA4v0HcUYz/cF4W8gvFd91GlGkMDJyfSqTTC1etIQp3akGfsEoftFxFeefNzS7pbcN9yqOWySHWOLeHtNAPqzeYZxrmkuZW4flVJ92D88mSbTUJCSqK11lC9bpv5hI1Vo= 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+98185+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 1673272806547917.842255505759; Mon, 9 Jan 2023 06:00:06 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id N57yYY1788612xdR15kNNPdL; Mon, 09 Jan 2023 06:00:05 -0800 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web10.72183.1673272804664614480 for ; Mon, 09 Jan 2023 06:00:05 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="306394421" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="306394421" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2023 05:59:39 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="634217681" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="634217681" X-Received: from mxu9-mobl1.ccr.corp.intel.com ([10.255.30.4]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2023 05:59:37 -0800 From: "Min Xu" To: devel@edk2.groups.io Cc: Min M Xu , Laszlo Ersek , Erdem Aktas , James Bottomley , Jiewen Yao , Gerd Hoffmann , Tom Lendacky Subject: [edk2-devel] [PATCH V2 3/6] OvmfPkg/AcpiPlatformDxe: Use local variable in QemuFwCfgAcpi.c Date: Mon, 9 Jan 2023 21:59:14 +0800 Message-Id: <20230109135917.1752-4-min.m.xu@intel.com> In-Reply-To: <20230109135917.1752-1-min.m.xu@intel.com> References: <20230109135917.1752-1-min.m.xu@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,min.m.xu@intel.com X-Gm-Message-State: EtivQMDXVDtbEBiUAp85thCox1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1673272805; bh=XbBmUkOkIFcowXbNJZDEj4Z/qbHCPLTdONtHQVJ3Q6M=; h=Cc:Date:From:Reply-To:Subject:To; b=XXYusz0UTDjTbueNQzQU2kKh+naXDGA7yx6mHU1VwY4q3uC8txy4pK1bpcNVVqnDvLF uFCcBWiHNRZE5lSe221xxsF+bFM8Pb9PRi7FwPebQT7DQijoXgBUeHqKq6CS/eSnyyuTW 53xKIssPmTju5WmH83hV0h9fknce6wFzd6s= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1673272807291100002 Content-Type: text/plain; charset="utf-8" From: Min M Xu BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4237 The handle of mQemuAcpiHandle is not needed for anything, beyond the scope of the InstallQemuFwCfgTables(). So a local variable will suffice for storing the handle. Cc: Laszlo Ersek Cc: Erdem Aktas Cc: James Bottomley Cc: Jiewen Yao Cc: Gerd Hoffmann Cc: Tom Lendacky Reported-by: Laszlo Ersek Signed-off-by: Min Xu Reviewed-by: Laszlo Ersek --- OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c b/OvmfPkg/AcpiPlatform= Dxe/QemuFwCfgAcpi.c index 1a3852904df9..693cb8c8a83e 100644 --- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c +++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c @@ -20,7 +20,6 @@ #include // gBS =20 #include "AcpiPlatform.h" -EFI_HANDLE mQemuAcpiHandle =3D NULL; =20 // // The user structure for the ordered collection that will track the fw_cfg @@ -1101,6 +1100,9 @@ InstallQemuFwCfgTables ( ORDERED_COLLECTION_ENTRY *TrackerEntry, *TrackerEntry2; ORDERED_COLLECTION *SeenPointers; ORDERED_COLLECTION_ENTRY *SeenPointerEntry, *SeenPointerEntry2; + EFI_HANDLE QemuAcpiHandle; + + QemuAcpiHandle =3D NULL; =20 Status =3D QemuFwCfgFindFile ("etc/table-loader", &FwCfgItem, &FwCfgSize= ); if (EFI_ERROR (Status)) { @@ -1279,7 +1281,7 @@ UninstallAcpiTables: // ready. // gBS->InstallProtocolInterface ( - &mQemuAcpiHandle, + &QemuAcpiHandle, &gQemuAcpiTableNotifyProtocolGuid, EFI_NATIVE_INTERFACE, NULL --=20 2.29.2.windows.2 -=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 (#98185): https://edk2.groups.io/g/devel/message/98185 Mute This Topic: https://groups.io/mt/96152530/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- From nobody Tue May 14 10:10:47 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+98186+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+98186+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1673272807; cv=none; d=zohomail.com; s=zohoarc; b=Il8K4issWyIi0f/8rkRhBYtyqmsPEFQ8s9qI+dGo3wiHXTFTsHspDjHH5MTV96aluYW+028A4vCwq7v84eisaMMu39m82ZX2r8SzwiV4A547TDzoOakRpZ7+JtgAY6PBbsmcL/vOHgq/vIg8GR8XYlw3jhwT3e9P5fVPA8ULb2A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673272807; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=OVigvii/pq6MqkQteDookf8pKnjR74tg02cgJ1u+3Vk=; b=i5K/61mHOiCiQDgEZL4qv1BQq70VIL6mTn+g0iLPFlMpP4R+AYCbW3Ulqi9QKDyGb3dSToBuRf43ctiidN8+sz0Zsucv/6rd2OJ2HbCWgVSarhq80AUy7bosuH7tem8UeqSsUghYg3rOYNKqynD9HzhZtAuGIfqPCtCxBxKPfkA= 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+98186+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 1673272807205645.4516667207716; Mon, 9 Jan 2023 06:00:07 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 4LVQYY1788612x0lF2GcnQNh; Mon, 09 Jan 2023 06:00:06 -0800 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web10.72183.1673272804664614480 for ; Mon, 09 Jan 2023 06:00:05 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="306394430" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="306394430" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2023 05:59:42 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="634217695" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="634217695" X-Received: from mxu9-mobl1.ccr.corp.intel.com ([10.255.30.4]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2023 05:59:40 -0800 From: "Min Xu" To: devel@edk2.groups.io Cc: Min M Xu , Laszlo Ersek , Erdem Aktas , James Bottomley , Jiewen Yao , Gerd Hoffmann , Tom Lendacky Subject: [edk2-devel] [PATCH V2 4/6] OvmfPkg/AcpiPlatformDxe: Add log to show the installed tables Date: Mon, 9 Jan 2023 21:59:15 +0800 Message-Id: <20230109135917.1752-5-min.m.xu@intel.com> In-Reply-To: <20230109135917.1752-1-min.m.xu@intel.com> References: <20230109135917.1752-1-min.m.xu@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,min.m.xu@intel.com X-Gm-Message-State: 2fdpv35DDFlmoZxiXA4moexLx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1673272806; bh=9ZA+CygQBD+i70XUDsilhwmUNwAxTr1d4KAoBiQ2oC0=; h=Cc:Date:From:Reply-To:Subject:To; b=G6spzQ8YvY8wKA3KApWr4Dm67BQErnqRA6foBiwumvC0OKXxCOf0LXaoIpO7RaJs/61 FFdZlI7LKuaoWh+yIfTOUuBQP4Sht6ZwG9V5Ir3kS/cNeITTAhdnIiHkX5zfo9XYClvMY Y/VHLmjGFZe7hfMbAhJBrpbjY6VB2zNoEa8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1673272809259100010 Content-Type: text/plain; charset="utf-8" From: Min M Xu BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4237 Commit 9fdc70af6ba8 wrongly removed the log from InstallQemuFwCfgTables after ACPI tables are successfully installed. This patch add the log back after all operations succeed. Cc: Laszlo Ersek Cc: Erdem Aktas Cc: James Bottomley Cc: Jiewen Yao Cc: Gerd Hoffmann Cc: Tom Lendacky Reported-by: Laszlo Ersek Signed-off-by: Min Xu Reviewed-by: Laszlo Ersek --- OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c b/OvmfPkg/AcpiPlatform= Dxe/QemuFwCfgAcpi.c index 693cb8c8a83e..f27a95957f47 100644 --- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c +++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c @@ -1266,6 +1266,8 @@ InstallQemuFwCfgTables ( S3Context =3D NULL; } =20 + DEBUG ((DEBUG_INFO, "%a: installed %d tables\n", __FUNCTION__, Installed= )); + UninstallAcpiTables: if (EFI_ERROR (Status)) { // --=20 2.29.2.windows.2 -=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 (#98186): https://edk2.groups.io/g/devel/message/98186 Mute This Topic: https://groups.io/mt/96152532/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- From nobody Tue May 14 10:10:47 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+98187+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+98187+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1673272807; cv=none; d=zohomail.com; s=zohoarc; b=UryuuebRflu2UjBQN31TB+PLYBhHv+NrVtZGoMlUMtiHkKRBYKObbb7MBVzdcOjYr9EnBsYjkO2Dr7X8L7Z0fPusaxjCP7Gf8ahxO9hdl/4b8rfgMjtMKwmFg/3V7MVCB/mfiNg0/d84cr40HYcicLFUn/pyzVzMYOhzzOhl2Ew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673272807; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=drgVLYzSGtFv9vjkwcPncGUMK6gj84KuhyQjvkJkrMA=; b=L3uPcVEL3tjNdGygmu7dENJ5nb2uYFT/lmPQH08+qRlLu1rz8iu92mEm8xJ9VJtFdT6iMgcF/D6OlG8xk89o0oTX4ch7qxn1vkZYyDr4OvZsJ5tzYO9/dA6F7g8vS1UyuAJNcwoT3h0qJmMwsFOinwG5bL9NHSUetMeSFy44EQA= 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+98187+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 16732728072191018.5211700372497; Mon, 9 Jan 2023 06:00:07 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id oxnEYY1788612xHrlskFZHKG; Mon, 09 Jan 2023 06:00:06 -0800 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web10.72183.1673272804664614480 for ; Mon, 09 Jan 2023 06:00:06 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="306394437" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="306394437" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2023 05:59:44 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="634217702" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="634217702" X-Received: from mxu9-mobl1.ccr.corp.intel.com ([10.255.30.4]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2023 05:59:42 -0800 From: "Min Xu" To: devel@edk2.groups.io Cc: Min M Xu , Laszlo Ersek , Erdem Aktas , James Bottomley , Jiewen Yao , Gerd Hoffmann , Tom Lendacky Subject: [edk2-devel] [PATCH V2 5/6] OvmfPkg/AcpiPlatformDxe: Refactor QemuAcpiTableNotifyProtocol Date: Mon, 9 Jan 2023 21:59:16 +0800 Message-Id: <20230109135917.1752-6-min.m.xu@intel.com> In-Reply-To: <20230109135917.1752-1-min.m.xu@intel.com> References: <20230109135917.1752-1-min.m.xu@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,min.m.xu@intel.com X-Gm-Message-State: K5EsrX89tT570cOiQiwedWxSx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1673272806; bh=/Vvpioap8kD7pF4admWNZJAJPZjLSLvhCzSjjUpN9iY=; h=Cc:Date:From:Reply-To:Subject:To; b=nfebf24ZF3GVQGp1PIbCr8PnBejZH1nQGydUDYbP8HbyLVgKi6yB/EOV/LxI8idN3CP 2qfVY1RXd4lGlnefgp5atep68dyy6xrD3vAVKYufQN6onePZ8RMQOyrngWoibuqikdsoy TexwXb6JZ2UjR5NUE2MMJAD+NBkPenBQUYg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1673272809292100014 Content-Type: text/plain; charset="utf-8" From: Min M Xu BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4237 Commit 9fdc70af6ba8 install the QemuAcpiTableNotifyProtocol at a wrong positioin. It should be called before TransferS3ContextToBootScript because TransferS3ContextToBootScript is the last operation in InstallQemuFwCfgTables(). Another error is that we should check the returned value after installing the QemuAcpiTableNotifyProtocol. This patch refactors the installation and error handling of QemuAcpiTableNotifyProtocol in InstallQemuFwCfgTables (). Cc: Laszlo Ersek Cc: Erdem Aktas Cc: James Bottomley Cc: Jiewen Yao Cc: Gerd Hoffmann Cc: Tom Lendacky Reported-by: Laszlo Ersek Signed-off-by: Min Xu --- OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c | 36 ++++++++++++++++--------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c b/OvmfPkg/AcpiPlatform= Dxe/QemuFwCfgAcpi.c index f27a95957f47..14ae13055a30 100644 --- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c +++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c @@ -1249,6 +1249,20 @@ InstallQemuFwCfgTables ( } } =20 + // + // Install a protocol to notify that the ACPI table provided by Qemu is + // ready. + // + Status =3D gBS->InstallProtocolInterface ( + &QemuAcpiHandle, + &gQemuAcpiTableNotifyProtocolGuid, + EFI_NATIVE_INTERFACE, + NULL + ); + if (EFI_ERROR (Status)) { + goto UninstallAcpiTables; + } + // // Translating the condensed QEMU_LOADER_WRITE_POINTER commands to ACPI = S3 // Boot Script opcodes has to be the last operation in this function, be= cause @@ -1257,7 +1271,7 @@ InstallQemuFwCfgTables ( if (S3Context !=3D NULL) { Status =3D TransferS3ContextToBootScript (S3Context); if (EFI_ERROR (Status)) { - goto UninstallAcpiTables; + goto UninstallQemuAcpiTableNotifyProtocol; } =20 // @@ -1268,6 +1282,15 @@ InstallQemuFwCfgTables ( =20 DEBUG ((DEBUG_INFO, "%a: installed %d tables\n", __FUNCTION__, Installed= )); =20 +UninstallQemuAcpiTableNotifyProtocol: + if (EFI_ERROR (Status)) { + gBS->UninstallProtocolInterface ( + QemuAcpiHandle, + &gQemuAcpiTableNotifyProtocolGuid, + NULL + ); + } + UninstallAcpiTables: if (EFI_ERROR (Status)) { // @@ -1277,17 +1300,6 @@ UninstallAcpiTables: --Installed; AcpiProtocol->UninstallAcpiTable (AcpiProtocol, InstalledKey[Install= ed]); } - } else { - // - // Install a protocol to notify that the ACPI table provided by Qemu is - // ready. - // - gBS->InstallProtocolInterface ( - &QemuAcpiHandle, - &gQemuAcpiTableNotifyProtocolGuid, - EFI_NATIVE_INTERFACE, - NULL - ); } =20 for (SeenPointerEntry =3D OrderedCollectionMin (SeenPointers); --=20 2.29.2.windows.2 -=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 (#98187): https://edk2.groups.io/g/devel/message/98187 Mute This Topic: https://groups.io/mt/96152533/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- From nobody Tue May 14 10:10:47 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+98188+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+98188+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1673272808; cv=none; d=zohomail.com; s=zohoarc; b=XOuEUUW8YlVq/BLT1ljQYliwZiK+a6+Tva51AOnQXl4ynq8hfYswla5e7I0nXOkNwzxui3smgaYkXBwVO5iUsaAdJEIxv5iTZgt6X6svvL+p598oB0R3O9IjpVcW2eYWTBPMf4u4HFW4pZawEMpuuqDGVLD2lIegeByyY/E4lW0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673272808; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=kdZmIkO+oemTCr8DScGgEeTgJvFLUyhmDOLRxuNEs6o=; b=ir1tTaLF6jBvikcwpGylOaE5bn6zxZp3ZA9i1FkmKde31APxgfppZHUmt36mLU8N/kgnCWRnoHef+A4PHPbmywkWkrj8Z8KhWbgk+Z0N3YYxLv9N8MQR3xdfI74etwfCNcxOFTdaR/J8Er/bUlrTzd822QwSIV+AboEsA3Lg5Qc= 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+98188+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 1673272808569929.6128105492662; Mon, 9 Jan 2023 06:00:08 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id JeHVYY1788612xUmkQIEiZ2i; Mon, 09 Jan 2023 06:00:07 -0800 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web10.72183.1673272804664614480 for ; Mon, 09 Jan 2023 06:00:06 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="306394445" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="306394445" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2023 05:59:47 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="634217706" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="634217706" X-Received: from mxu9-mobl1.ccr.corp.intel.com ([10.255.30.4]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2023 05:59:44 -0800 From: "Min Xu" To: devel@edk2.groups.io Cc: Min M Xu , Erdem Aktas , James Bottomley , Jiewen Yao , Gerd Hoffmann , Tom Lendacky , Sebastien Boeuf Subject: [edk2-devel] [PATCH V2 6/6] OvmfPkg/AcpiPlatformDxe: Return error if installing NotifyProtocol failed Date: Mon, 9 Jan 2023 21:59:17 +0800 Message-Id: <20230109135917.1752-7-min.m.xu@intel.com> In-Reply-To: <20230109135917.1752-1-min.m.xu@intel.com> References: <20230109135917.1752-1-min.m.xu@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,min.m.xu@intel.com X-Gm-Message-State: URtkdFwvpbKR8OOAGEte3iYfx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1673272807; bh=VeKxW00VaQCbfZ5LmBOcnrO9Ye1Sko4WMR23zk3+cxo=; h=Cc:Date:From:Reply-To:Subject:To; b=j9GYTLV4fK7kZezwX7WC/ojEtOfilB5769sR8e6VHmqHCTECdDHGEEqu6rbnmcEaTM8 jENVMc7KBJAV+2hYv4yzLjtU0BcwSZ9ztDbc4L+kmhD3L+H8AzcJuHt6g3cWkp3KCN3Jn +u07CDNTlVsTAS060BmyOl5a+PCySk/YYKw= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1673272809288100013 Content-Type: text/plain; charset="utf-8" From: Min M Xu BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4237 Installation of gQemuAcpiTableNotifyProtocol may fail. The error code should be returned so that the caller can handle it. Cc: Erdem Aktas Cc: James Bottomley Cc: Jiewen Yao Cc: Gerd Hoffmann Cc: Tom Lendacky Cc: Sebastien Boeuf Signed-off-by: Min Xu Reported-by: Laszlo Ersek --- OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c b/OvmfPkg/AcpiPlatformDx= e/CloudHvAcpi.c index d849a59526b5..98e4f02203d8 100644 --- a/OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c +++ b/OvmfPkg/AcpiPlatformDxe/CloudHvAcpi.c @@ -89,12 +89,16 @@ InstallCloudHvTablesTdx ( // Install a protocol to notify that the ACPI table provided by CH is // ready. // - gBS->InstallProtocolInterface ( - &ChAcpiHandle, - &gQemuAcpiTableNotifyProtocolGuid, - EFI_NATIVE_INTERFACE, - NULL - ); + Status =3D gBS->InstallProtocolInterface ( + &ChAcpiHandle, + &gQemuAcpiTableNotifyProtocolGuid, + EFI_NATIVE_INTERFACE, + NULL + ); + if (EFI_ERROR (Status)) { + ASSERT_EFI_ERROR (Status); + return Status; + } =20 return EFI_SUCCESS; } --=20 2.29.2.windows.2 -=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 (#98188): https://edk2.groups.io/g/devel/message/98188 Mute This Topic: https://groups.io/mt/96152534/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-