From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (NAM10-MW2-obe.outbound.protection.outlook.com [40.107.94.49]) by mx.groups.io with SMTP id smtpd.web09.405.1650294065801575038 for ; Mon, 18 Apr 2022 08:01:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@amd.com header.s=selector1 header.b=ONjzjnqS; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.107.94.49, mailfrom: thomas.lendacky@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cXI52eNuV44vH3Z6pWxQk1onC6/eG/jaeOQjoZZLTpaVqQesKxttPA2g7hv28nP9Shf3I2MZn4aep/wGDgV5vgqDn2Ecvo4S1dibI2VZxEX5o+0bb7oC1BunJ9Pt8jttigGWB7Pnp2r3R8nqhpepkKUGYisoUO/iSmsccoMBeNj1nGVpNL8B1CYrUJsKJ4BhBbh6f9X+YUqkv5i4sRjT4xq+nKU7qoZCLilxZJnPga9Wlv0F/1ewvlZdVWD+fFiHq5mTuWyz2qTHrWh0reZ/CF5Mx/v+hHEYTD9FlOehoEQzTH2O9cU7C3jaC/3rcBm6lsy2ezunr/BqYAu/YufOUw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=IJfbXkOna/5cJ4ySMaFGoCvzVul4QKcOBv7OUcf45os=; b=Tx7tTEbGOAO4nHtR9LbG0jBETBuhd6xz0f3PcNehhR3BWtBWpDP/AUFX9ZQ83NK1tsX2xUtgmuF4JGd2rbwHV5rGV0tfYy2nNuPb4JH1sVgD9gTqN5IiTSNTKdUEczkQ198kBd1i2iuRrMvd9awAUSeOuSWZQWHU+BLs3HenMCdrjdodpQEF/tx5putIrLwEiY3qeibgVPtkalmHMyJjBfFqI1K6/r3StCNuOrLiNIJncwLCPo5mgjJwWTMdTbaLMq1avx8Pj44wbbVW4vtzZ1HY2GcWNRjbqXtGQK3FZmbHzNNACzRLvAZArMI0lppH/6sAZnVYPIVw7MCd7L1SoA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IJfbXkOna/5cJ4ySMaFGoCvzVul4QKcOBv7OUcf45os=; b=ONjzjnqSO4c7WYh+nOxuJ7+CWmGZHSNXxQi9EDnQC32HOStebp+PCbtlEqTzQI4TYUUZIYtPhykl1NiUNNHLLzngWsIu+cuqSUmHcJ9Kwp8EiuWoAwGOo5aFa20actbscnvZtDWAXxEtTDSYLAcYuDbsInE/61EXMYcl8m4LkFQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=amd.com; Received: from DM4PR12MB5229.namprd12.prod.outlook.com (2603:10b6:5:398::12) by SA0PR12MB4432.namprd12.prod.outlook.com (2603:10b6:806:98::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20; Mon, 18 Apr 2022 15:01:03 +0000 Received: from DM4PR12MB5229.namprd12.prod.outlook.com ([fe80::781d:15d6:8f63:a4e7]) by DM4PR12MB5229.namprd12.prod.outlook.com ([fe80::781d:15d6:8f63:a4e7%5]) with mapi id 15.20.5164.025; Mon, 18 Apr 2022 15:01:03 +0000 Message-ID: <4c110e74-8346-6e96-ec34-4a58fcdcb855@amd.com> Date: Mon, 18 Apr 2022 10:01:00 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH V3 5/7] OvmfPkg: Add CcProbeLib in *.dsc To: Min Xu , devel@edk2.groups.io Cc: James Bottomley , James Bottomley , Jiewen Yao , Gerd Hoffmann , Erdem Aktas References: <096c8e5825b643a323c8856dfdf3e231b31d6731.1650163941.git.min.m.xu@intel.com> From: "Lendacky, Thomas" In-Reply-To: <096c8e5825b643a323c8856dfdf3e231b31d6731.1650163941.git.min.m.xu@intel.com> X-ClientProxiedBy: MN2PR06CA0003.namprd06.prod.outlook.com (2603:10b6:208:23d::8) To DM4PR12MB5229.namprd12.prod.outlook.com (2603:10b6:5:398::12) Return-Path: Thomas.Lendacky@amd.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 88deb448-7546-4dd8-40cb-08da214c41c2 X-MS-TrafficTypeDiagnostic: SA0PR12MB4432:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KQNmd/oUx6Azr6Sir/6yGZFKgQfQ75hyr3qvE29DuYi7yOCoPXjXN3slkUgtS4boEEJA89RKZtt72dVJk80elO/qJ0Qo18VmEiOWFqCUb/8ikrST2vplIiMQcXDvOluzQEPw6ofAMEKj5EpOuSOGqpBXLv3b0c4C43xne2hNQ5PJdluFf2WmUwSq84RfrNiuEIPZ445gRiHnonzF5guCku4PFLPssViQbvC5BwDchRcOcuI32Il0ErHh5Z1HkCaqxe+7cMzGpm0XCE6tkxKWqwY/kHOxbOaS/fF2sYwLLV02ElCQMjbwOPKwyUAlwYe5TZAPe4e7G3VT5cqGa+uowmxPHqpLLJLQexP8Ah6tXF8kPUhiKF/+W9fw6v0wJpq9QSeAkoRRMRMZhQGFrobfkS5ZBLNP1SslfZ+zxpxb+WlvbiMOI1xmRh+ENbmFMu+Cnbh6EkfrjHs0ySpS/1BP/rsKgH9mJ28qeQdOjfUtUMPmOm5z4fjvqCG0CKl4CD5c1nQYBsEiQsUxiYR1lAdRvPpWK71jCn9C3kp2mlcSsOMObaXvgr6Vvy3NgqpIsiFgeYagicJTsbC+sbCTKybut2SYu5NDrTyVr/NHDOcOxfii9kwrvt/J/KEuZNmmygln4cgZAKTsRbM8U4Ee++mIJrnjmFezcSLX1eoHVPKZKpU8a8QhparkqCh+SiXcfMGIQ/10lx2I6GAlwJepRxa3+NJQD7bllXlaod6Stvo8hURKtbAkwj0tKqugM8o45/ZYf0IOR3YmEE2Km9YmblKvc6sc2iFvjf2zp5Eqo/JdTnVVhsb6RUZx9QNYKmKREvT2tbBTBjrzrFrhn6lVFXIvRg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM4PR12MB5229.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(6029001)(4636009)(366004)(66556008)(4326008)(66946007)(2616005)(86362001)(53546011)(8676002)(54906003)(6512007)(5660300002)(66476007)(36756003)(186003)(966005)(19627235002)(316002)(508600001)(6486002)(2906002)(26005)(31696002)(6506007)(31686004)(38100700002)(8936002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UmhCREdjZ3FOdkE5ZXRta0FBdlN5QlF6N0ZjcEFOQStzaTQyLytOV2ZoWWcz?= =?utf-8?B?WU93ZEJnUEtHaStsdER6RDcvNG85V09wOW9SVGpycFBiaEZOR3FLQldnZEZO?= =?utf-8?B?Z2JSMTgzYUJsRnVFUzY3QU0rWHFxRzMrMUxkUHRPK3NEL3h1czhpT3lvM3Q2?= =?utf-8?B?a1dnbmcyOUVkazdnd01wWTYzRTRnUlptRDhnRnRwY1JEd0tQR3doRlk5NzRR?= =?utf-8?B?RnlnajQxZk5HV01QZDIvQVRvWVlsakNDYTJHNUQxaDV4L1ljMVJyR1hIcVY4?= =?utf-8?B?WXRvUWVPYTAzaHRnSkNDMzlNMzhFclJXejhMQTcwVnNiWWowWWlNb0hhSXM5?= =?utf-8?B?YVBsRzhwY3BqR3hSSWFVbUxpM2xxOFdwT3lZa0dzdGZ1ejloOWJjL080cG5W?= =?utf-8?B?bzNjc0sxV1ZJRDllS1I2RVozTnFlYUNsOTNaMzFvb04zMFNWVmV3YlAxSW5o?= =?utf-8?B?aW9BL2dBOVF4NzI4dE5iUG50bU9ScjdDTktpSjB5d2g5cGJGUUpwaW83RHRr?= =?utf-8?B?ckhjTml6MzRnRXkxYmNFejhyOTZZOU1aZFh5WjlnaHduc3E0b1p3aFI2cnFD?= =?utf-8?B?WlhCQ29LbU90MnRCc1BSem1uZjdkRlRpMFo4Mnpqc1YxUFFMZWhFZEJnd01m?= =?utf-8?B?eW40UVdxbkc4UERuN21uQ2kwRlJiSU1ONGEyZ3dkeG9ZOG9RQTlmRFdyTlI4?= =?utf-8?B?TGpobHViR3FtUGVPWWdzM0RwNkE2dElBakJzVDF2K01qOWpHNFhzNURpMXZW?= =?utf-8?B?OEJFa3BnZmRER2ZlUTdKSFlJY282YUFCUm1Qb3hLV1FUd0Mva3NHRmpja3Nn?= =?utf-8?B?aEtGSWhyT3JacFMrajRqSzFxc0d3d1FURnRraE14Q2YwMnhPUWY0RnovU1ZM?= =?utf-8?B?cDVjK2trUWYrT3dvaTlvUVBmNlI1K0U3MVdLVndwcm1oT2VTSXFlSzB3R1hJ?= =?utf-8?B?bENPYVhtN3JlVjVEK3JrS29UODVRNkpxR3N6WG4vVnNvZzJGTFprbklvdStD?= =?utf-8?B?NW1VckFZMFJLV2M1TExGc1g3VG5ocm5vTDdGSzViSDFmaUJ6UEdyNXdsRmRD?= =?utf-8?B?TkFWZWdLRHFvN2RuenkyWVdudm11bllZZmJHQThYUngzcitCMlRZc1dWUy9X?= =?utf-8?B?TEk3YzlhTiszZU91b0FEdEU5dVZmdzJ1YUFXbEpRSm5tczgzR1JjUTRTSjky?= =?utf-8?B?TVJEK0Vla3Y0Q0wySzJhdDBIdzdndktBNFMzMnJtV2hTZ3g2Z3dIMkp1SVk4?= =?utf-8?B?Tmp4SStuSXBMaHdlQkU5UVdUMmhoNXFwU1pSWHNpZHZDakhKWFFBVDRWZWdV?= =?utf-8?B?eHV6K2xSN09Nb2I2QkFmNmVUYUhLZ1dUZDRseURaVFo3Skw3YW1tZW90ZlBE?= =?utf-8?B?SG9WT1BXY1VuNW5tS0REVXJaU0ZtSCs1TlRtZHVKNlUyRVdGc2pVcnh3RStq?= =?utf-8?B?L3pPaTRUWkxhbmNBU0ZIVjZnVnhwMHdwRTRJdzdIK01UZGxBcE9YYjlCdllQ?= =?utf-8?B?dFZ4RzZIUlZhbzJHbHpzcjBKeGJJNERUVEJzQTQ1dUVyVC9FWHpwcFg2Zk53?= =?utf-8?B?VmQ0VW1ISXFHYkJRQXNFV2dKRWNtaUdTWDQyTjEzU044VTVsd2Q2bVRXejFm?= =?utf-8?B?ZXQrTmtJYnMvbnZBRFRJUnorK0JFQXFVT0p6T3BzWDZQSlZHVFVRSTdsUUE4?= =?utf-8?B?bUlJYkZXWTV5ZnMxMjJrRksyTlZ5dGNlam80OExXTmZQbFJBMlNMYlBOSEJ5?= =?utf-8?B?Yzdmd0NXdU1qaVFHcU5pRERkSGcyMkRESktseXBUTVloeWpNQmtubHZrZlZW?= =?utf-8?B?Vk1uckhxRjNBSGtlM1E2bVVMUzJuM0R5STVFRlZqcnNsRFFodFd4RFhXTXpH?= =?utf-8?B?WE9KV1I3WGFVTld0SG5VVmFqQjJVdFRyczVGRXhmeDY3NXFkSGVZZzZONkxv?= =?utf-8?B?ZU1zRGxqaUgxamdMUU5icGFsclRSSUVLSzFtdk00eGw4aUNaRnFDRC8xRWNO?= =?utf-8?B?U0s2Vldjb3FJZjVreDNDTTV3cUZHUUlucm55SkdEbFVxS1pLL0N5azlXQ3Fr?= =?utf-8?B?QzNxVENldDhibWNaSDllOW50REhlYjlUL0hjbkY5VGV6VnpYT05oLzVqcnNU?= =?utf-8?B?dFN6L2JQVmRHQ2tUTnZDek52Rmh3bVRvYUMrYXBGZ29lQm1USFdubXZjSXlC?= =?utf-8?B?eHlERGhKaEc0Rks4cXpCak9lUXJnYzlkeTdzNXhjRnViamFPdGgyRmZJVXpw?= =?utf-8?B?Z0tHT3cyYVR6bEExWEs2YTFYV3NYWUcyT29ZWWZjdG1kbVdjZ3E3aENiUlA1?= =?utf-8?B?aGlpWW1QMHZuYjFIQzdaemtub015M0lQK3NDaHZQLzQ1UEZFZEkxQT09?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88deb448-7546-4dd8-40cb-08da214c41c2 X-MS-Exchange-CrossTenant-AuthSource: DM4PR12MB5229.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2022 15:01:03.2545 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: kYbvwQDVxAmHrRA2tcVPsVbgfzwjtGH1vDZzBldq43lfzPrdiAhJyFSgcuTbYZat5cKNKNjofmbhOj0+syX7qw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4432 Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 4/16/22 22:01, Min Xu wrote: > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3902 > > CcProbeLib is imported in BaseIoLibIntrinsicSev. > OvmfPkg/Library/CcProbeLib is the OvmfPkg version which checks > OvmfWorkArea to return the Cc guest type. It is included > in OvmfPkgX64.dsc and IntelTdx/IntelTdxX64.dsc. SEV support (as opposed to SEV-ES and SEV-SNP) builds and runs with OvmfPkgIa32X64.dsc, so that needs updating. It also builds with OvmfPkgIa32.dsc, but is not expected to run successfully in only the 32-bit variant - and since there is no work area in the fdf file that can stay as the NULL library. However, when testing the Ia32X64 variant, I found that commits: 63c50d3ff285 ("OvmfPkg/ResetVector: cache the SEV status MSR value in workarea") f1d1c337e7c0 ("OvmfPkg/BaseMemEncryptLib: use the SEV_STATUS MSR value from workarea") actually broke the Ia32X64 variant running under SEV, so we (AMD) will need to fix that - unless we just say that now SEV requires the X64-only build since both SEV-ES and SEV-SNP require that. Thanks, Tom > > Other .dsc include the MdePkg/Library/CcProbeLibNull because Cc guest > is not supported in those projects. > > Cc: James Bottomley > Cc: James Bottomley > Cc: Jiewen Yao > Cc: Gerd Hoffmann > Cc: Brijesh Singh > Cc: Erdem Aktas > Cc: Tom Lendacky > Signed-off-by: Min Xu > --- > OvmfPkg/AmdSev/AmdSevX64.dsc | 1 + > OvmfPkg/Bhyve/BhyveX64.dsc | 1 + > OvmfPkg/CloudHv/CloudHvX64.dsc | 1 + > OvmfPkg/IntelTdx/IntelTdxX64.dsc | 1 + > OvmfPkg/Microvm/MicrovmX64.dsc | 1 + > OvmfPkg/OvmfPkgIa32.dsc | 1 + > OvmfPkg/OvmfPkgIa32X64.dsc | 1 + > OvmfPkg/OvmfPkgX64.dsc | 1 + > OvmfPkg/OvmfXen.dsc | 1 + > 9 files changed, 9 insertions(+) > > diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc > index fcdc3efab204..1c088f25fa4b 100644 > --- a/OvmfPkg/AmdSev/AmdSevX64.dsc > +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc > @@ -149,6 +149,7 @@ > PciCapLib|OvmfPkg/Library/BasePciCapLib/BasePciCapLib.inf > PciCapPciSegmentLib|OvmfPkg/Library/BasePciCapPciSegmentLib/BasePciCapPciSegmentLib.inf > PciCapPciIoLib|OvmfPkg/Library/UefiPciCapPciIoLib/UefiPciCapPciIoLib.inf > + CcProbeLib|MdePkg/Library/CcProbeLibNull/CcProbeLibNull.inf > IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf > SerialPortLib|PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf > diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc > index e1b6b8e15f36..a8fa4d38ab60 100644 > --- a/OvmfPkg/Bhyve/BhyveX64.dsc > +++ b/OvmfPkg/Bhyve/BhyveX64.dsc > @@ -146,6 +146,7 @@ > PciCapLib|OvmfPkg/Library/BasePciCapLib/BasePciCapLib.inf > PciCapPciSegmentLib|OvmfPkg/Library/BasePciCapPciSegmentLib/BasePciCapPciSegmentLib.inf > PciCapPciIoLib|OvmfPkg/Library/UefiPciCapPciIoLib/UefiPciCapPciIoLib.inf > + CcProbeLib|MdePkg/Library/CcProbeLibNull/CcProbeLibNull.inf > IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf > SerialPortLib|PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf > diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc > index 20f3bc340807..d1c85f60c768 100644 > --- a/OvmfPkg/CloudHv/CloudHvX64.dsc > +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc > @@ -158,6 +158,7 @@ > PciCapLib|OvmfPkg/Library/BasePciCapLib/BasePciCapLib.inf > PciCapPciSegmentLib|OvmfPkg/Library/BasePciCapPciSegmentLib/BasePciCapPciSegmentLib.inf > PciCapPciIoLib|OvmfPkg/Library/UefiPciCapPciIoLib/UefiPciCapPciIoLib.inf > + CcProbeLib|MdePkg/Library/CcProbeLibNull/CcProbeLibNull.inf > IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf > SerialPortLib|PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf > diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc > index 245155d41b30..73a6c30096a8 100644 > --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc > +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc > @@ -135,6 +135,7 @@ > PciCapLib|OvmfPkg/Library/BasePciCapLib/BasePciCapLib.inf > PciCapPciSegmentLib|OvmfPkg/Library/BasePciCapPciSegmentLib/BasePciCapPciSegmentLib.inf > PciCapPciIoLib|OvmfPkg/Library/UefiPciCapPciIoLib/UefiPciCapPciIoLib.inf > + CcProbeLib|OvmfPkg/Library/CcProbeLib/CcProbeLib.inf > IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf > SerialPortLib|PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf > diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc > index 59580ccd4691..c9c843e116a9 100644 > --- a/OvmfPkg/Microvm/MicrovmX64.dsc > +++ b/OvmfPkg/Microvm/MicrovmX64.dsc > @@ -156,6 +156,7 @@ > PciCapLib|OvmfPkg/Library/BasePciCapLib/BasePciCapLib.inf > PciCapPciSegmentLib|OvmfPkg/Library/BasePciCapPciSegmentLib/BasePciCapPciSegmentLib.inf > PciCapPciIoLib|OvmfPkg/Library/UefiPciCapPciIoLib/UefiPciCapPciIoLib.inf > + CcProbeLib|MdePkg/Library/CcProbeLibNull/CcProbeLibNull.inf > IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf > SerialPortLib|PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf > diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc > index e4218b01f0fc..9e4ecd21fb17 100644 > --- a/OvmfPkg/OvmfPkgIa32.dsc > +++ b/OvmfPkg/OvmfPkgIa32.dsc > @@ -154,6 +154,7 @@ > PciCapLib|OvmfPkg/Library/BasePciCapLib/BasePciCapLib.inf > PciCapPciSegmentLib|OvmfPkg/Library/BasePciCapPciSegmentLib/BasePciCapPciSegmentLib.inf > PciCapPciIoLib|OvmfPkg/Library/UefiPciCapPciIoLib/UefiPciCapPciIoLib.inf > + CcProbeLib|MdePkg/Library/CcProbeLibNull/CcProbeLibNull.inf > IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf > SerialPortLib|PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf > diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc > index a80cdaacb8bc..75fb8095eec2 100644 > --- a/OvmfPkg/OvmfPkgIa32X64.dsc > +++ b/OvmfPkg/OvmfPkgIa32X64.dsc > @@ -158,6 +158,7 @@ > PciCapLib|OvmfPkg/Library/BasePciCapLib/BasePciCapLib.inf > PciCapPciSegmentLib|OvmfPkg/Library/BasePciCapPciSegmentLib/BasePciCapPciSegmentLib.inf > PciCapPciIoLib|OvmfPkg/Library/UefiPciCapPciIoLib/UefiPciCapPciIoLib.inf > + CcProbeLib|MdePkg/Library/CcProbeLibNull/CcProbeLibNull.inf > IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf > SerialPortLib|PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf > diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc > index fb2899f8a1be..2e534d0d2478 100644 > --- a/OvmfPkg/OvmfPkgX64.dsc > +++ b/OvmfPkg/OvmfPkgX64.dsc > @@ -165,6 +165,7 @@ > PciCapLib|OvmfPkg/Library/BasePciCapLib/BasePciCapLib.inf > PciCapPciSegmentLib|OvmfPkg/Library/BasePciCapPciSegmentLib/BasePciCapPciSegmentLib.inf > PciCapPciIoLib|OvmfPkg/Library/UefiPciCapPciIoLib/UefiPciCapPciIoLib.inf > + CcProbeLib|OvmfPkg/Library/CcProbeLib/CcProbeLib.inf > IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf > SerialPortLib|PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf > diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc > index 7bd594c6e263..8d420cf54371 100644 > --- a/OvmfPkg/OvmfXen.dsc > +++ b/OvmfPkg/OvmfXen.dsc > @@ -147,6 +147,7 @@ > PciCapLib|OvmfPkg/Library/BasePciCapLib/BasePciCapLib.inf > PciCapPciSegmentLib|OvmfPkg/Library/BasePciCapPciSegmentLib/BasePciCapPciSegmentLib.inf > PciCapPciIoLib|OvmfPkg/Library/UefiPciCapPciIoLib/UefiPciCapPciIoLib.inf > + CcProbeLib|MdePkg/Library/CcProbeLibNull/CcProbeLibNull.inf > IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsicSev.inf > OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHookStatusCodeLibNull.inf > SerialPortLib|PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf