From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web10.4619.1622017421562976082 for ; Wed, 26 May 2021 01:23:41 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: ray.ni@intel.com) IronPort-SDR: y0jf5PAbrFyoJBSNfVKrRKIrJBKCpNGr6eFuRdHbmNoTC0YmL06/b0k8wVBuM8xFRFZtlvBlOO 5tIa5MI/c1mQ== X-IronPort-AV: E=McAfee;i="6200,9189,9995"; a="202448804" X-IronPort-AV: E=Sophos;i="5.82,331,1613462400"; d="scan'208";a="202448804" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2021 01:23:41 -0700 IronPort-SDR: YNp8WZgFuIBS9I0qNpQvv+8EPTPBNaYYmrmk/rJAyH7NZeDghL7vlznEZt8V7B+59o56vkKFW5 mw+HDcakvL7A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,331,1613462400"; d="scan'208";a="479780495" Received: from ray-dev.ccr.corp.intel.com ([10.239.158.87]) by fmsmga002.fm.intel.com with ESMTP; 26 May 2021 01:23:39 -0700 From: "Ni, Ray" To: devel@edk2.groups.io Cc: Jian J Wang , Hao A Wu , Dandan Bi , Liming Gao Subject: [PATCH 4/4] PeiCore: Remove assertion when failing to load PE image Date: Wed, 26 May 2021 16:23:10 +0800 Message-Id: <20210526082310.1597-5-ray.ni@intel.com> X-Mailer: git-send-email 2.31.1.windows.1 In-Reply-To: <20210526082310.1597-1-ray.ni@intel.com> References: <20210526082310.1597-1-ray.ni@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable EFI_PEI_LOAD_FILE_PPI is invoked by DxeIpl for loading DxeCore. It's possible that the instance produced by PeiCore fails to load but other instances of EFI_PEI_LOAD_FILE_PPI can load. Signed-off-by: Ray Ni Cc: Jian J Wang Cc: Hao A Wu Cc: Dandan Bi Cc: Liming Gao --- MdeModulePkg/Core/Pei/Image/Image.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/MdeModulePkg/Core/Pei/Image/Image.c b/MdeModulePkg/Core/Pei/Im= age/Image.c index 1d15774527..5af3895191 100644 --- a/MdeModulePkg/Core/Pei/Image/Image.c +++ b/MdeModulePkg/Core/Pei/Image/Image.c @@ -1,7 +1,7 @@ /** @file=0D Pei Core Load Image Support=0D =0D -Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.
=0D +Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.
=0D SPDX-License-Identifier: BSD-2-Clause-Patent=0D =0D **/=0D @@ -661,9 +661,6 @@ PeiLoadImageLoadImage ( &ImageEntryPoint=0D );=0D =0D - ASSERT_EFI_ERROR (Status);=0D -=0D -=0D if (EFI_ERROR (Status)) {=0D return Status;=0D }=0D --=20 2.31.1.windows.1