From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web12.412.1610580888677156934 for ; Wed, 13 Jan 2021 15:34:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=upRx9ruW; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: bob.c.feng@intel.com) IronPort-SDR: tZdQ7Fv63Qm1fEMCJ2rGPnNeBbOk5ezYiM2c2eT8+TIGIICt4jC++W3zEx/gv5V5rAwPxRi+l/ WvCx00bsW9Bw== X-IronPort-AV: E=McAfee;i="6000,8403,9863"; a="177506236" X-IronPort-AV: E=Sophos;i="5.79,345,1602572400"; d="scan'208";a="177506236" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jan 2021 15:34:47 -0800 IronPort-SDR: MIoDIVGzhlyAkcd3CssKrFESl1enX/oDCI4CXhdem6m08FV7oN08Ppyb169kwjUKYPIhDOjBpJ qBGL7tbMg6bw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,345,1602572400"; d="scan'208";a="348979965" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orsmga003.jf.intel.com with ESMTP; 13 Jan 2021 15:34:46 -0800 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 13 Jan 2021 15:34:46 -0800 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Wed, 13 Jan 2021 15:34:46 -0800 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.168) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Wed, 13 Jan 2021 15:34:45 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YV1j0NjhmeigDQVtX+8LzN3WX4atibeS4Ju+44RW5Qua3o7GrJ2RXZ/oQ0nvP4Xew8GX2MI0kNf0S9A7JgAgdtqXd3nOuC8H992qZ9i0mq0ubPaMUPiSv7Z8M1waBcApH1ozUgLLQd76wmFNzGoNUbs5XcU491fF+3eFwkbxWwJpgc/x+E/csMCumu1QVknzDBV04s3QEfYw5/30HBrXBuO+sTbf6jDVC7MSjJH9JHDvO5iP5xettNUts+nZmz+j6VJdkYvpf1gsax/Ilp4sI4jynhdoW3sd9/+EqGE20By3hrocrMeUY/zVAPoLqmFxeF2bDFVesSP+BLY3DtOhOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gHvsRwBtpzukQpTRjDu3xg6s9blRakecChED60Sarao=; b=U3J8Spl0S1uCLLjfjot/1ERMFf82ICLXGomUJfeCEJc9Tk41sh7NNQz+Q+1atwLDdzZdngQ+kQUIFtQu9uJAzHgF2DtZpFzb0T+br9c2y68NI1v81GuyCMIEGNKTNN+bupYEmHLVQwvSl1FY4Y/5oxJSc3e4y/JZc/jDQKOtWlBvCG3VAGvhXxXSgn49fjW7BjYF08daSCysQVGUn2dPIrdqCmC1wRKyG+VZKJxbaK9T1v7asQDORQCnc0YhqhYwMywMK1hy7xObVn/KUfMckU4yfC9mTyF66rqoWKiRTHSsSHT7Ijy5707UytNflqsjkGF5iwBe5aOFn9xEJSD5TA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gHvsRwBtpzukQpTRjDu3xg6s9blRakecChED60Sarao=; b=upRx9ruWg1nGrBdf/8ss1h01yR37Y0Em+AwHpWujzwQUXj7Id84ACFVtz65DLENc2vEdNgErHZkQ2Y6JFrPQr8K5hDFLmZJNyj87/ET39V8HTFB7krzQneLtVx3RsSBIw+ucfJmzWni0xpxmtHRXgviWSW2RMTg9sB24vVVJYlg= Received: from DM6PR11MB4073.namprd11.prod.outlook.com (2603:10b6:5:19f::22) by DM6PR11MB3593.namprd11.prod.outlook.com (2603:10b6:5:138::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.9; Wed, 13 Jan 2021 23:34:44 +0000 Received: from DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::845:55b:f6b3:aa0a]) by DM6PR11MB4073.namprd11.prod.outlook.com ([fe80::845:55b:f6b3:aa0a%6]) with mapi id 15.20.3742.012; Wed, 13 Jan 2021 23:34:44 +0000 From: "Bob Feng" To: "devel@edk2.groups.io" , "Feng, Bob C" CC: Liming Gao , "Chen, Christine" Subject: Re: [edk2-devel] [Patch 1/1] BaseTools: Fix the build report crash issue Thread-Topic: [edk2-devel] [Patch 1/1] BaseTools: Fix the build report crash issue Thread-Index: AQHW49LTQ76JZMLH60iWZiANWZ1PCaomQZSg Date: Wed, 13 Jan 2021 23:34:44 +0000 Message-ID: References: <16578345A54B07F9.2692@groups.io> In-Reply-To: <16578345A54B07F9.2692@groups.io> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.102.204.37] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 9e53a3bc-a92b-4e49-fc75-08d8b81bced3 x-ms-traffictypediagnostic: DM6PR11MB3593: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:972; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: XSKz6/8+GLuJBWwnNdt8atM69UsTWSbqKADXXVhiCq9N/9K/gfMRHoL4txqOUZyEsPfI+jDj0+Sph2qnl+65eVX1I1XOxHhS9zwzBgDietW0IClzWgPBFNkmGt5bC8TzZ8WRJOYMMSusmxYYyTnHO3mS+j9+mCiHuCtYZnTQceh1sYy4Jn15uz1xA12Z3fo3uPYdlGJP+S/M62MbGCqmVUmlgJPba3neyHFDZV2NbChcOwJw+vs8HYfnKQqRHzW+PWV3Opx7ihsGa5o2NvtvtKLD9nfxtBmjDM8iW+T7uA1zK+W5gc1rC+qr199lCIGOBioS5YbOFIsL5OAE2wYi9cA/My1OmS8MXK7IzUC78uY6u9ol8glFLI12NKJWAuetaPpiU1Z57CCwhPrQGByYUl2Ra27f3JnhKUnSmcRn3CAcx+n7qFrKEUFXmiJOCyti3y3/JrTqgNTQujk9pm1gIQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR11MB4073.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(346002)(396003)(376002)(39860400002)(366004)(136003)(8676002)(83380400001)(55016002)(4326008)(71200400001)(107886003)(33656002)(2906002)(26005)(9686003)(8936002)(86362001)(478600001)(6506007)(110136005)(316002)(52536014)(66446008)(7696005)(64756008)(53546011)(66476007)(66556008)(54906003)(66946007)(76116006)(5660300002)(186003)(966005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?S8jQyZQoL1Hc3sw3FJuOii78YyXXObFWa0x95ceXnpHI9Erc92XDAyTz9Sgd?= =?us-ascii?Q?/91Ok87ymDaLJbkgZk49J4PYKJRhlcc2Nu5/cyRa/aHFm+p5Lo1N3DAz/5wO?= =?us-ascii?Q?0H99F+wSre8+tlJqn+Er4IBwHpyRfKKT1hhLHP0WjObmufuMR3GacqreVr+J?= =?us-ascii?Q?iuA1/6pxGETpY7ZoQ0kiq40o0TlDhcRtNfpf3HBHIfgxZWE/N1vst4cw75lv?= =?us-ascii?Q?p9gKfQgleskTymj8g5/BOIOPwvoKct9PpZpBmjMr+13tfPa1ITI2eoZ4pAOb?= =?us-ascii?Q?AbZpF4eaV6rXr+fx/PFIzzeNOac7QMbFWt81SaJACkuyK0bubhdoN/GleKnJ?= =?us-ascii?Q?FOy/9bTldYl6g5pcsHCpWW3w4anpcNMvqK2xlyx7TTGynTV3DRpYi3uGrOGB?= =?us-ascii?Q?XWiebEmZz2XG1rMD7dpbqUQIy+BxjjAczTpJTK9PxlucfO77EE2+8Gjrbbdu?= =?us-ascii?Q?YOQS64E2bRc2AkoU51/NfGLF67cbWZiwgW40n5bzfW4/+HaUP+SSwCpNrvj6?= =?us-ascii?Q?2viSddQT5ZxxI4Poz/5NhxGSEPg+XMjtcW7cGxfG3O91DJseaEH9N5BrLcrQ?= =?us-ascii?Q?0leGiEBOYTO/Zi8R+4vpLO+XRoj/IIOoXvMgI4mK42OBMjbWK8qLFqMNVh7v?= =?us-ascii?Q?4Gohtla/r9xBLkSkeuL2678jSliOUyRXPeCwzaFfo+edP4vKM+gzvupLV+U3?= =?us-ascii?Q?1BrNxvWPtRgPO2MN5Xtmg69SCL0YbvDF3DHlF2nXBVW795Lv/PIwBNpuECxG?= =?us-ascii?Q?2uN6PkE/Fu5kaNBrjtolWfOmao1w7t7LDNqfsY2oGCgapTzteK/qkZdO5yIw?= =?us-ascii?Q?QtlTJm4LX2rjTS+aEDu7odEdlR+slXXM3+ytp2rffsnBBnaAlS/CvbdNRxlH?= =?us-ascii?Q?oV2X6vGHUcrXZhhu+Bxcz9taIaOT8bq2kC3TiUVd7/CcoL2KIDsfOfzQBLu4?= =?us-ascii?Q?FPEAnnL62p0CTrod7r99s8vTWL3s3DEP1j2srl2M3Eo=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB4073.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e53a3bc-a92b-4e49-fc75-08d8b81bced3 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Jan 2021 23:34:44.5192 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: pn1U3ihNtQHhN2Tvpi12U7Hm+OFq6T4NSyHclnBG43bR5UYGGCP4lLbfL6mDbd5G6ZXCJ8EKDYwcuPRUiOwd8Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3593 Return-Path: bob.c.feng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Liming, Would you please review this patch? Thanks, Bob -----Original Message----- From: devel@edk2.groups.io On Behalf Of Bob Feng Sent: Wednesday, January 6, 2021 10:22 AM To: devel@edk2.groups.io Cc: Liming Gao ; Chen, Christine Subject: [edk2-devel] [Patch 1/1] BaseTools: Fix the build report crash is= sue In the following corner case, the build report will crash. This patch is t= o fix this problem. Case: Multiple SKU are used and 2 more DynamicHii structure Pcds are set in dsc = file under different SKU. And 1 more of those Pcds are not used in any INF = file. Signed-off-by: Bob Feng Cc: Liming Gao Cc: Yuwei Chen --- BaseTools/Source/Python/build/BuildReport.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Sour= ce/Python/build/BuildReport.py index 3b1add9999d2..468772930ca1 100644 --- a/BaseTools/Source/Python/build/BuildReport.py +++ b/BaseTools/Source/Python/build/BuildReport.py @@ -1123,14 +1123,15 @@ class PcdReport(object): for Sku in SkuList: SkuInfo =3D Pcd.SkuInfoList[S= ku] if SkuInfo.DefaultStoreDict: DefaultStoreList =3D sort= ed(SkuInfo.DefaultStoreDict.keys()) for DefaultStore in Defau= ltStoreList: - OverrideValues =3D Pc= d.SkuOverrideValues[Sku] - DscOverride =3D self.= ParseStruct(OverrideValues[DefaultStore]) - if DscOverride: - break + OverrideValues =3D Pc= d.SkuOverrideValues.get(Sku) + if OverrideValues: + DscOverride =3D s= elf.ParseStruct(OverrideValues[DefaultStore]) + if DscOverride: + break if DscOverride: break if DscOverride: DscDefaultValue =3D True DscMatch =3D True @@ -1386,13 +1387,14 @@= class PcdReport(object): FileWrite(File, ' %-*s : %6s %1= 0s %10s =3D %s' % (self.MaxLen, ' ', TypeName, '(' + Pcd.DatumType + ')', '= (' + DefaultStore + ')', Value)) else: FileWrite(File, ' %-*s : %6s %1= 0s %10s %10s =3D %s' % (self.MaxLen, ' ', TypeName, '(' + Pcd.DatumType + '= )', '(' + SkuIdName + ')', '(' + DefaultStore + ')', Value)) FileWrite(File, '%*s: %s: %s' % (self.MaxLen = + 4, SkuInfo.VariableGuid, SkuInfo.VariableName, SkuInfo.VariableOffset)) if IsStructure: - OverrideValues =3D Pcd.SkuOverrideValues[= Sku] - OverrideFieldStruct =3D self.OverrideFiel= dValue(Pcd, OverrideValues[DefaultStore]) - self.PrintStructureInfo(File, OverrideFie= ldStruct) + OverrideValues =3D Pcd.SkuOverrideValues.= get(Sku) + if OverrideValues: + OverrideFieldStruct =3D self.Override= FieldValue(Pcd, OverrideValues[DefaultStore]) + self.PrintStructureInfo(File,=20 + OverrideFieldStruct) self.PrintPcdDefault(File, Pcd, IsStructure, = DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, DecMatch, DecDefaultV= alue) else: Value =3D SkuInfo.DefaultValue IsByteArray, ArrayList =3D ByteArrayForamt(Value) if Pcd.DatumType =3D=3D 'BOOLEAN': -- 2.29.1.windows.1