Use std::variant for VHD device path storage instead of std::pair with optionals #14006
+25
−16
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.
Summary of the Pull Request
Refactors VHD boot disk device path storage from
std::pair<std::optional<ULONG>, std::optional<std::string>>tostd::variant<ULONG, std::string>for improved type safety and clarity.PR Checklist
Detailed Description of the Pull Request / Additional comments
The
rootVhdandmodulesVhdvariables store either a SCSI LUN (ULONG) or PMEM device path (string), but never both. The previous implementation usedstd::pair<std::optional<ULONG>, std::optional<std::string>>with runtime assertions to enforce mutual exclusivity.Changes:
std::variant<ULONG, std::string>Validation Steps Performed
Code formatted with clang-format and reviewed for correctness. Full Windows build validation deferred to CI.
💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.