From 82cfea329cc2214df006edc067ed852f4d86a314 Mon Sep 17 00:00:00 2001 From: Luigi Leonardi Date: Thu, 23 Jul 2026 16:51:38 +0200 Subject: [PATCH] ArmVirtPkg: add QemuFwCfg null library instances to common DSC PlatformPeiLib consumes QemuFwCfgSimpleParserLib, but ArmVirtXen.dsc provided no resolution for it or its dependency QemuFwCfgLib, causing: error 4000: Instance of library class [QemuFwCfgSimpleParserLib] is not found for module [ArmVirtPrePiUniCoreRelocatable.inf], consumed by PlatformPeiLib.inf Wire up QemuFwCfgLibNull and QemuFwCfgSimpleParserLib in the common ArmVirt.dsc.inc so all platforms without fw_cfg fail gracefully. ArmVirtCloudHv.dsc already carried the same null pair; both per-DSC copies are removed now that the common default covers them. ArmVirtQemu and ArmVirtQemuKernel continue to override with their real MMIO implementations. Fixes: f4bbef1dd7 ("ArmVirtPkg: introduce compile and runtime control of serial debug log level") Reported-by: Pierre Gondois Signed-off-by: Luigi Leonardi --- ArmVirtPkg/ArmVirt.dsc.inc | 2 ++ ArmVirtPkg/ArmVirtCloudHv.dsc | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index fc60d87ce3..2bc99de0d7 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -121,6 +121,8 @@ DEFINE FD_SIZE_IN_MB = 3 # Virtio Support VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf + QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibNull.inf + QemuFwCfgSimpleParserLib|OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFwCfgSimpleParserLib.inf # # Misc diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc index 122e0e8f6d..d76b17c602 100644 --- a/ArmVirtPkg/ArmVirtCloudHv.dsc +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc @@ -46,8 +46,6 @@ TpmPlatformHierarchyLib|SecurityPkg/Library/PeiDxeTpmPlatformHierarchyLibNull/PeiDxeTpmPlatformHierarchyLib.inf ArmTransferListLib|ArmPkg/Library/ArmTransferListLib/ArmTransferListLib.inf - QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibNull.inf - QemuFwCfgSimpleParserLib|OvmfPkg/Library/QemuFwCfgSimpleParserLib/QemuFwCfgSimpleParserLib.inf !include MdePkg/MdeLibs.dsc.inc