INF MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf\r
INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf\r
INF MdeModulePkg/Application/UiApp/UiApp.inf\r
+INF OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf\r
INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
INF MdeModulePkg/Universal/PrintDxe/PrintDxe.inf\r
INF MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
!if $(SMM_REQUIRE) == TRUE\r
INF OvmfPkg/SmmAccess/SmmAccess2Dxe.inf\r
INF OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.inf\r
-INF UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf\r
+INF OvmfPkg/CpuS3DataDxe/CpuS3DataDxe.inf\r
INF MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf\r
INF MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf\r
INF OvmfPkg/CpuHotplugSmm/CpuHotplugSmm.inf\r