hcl_compat_uefi_nvram_storage: load from storage if no saved state #1697
+75
−65
Conversation
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
tjones60
force-pushed
the
no_save_load_nvram
branch
from
567ba21 to
0473eac
Compare
smalis-msft
reviewed
Jul 15, 2025
smalis-msft
reviewed
Jul 17, 2025
| @@ -481,7 +500,11 @@ mod save_restore { | |||
| } | |||
|
|
|||
| fn restore(&mut self, state: Self::SavedState) -> Result<(), RestoreError> { | |||
| self.in_memory.restore(state) | |||
| if state.nvram.is_some() { | |||
There was a problem hiding this comment.
Do we have tests below that cover both cases?
There was a problem hiding this comment.
Tested locally, but we still need to add cross version open source servicing tests.
smalis-msft
approved these changes
Jul 17, 2025
tjones60
added a commit
to tjones60/openvmm
that referenced
this pull request
Jul 17, 2025
…icrosoft#1697) Fix for a previous change that would have broken VMs that were serviced to a new version of OpenHCL with the UEFI NVRAM saved state. The new version would have skipped loading from storage since it was restoring, and the saved state would have contained an empty Vec. This change converts it to an Option<Vec<>> to distinguish between missing saved state and no NVRAM entries. If the saved state is missing, the HclCompatNvram will lazy load from storage like it did before. Original PR here: microsoft#1556 This is something that should have been caught by cross-version servicing tests, which don't exist currently. We should follow up to add that soon.
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.
Fix for a previous change that would have broken VMs that were serviced to a new version of OpenHCL with the UEFI NVRAM saved state. The new version would have skipped loading from storage since it was restoring, and the saved state would have contained an empty Vec. This change converts it to an Option<Vec<>> to distinguish between missing saved state and no NVRAM entries. If the saved state is missing, the HclCompatNvram will lazy load from storage like it did before.
Original PR here: #1556
This is something that should have been caught by cross-version servicing tests, which don't exist currently. We should follow up to add that soon.