From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.151; helo=mga17.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 3E2E12194EB70 for ; Thu, 14 Feb 2019 06:29:55 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Feb 2019 06:29:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,369,1544515200"; d="scan'208";a="116194975" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga006.jf.intel.com with ESMTP; 14 Feb 2019 06:29:54 -0800 Received: from fmsmsx155.amr.corp.intel.com (10.18.116.71) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 14 Feb 2019 06:29:54 -0800 Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by FMSMSX155.amr.corp.intel.com (10.18.116.71) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 14 Feb 2019 06:29:53 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.102]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.36]) with mapi id 14.03.0415.000; Thu, 14 Feb 2019 22:29:52 +0800 From: "Gao, Liming" To: "Feng, Bob C" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] BaseTools: Fix the build report issue about Structure PCD Thread-Index: AQHUugypJ/AoiTzduESAqgdeM4XiH6Xfb1rg Date: Thu, 14 Feb 2019 14:29:51 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E3DEB9A@SHSMSX104.ccr.corp.intel.com> References: <20190201090035.31252-1-bob.c.feng@intel.com> In-Reply-To: <20190201090035.31252-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZmIwYzAwOWItNzFkYS00ZGM2LWEzZWMtOGY2MjFkNzQyOWQ2IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiNUVtUGx5MmJteEx0WjRwME13YTBxbjg2Mjg5R3IyWGtIWjI3anF1WkZMbU1UQ3paXC9va3VDdjZoMGJaNm9iVCsifQ== dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] BaseTools: Fix the build report issue about Structure PCD X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Feb 2019 14:29:56 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao > -----Original Message----- > From: Feng, Bob C > Sent: Friday, February 1, 2019 5:01 PM > To: edk2-devel@lists.01.org > Cc: Feng, Bob C ; Gao, Liming > Subject: [Patch] BaseTools: Fix the build report issue about Structure PC= D >=20 > https://bugzilla.tianocore.org/show_bug.cgi?id=3D1472 > build report use incorrect method to parse DynamicDefault/DynamicExDefaul= t > and DynamicVpd/DynamicExVpd structure Pcd value. >=20 > This patch is to fix this issue. >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Bob Feng > Cc: Liming Gao > --- > BaseTools/Source/Python/build/BuildReport.py | 21 +++++++------------- > 1 file changed, 7 insertions(+), 14 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Sou= rce/Python/build/BuildReport.py > index 8d3b030151..64f8a68516 100644 > --- a/BaseTools/Source/Python/build/BuildReport.py > +++ b/BaseTools/Source/Python/build/BuildReport.py > @@ -1109,24 +1109,17 @@ class PcdReport(object): > break > else: > SkuList =3D sorted(Pcd.SkuInfoList.k= eys()) > for Sku in SkuList: > SkuInfo =3D Pcd.SkuInfoList[Sku] > - if TypeName in ('DYNHII', 'DEXHI= I'): > - if SkuInfo.DefaultStoreDict: > - DefaultStoreList =3D sor= ted(SkuInfo.DefaultStoreDict.keys()) > - for DefaultStore in Defa= ultStoreList: > - OverrideValues =3D P= cd.SkuOverrideValues[Sku] > - DscOverride =3D self= .ParseStruct(OverrideValues[DefaultStore]) > - if DscOverride: > - break > - else: > - OverrideValues =3D Pcd.SkuOv= errideValues[Sku] > - if OverrideValues: > - Keys =3D list(OverrideVa= lues.keys()) > - OverrideFieldStruct =3D = self.OverrideFieldValue(Pcd, OverrideValues[Keys[0]]) > - DscOverride =3D self.Par= seStruct(OverrideFieldStruct) > + if SkuInfo.DefaultStoreDict: > + DefaultStoreList =3D sorted(= SkuInfo.DefaultStoreDict.keys()) > + for DefaultStore in DefaultS= toreList: > + OverrideValues =3D Pcd.S= kuOverrideValues[Sku] > + DscOverride =3D self.Par= seStruct(OverrideValues[DefaultStore]) > + if DscOverride: > + break > if DscOverride: > break > if DscOverride: > DscDefaultValue =3D True > DscMatch =3D True > -- > 2.20.1.windows.1