refactor(virtio): replace zone_mem raw array with struct; fix MAX_RAMS=4 overflow#100
Merged
Merged
Conversation
Replace the `unsigned long long zone_mem[MAX_ZONES][MAX_RAMS][4]` raw
array and its 4 #define index macros (VIRT_ADDR, ZONE0_IPA, ZONEX_IPA,
MEM_SIZE) with properly named structs:
struct zone_mem_region { virt_addr, zone0_ipa, zonex_ipa, mem_size }
struct zone_mem { regions[CONFIG_MAX_MEMORY_REGIONS], num_regions }
Also:
- Use CONFIG_MAX_MEMORY_REGIONS directly (matching hvisor constant)
- Inline get_zone_ram_index() into get_virt_addr(), remove the function
- Delete the 4 index macros
- Delete dead `;` statement after `continue`
Reject JSON configs whose memory_region count exceeds CONFIG_MAX_MEMORY_REGIONS instead of silently overflowing the array.
Contributor
Author
|
The alias |
agicy
force-pushed
the
refactor/zone-mem-struct
branch
from
fc971f2 to
674fc54
Compare
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
2 participants
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.
Changes
unsigned long long[4]+ 4 macros with named structs (zone_mem_region,zone_mem)CONFIG_MAX_MEMORY_REGIONS(matching hvisor kernel constant) instead of hardcoded 4num_mems > MAX_RAMSwith clear error instead of silent overflowget_zone_ram_index()intoget_virt_addr(), delete the function and its header declaration;aftercontinue)References
Closes: #99