fdt: enumerate all memory nodes present

It is possible for the device tree to have multiple memory nodes. Iterate through all regions defined by all memory nodes. Signed-off-by: Thomas Barrett <[email protected]>
cloud-hypervisor · Aug 19, 2024 · 83531ed · 83531ed
1 parent 4c33124
commit 83531ed
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/fdt.rs b/src/fdt.rs
@@ -78,11 +78,15 @@ impl Info for StartInfo<'_> {
     }
 
     fn num_entries(&self) -> usize {
-        self.fdt.memory().regions().count()
+        let nodes = self.fdt.find_all_nodes("/memory");
+        let regions = nodes.flat_map(|n| n.reg().unwrap());
+        regions.count()
     }
 
     fn entry(&self, idx: usize) -> MemoryEntry {
-        for (i, region) in self.fdt.memory().regions().enumerate() {
+        let nodes = self.fdt.find_all_nodes("/memory");
+        let regions = nodes.flat_map(|n| n.reg().unwrap());
+        for (i, region) in regions.enumerate() {
             if i == idx {
                 return MemoryEntry {
                     addr: region.starting_address as u64,