[REBASE & FF] AdvLoggerPkg: PeiCore Instance: Use Local PeiMain.h#909
Merged
Conversation
Contributor
⏩ QEMU Validation SkippedThe PR was merged before validation completed. This comment was automatically generated by the Mu QEMU PR Validation workflow. |
Member
|
@os-d, since this hinges on following up with dropping the hack, can you go ahead and create a tracking issue for it? |
apop5
reviewed
Jun 25, 2026
Contributor
Author
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## release/202511 #909 +/- ##
================================================
Coverage ? 3.03%
================================================
Files ? 37
Lines ? 4312
Branches ? 73
================================================
Hits ? 131
Misses ? 4175
Partials ? 6
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
b69f00d to
17d290e
Compare
5 tasks
1ac875d to
df6d04e
Compare
This is a direct copy of PeiMain.h to be amended in a future commit. Signed-off-by: Oliver Smith-Denny <osde@microsoft.com>
Update the local PeiMain.h to not use the private header and instead use a VOID * for the type that was pulled from the private header. Consume this in the PeiCore instance of AdvLoggerLib. Signed-off-by: Oliver Smith-Denny <osde@microsoft.com>
makubacki
approved these changes
Jun 26, 2026
makubacki
left a comment
Member
There was a problem hiding this comment.
Approving, with the understanding that this is a necessary temporary workaround while the GitHub issue is resolved.
apop5
approved these changes
Jun 26, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
The PEI Core AdvLoggerLib instance relies on PeiMain.h which defines the PEI_CORE_INSTANCE structure. A special PlatformBlob is added there to use stack space for the adv logger info pointer. This avoids a HOB lookup for every log.
However, edk2's PeiMain.h has been updated to use a private header in PeiMain.h. This is pulled into mu_basecore, which then breaks building this library because it doesn't have access to the private header.
Using PEI_CORE_INSTANCE to host the advanced logger pointer has always been a hack; it will be separately addressed and removed, but in the meantime, this library needs to continue to work.
This copies PeiMain.h, removes the use of the private header, and consumes it in the PeiCore instance of AdvLoggerLib.
How This Was Tested
Booting patina-qemu to shell with the PEI memory bin changes cherry-picked.
Integration Instructions
N/A.