From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0631.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe49::631]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5A5C621A16E2A for ; Wed, 10 May 2017 15:09:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=fG7sdIAguWfNQL4lzQBgzpe/ynCtM9cFb2KBsyiTGYI=; b=hCP/gt/xdiQnRg9SSRO9wXBohU7Xt8hg8e+uK6gUjuzOLwwCxGT76HydHBBnOL/AlRVcrq8JEjUSgHOatn8n5EWztDYzwO08mYC7I8FXirfjI9bqhMagXYSIuTFqKM+i14MQ408TJ5Z/Ae6+upHkE41suZd+AF9XzRezUptftWk= Authentication-Results: lists.01.org; dkim=none (message not signed) header.d=none;lists.01.org; dmarc=none action=none header.from=amd.com; Received: from brijesh-build-machine.amd.com (165.204.77.1) by CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Wed, 10 May 2017 22:09:47 +0000 From: Brijesh Singh To: CC: , , Brijesh Singh , Jordan Justen , Laszlo Ersek Date: Wed, 10 May 2017 18:09:16 -0400 Message-ID: <1494454162-9940-8-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> References: <1494454162-9940-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR21CA0051.namprd21.prod.outlook.com (10.172.93.141) To CY1PR12MB0149.namprd12.prod.outlook.com (10.161.173.19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5b306ec3-375c-417d-4cf8-08d497f145dd X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 3:rMFxO5MAF+M40s/X9Awp/Eqgm70MTokrbA0WdyyiGNcYv2wdn+la1jahrke98i4CFs3Jk+4egR/yLhDkXYGD++iX/XK54YkyUil4ps0eNbFIYF/9ZiQuTM9Y15d+iRUxzDihJzOHfYUSe/heWFxaa5HPewhffVO+jchkDbQOvRQ1e9TlowNtZVN0iP4P45iKXfktz9+jIwi8RjGVeXfrfvkycd0aQuVct2KiMpUR6VxeflHznWAr+BYmL9iuYVCAKM2qH4KAkMY4p9LVUB0Y/mjTe0bl8WA83X83Mm423Or4YyzfO85/38oGZjge80YtEE96Qiq1Ko/1r5OLeP+UBPLZAKsRKd+8OrIwq/FdWtg=; 25:/W2j4wDmf9VCXu5YTncZqS3VPNrM9gEhNzzupRYTzaB28MvPljKPtCVBCJxnexQlqoE07AQftoL6lU+k7FYh7xw6OCYJkVqEp2zHgkXWuLwLJjd8ipdt4gqrhLOSCVWyyATSuChESxz9RLd3z9Whlv47ZTlqb93ez3vsWD6Dh2ccyfWOc1UPRkgwTw1ZngNhD2J2PmzQnYjEZlCy+kCvIDSTGnEYv0SvjoMTMaes7dVzBK8/fv3xbhKx54IFYUgjHeCHbFe827h8QGjbkwBlfz2/OGp+QCoWt7ncf3j7JdfYwYYeXyVno2fHp12Rzh/sXq56RldN6J6CGtlEHC+/U6KfLM/jby0lJWmvREu02cUUNELBOg1IjPlBbd9ZoYokIx8SS9M5tgQZofD0E8tdHyzeSmR2FkO/jnZ0n8mCAE2zmp/uFPmMgju32K1+YLqTi6J0hmv3R0wEsUf0L7fTaE9vmD8URiXfGQsb8NoV9v8= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 31:KLt9NpPsrLx4lBNT+W7P3zTUkKVwv7QlTQTUxw2ROProAsa+C8KB4Yart6sAt3nAx8VnbJUsaEwm8DUkxxfDiVh5eiDyFGjppeopgTRySBJSc4oP+TC6hLqZpuOhpnrFsji7Sj5kboIOI2jtbYqGzONPPo0uOtbfYEbQYoWgBroSPiEDE5U1d9DujdqQ6EHSmZrD+fy9Gi7UyFqKJi0uEGQ0crtx70R4hs277mKKxd8=; 20:SO0tMclD2sOL9AsCivXP8tj7ZxpcmPCnV7N9W89wr/4OGgNfOj3TGjUOsGNI4silDrni/ojU9xpq8iUbTxAtsC5o9JNgn6QHP5Wkd4YT8v5PBTiiySgpK6YevhshO9ccd7ezCvRIPAkrn8wLQEACv8Eq+9o12wNFsNHlG6YB2HZyJLTD+SyyZPdwLBIzVqvx9Zt4FzSxi/pk9wUwi2s4TWq2vUCbIG/Qn5LHVOu/B3t/kvIYnmgUcqJbsSOOgW/V3VqQRpw+7U9oM2r/ZO0f+YblkWPaT+qCZlQol4LPcU9HwhgNOFigufSONEGZKSHLLTyC8uJAB7WV4NF1K3ykdZ9+4uNBaLaxUKeAWee5ZtYZGkKWIMd3zpuJtD+stRDeZKl6o/6uaYJ20BL/Qkkqn3JUlYiN1QB0gWODYsxrScy2/VyAbfwQF7DjCtbJGffo3nqGgTQ/w+S578zCnH82KhLIR7UrZrQKD5EYF8gPpU98hm+hm0R+sSdf2sChL8rP X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123558100)(20161123560025)(20161123555025)(20161123564025)(6072148); SRVR:CY1PR12MB0149; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0149; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 4:aUlGMKj3Cy6v1laWT1c58qiCPBLPk96s0bSYjHTz72SO+FfvPXU9+9jbUS30sGQDMzDIN7UkC8rHR6wmXaWL+ms7sFQkima0M7QRDuKicze/fpqGF49g6STYbKwIwuBUnt8arInkdQ75futif0277171FJrKrMQKcLC7oiZMIpEwuu+bJOWeaZ6Q2cCTusrGCSbvX6WCddvMRWI5wx9454JpFzX4AGPn7xvBiJQsCZ3U06Gh5ezGa2z1d5+j8O+SypdOXjPSp9NIPM2XQsNZJ+BDLojH3BF2BgrXm/UZZ1SwehmoS+4p+vjnDW0nHeGMW8A/g9Soww/iT/6508aC77mEVHaZ7D4rFIwJ6deBdH6MOm7eTqymozKuYqk97fBMXYmuYElgJL4+VxYWKH2djfCcqJNasDA+BCR6tRqyeM75VoaQ7XulY8Bzk0vuC/p46IznBSfp2qS31SCGXjKnw+cxnlh1SKGfljYGrQZgDzcg9Sn+vibtC0JvoLMwaDJBUB7yuQHWlc/S4C9FT8fe+GBL4hCGgWlMJndEwZHFsnA2e9eqyh2oShFAvXKp2YyvTMhAr5HQDa3fpaQs4qVdcwmjYzCVuL10aNCIlMOej6cH9rPhwUD64wzQQdjNgZEmGorrDC3LpkOUm4uv4kQh363qu8dK4edHyEBkrnxx6BhQWQPo2+6s8CA11sD2JHQJo5LCUs6nMusWxCaZHfhn2AA5Pijmw7T71/BnGedakIX2VL3rdvX7PRbnsjcyKwEin1sfaFEBJ/BMFrFiHZ0lKaUmVuiGA1GwY1tTgrAO5p1uFu5crhBaTY75Ial03iRhWeZxEf+FOpEHtoChcD284T1DXkKGTgX+dTp/IWvRARtXCmaYwuIFeOF2ZCmvK93h X-Forefront-PRVS: 03030B9493 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6029001)(6009001)(39840400002)(39400400002)(39410400002)(39850400002)(50986999)(2950100002)(6666003)(6916009)(6486002)(76176999)(50466002)(33646002)(478600001)(86362001)(189998001)(48376002)(110136004)(8676002)(4326008)(2906002)(54906002)(38730400002)(53936002)(3846002)(6116002)(50226002)(25786009)(81166006)(5003940100001)(5660300001)(53416004)(36756003)(42186005)(66066001)(7736002)(305945005)(2351001)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0149; H:brijesh-build-machine.amd.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR12MB0149; 23:993KQJaXtHwgufoX3/ScO7Q8JhzrR7GKB8/L4wsml?= =?us-ascii?Q?E9wZsTcEVpnINDhqYbsFn3PKwNAuk5hK9EhK4eM/D7oyK5xC3lg0OkszI8PV?= =?us-ascii?Q?/YwYc5oNb5JorY7NrqP857cQd9iz3CH5LZC2MSAdXULwznf/lwb9mBdTQL9Z?= =?us-ascii?Q?mFdcyhJUnX2Ec0EpslUX2ACIERzkHVbCrw0Q1hcByZv9W2liV4GGmnGA1fPU?= =?us-ascii?Q?3f4lVTaf7d/jX9LxNUQsaWm920GZJDbI7dq4uyCZlVw/BPDEitHVdPA/2nMe?= =?us-ascii?Q?bO8x8sLQdnhC9eG5Nyk31xdDeOaNoeow/vXhQx3Jnjrt6/sJkh3qyo/aeGwO?= =?us-ascii?Q?CiWmVfHJemJLBxw2rJkMZ8FbjDBMM5CCVdIRNRreqraod1legtXIMeOovUE3?= =?us-ascii?Q?wVQZnayFB/Ys/9t1+7n4MA2VEkNQHymo+/YRPbMy1jLFt/T+NkG61glK6U9P?= =?us-ascii?Q?AgF+0EoFPt+3zTWnfvb5f6L7Zxs5UDVULMp9NPic9Y1WLnVn48DYKWYcb/SU?= =?us-ascii?Q?o55Uam0uaJYT8wZEGvNeDlJMPIOUfOAOf+6JX1AxM3igex0GA3aJibkLLaOm?= =?us-ascii?Q?79fk7ZWrZ4wbaDjm7QfBKf6uXmjrbqGqRvhRBZKZi2IcJncUEQVmGXAYslqN?= =?us-ascii?Q?omLuxfQ422lPepcwC3m8K3578e7JLcT74gsmw5G9VQtZe1SuK6CYMhhZRq9Y?= =?us-ascii?Q?l4A8yLauraEAllnVnKtWF2B5chG39q9FhkhrCqsBDSahT3YEIkk5ZfUHwteR?= =?us-ascii?Q?U7OQLn7iBNFsipiF38SyRoh+UORNGjrvOOu/yzKy/Vf5jgEjTqXksK0lQaC7?= =?us-ascii?Q?3jKgNzrsv/NPNP3sWGJK9l28NWFZvQPHZQ0lv/zNFifgpYWZySrnR1EEBcoF?= =?us-ascii?Q?LUFBYnUcjQQ+FEBs7Qlresq0kRE/GASEeW6mFuMO7/yG0ew0I+qj89ovZy8P?= =?us-ascii?Q?8F1tDZrH4J2bUsaxbTWu5XG/EBcRnjJyXFDZPrldC5jGW/aBBrWL+z/sR2+N?= =?us-ascii?Q?Ldj8O+xrdIhIK4Pzo44ij4vs9UA0fEh7jeANqVLs6UK7B3NLUHfDmfijqhzl?= =?us-ascii?Q?rcVj5E=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 6:/TaEomH+MYr/Qj+BZhdtsHpZiVwWVXtOP80yZokJ2ZYmazJ2M5B48tw0CpbEmNCI/rMc3aOi5esMCtS0zOTG7+Z1skG170ffz+V3g1tU0sU7pRmjigKv0wdU6lzhEhWbtkVGexJxPejg53xvEKxyEDrIxodZivLg9IUrQTLH3hFBbHHHnZyZBJBBXeVZWges1K0RHt0hPvkUXRB7T+9cY0lsZq4W1DK821Fcl816r40PtLk1dVrvDwGmKbwdLjlaSvm3r87sJWLLtzrag39DlM5N4QRds0F8j+0B/zSfg4Rs6pVqXe4AJDbC5YOZ+A0ck1/PoTFk8jamYs80yoLUAmsG8pLqfDe6wuajMkR+WYwCw7KWIn43DuwgXb+nlQi2STXaKBJaX2J93jWG259S2YuOQaYMgyjZp8LQD2Ilin0UeSSHI3Gp0HCoPjky/3afGmnYxkllUe5st3uxdY+LMCjgFG65k9y91pqODqtLR8801lQgdgQxJ3/3QrBVIknh72yPPWNh++cqx2Qk0WnIURo6V+oni6WbZA43GPX33O8=; 5:hYRw0RFCHMYPlXIxOnqLew97GvhHkq33ujJVSNkPUYSM2BDL+rSxw72jJT1WO+N+TzqY2NNNZIpXQmPLtUaCuGawh3tl/xHkk/P0jwieHqllU42Qj3jVZtzHH6HjskAMURnTDXJoVSO2D3kerogUwA==; 24:/aqZ7hA8Wzf103mfc0KrfeK0JwOMU2M3mAlISB++q6YPwzgB5cS+eTQcjUApWKmPk3lQtoCUxTnrSwkJkLKYxNE424b+ANrLfdCkqHCUujs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0149; 7:loXRbqUsb5j5Q7wEp5UWZ5f1US74AxgTIF5UYpMciBAybuyrqOBPmGq0cy1zd5sunOg8mRDwhHcZPbHAaHMBnnB+nA0sZG4VorQt8fitB8A0tmtIqqVhL3gCcw/UPICRbKpW+3ZH/GSn3j+WMhSKlL6XYMDt0/w6FqDYOhzjX8yWuIpxkwdmlcVNwCRlRJ+9o54lGUePSBg5amqA9Tls779Z4B9kgOABCPtcI01h90pqIcQjZPm/WxTBJgT/tvV9tZBlj7Qo+SJAKmgBPh9D7GEE962lp9PVtQoWk9Xyjd0faYgUkY6KpPx3HaP7INWGw46aSNKK+dwHpUK7eoMQFQ==; 20:xbLTA+Rhg2ScIhJuJqU3FwakrOLxv29QWfbHNQP+2StGNhSMhMpp5PnxxWknYvgqChe8sspji3w0WVCsVgqYPXRGlMfz0VX64Y/3NXfRy+GFfHAtVA/vHbfjUVUPoxm6k0Fkxgz0SCKRGcRW2u5Fp1genCPZxla4JyQLuK+xubQ6QUlSVggDUiH4hDt/Szx3PSywQ9rI8+gwQHeiXvBhW88RzSR0jsh5H5q5orCibml5y1HfpFhOhyHG32DQYaHG X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2017 22:09:47.4391 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0149 Subject: [RFC v4 07/13] OvmfPkg/QemuFwCfgLib: Provide Pei and Dxe specific library X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 May 2017 22:09:49 -0000 Content-Type: text/plain Current QemuFwCfgLib.inf is used in both Pei and Dxe phases. Add Pei and Dxe inf file to provide a seperate QemuFwCfgLib instances for Pei and Dxe phases. Cc: Jordan Justen Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Brijesh Singh --- OvmfPkg/OvmfPkgIa32.dsc | 3 ++- OvmfPkg/OvmfPkgIa32X64.dsc | 3 ++- OvmfPkg/OvmfPkgX64.dsc | 3 ++- OvmfPkg/Library/QemuFwCfgLib/{QemuFwCfgLib.inf => QemuFwCfgDxeLib.inf} | 6 +++--- OvmfPkg/Library/QemuFwCfgLib/{QemuFwCfgLib.inf => QemuFwCfgPeiLib.inf} | 6 +++--- OvmfPkg/Library/QemuFwCfgLib/{QemuFwCfgPeiDxe.c => QemuFwCfgDxe.c} | 0 OvmfPkg/Library/QemuFwCfgLib/{QemuFwCfgPeiDxe.c => QemuFwCfgPei.c} | 0 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 139d54aa010e..cde3d43e39a9 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -140,7 +140,7 @@ [LibraryClasses] DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf - QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf @@ -257,6 +257,7 @@ [LibraryClasses.common.PEIM] CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index ee6f98d68b73..8aa72718d065 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -145,7 +145,7 @@ [LibraryClasses] DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf - QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf @@ -262,6 +262,7 @@ [LibraryClasses.common.PEIM] CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index b5f26e06e60b..963d394662ab 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -145,7 +145,7 @@ [LibraryClasses] DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf - QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf LoadLinuxLib|OvmfPkg/Library/LoadLinuxLib/LoadLinuxLib.inf MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/BaseMemEncryptSevLib.inf @@ -262,6 +262,7 @@ [LibraryClasses.common.PEIM] CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf [LibraryClasses.common.DXE_CORE] HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf similarity index 83% copy from OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf copy to OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf index 689476032d39..346bb881ffc1 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf @@ -19,10 +19,10 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = QemuFwCfgLib - FILE_GUID = fdd53716-31e1-4acc-9007-8bd5d877c96f + FILE_GUID = 80474090-55e7-4c28-b25c-9f236ba41f28 MODULE_TYPE = BASE VERSION_STRING = 1.0 - LIBRARY_CLASS = QemuFwCfgLib|PEIM DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER + LIBRARY_CLASS = QemuFwCfgLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER CONSTRUCTOR = QemuFwCfgInitialize @@ -35,7 +35,7 @@ [Defines] [Sources] QemuFwCfgLibInternal.h QemuFwCfgLib.c - QemuFwCfgPeiDxe.c + QemuFwCfgDxe.c [Packages] MdePkg/MdePkg.dec diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf similarity index 83% rename from OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf rename to OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf index 689476032d39..4f966a85088a 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiLib.inf @@ -19,10 +19,10 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = QemuFwCfgLib - FILE_GUID = fdd53716-31e1-4acc-9007-8bd5d877c96f + FILE_GUID = ddd4f5f0-5304-42a8-9efa-d14bf11a3533 MODULE_TYPE = BASE VERSION_STRING = 1.0 - LIBRARY_CLASS = QemuFwCfgLib|PEIM DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SMM_DRIVER + LIBRARY_CLASS = QemuFwCfgLib|PEIM CONSTRUCTOR = QemuFwCfgInitialize @@ -35,7 +35,7 @@ [Defines] [Sources] QemuFwCfgLibInternal.h QemuFwCfgLib.c - QemuFwCfgPeiDxe.c + QemuFwCfgPei.c [Packages] MdePkg/MdePkg.dec diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiDxe.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c similarity index 100% copy from OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiDxe.c copy to OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiDxe.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c similarity index 100% rename from OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPeiDxe.c rename to OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c -- 2.7.4