Skip to content

Commit beaf215

Browse files
Iulian Barbubonzini
authored andcommitted
Rename guest memory end_addr to last addr
Renamed `end_addr` defined in both `GuestMemoryRegion` and `GuestMemory` to `last_addr`. Signed-off-by: Iulian Barbu <iul@amazon.com>
1 parent 218afdd commit beaf215

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/guest_memory.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ pub trait GuestMemoryRegion: Bytes<MemoryRegionAddress, E = Error> {
164164
fn start_addr(&self) -> GuestAddress;
165165

166166
/// Get maximum (inclusive) address managed by the region.
167-
fn end_addr(&self) -> GuestAddress {
167+
fn last_addr(&self) -> GuestAddress {
168168
// unchecked_add is safe as the region bounds were checked when it was created.
169169
self.start_addr().unchecked_add(self.len() - 1)
170170
}
@@ -302,10 +302,10 @@ pub trait GuestMemory {
302302
G: Fn(T, T) -> T;
303303

304304
/// Get maximum (inclusive) address managed by the region.
305-
fn end_addr(&self) -> GuestAddress {
305+
fn last_addr(&self) -> GuestAddress {
306306
self.map_and_fold(
307307
GuestAddress(0),
308-
|(_, region)| region.end_addr(),
308+
|(_, region)| region.last_addr(),
309309
std::cmp::max,
310310
)
311311
}

src/mmap.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ impl GuestMemoryMmap {
438438
return Err(Error::UnsortedMemoryRegions);
439439
}
440440

441-
if prev.end_addr() >= next.start_addr() {
441+
if prev.last_addr() >= next.start_addr() {
442442
return Err(Error::MemoryRegionOverlap);
443443
}
444444
}
@@ -458,7 +458,7 @@ impl GuestMemory for GuestMemoryMmap {
458458
let index = match self.regions.binary_search_by_key(&addr, |x| x.start_addr()) {
459459
Ok(x) => Some(x),
460460
// Within the closest region with starting address < addr
461-
Err(x) if (x > 0 && addr <= self.regions[x - 1].end_addr()) => Some(x - 1),
461+
Err(x) if (x > 0 && addr <= self.regions[x - 1].last_addr()) => Some(x - 1),
462462
_ => None,
463463
};
464464
index.map(|x| self.regions[x].as_ref())
@@ -526,11 +526,11 @@ mod tests {
526526
assert_eq!(guest_mem.num_regions(), expected_regions_summary.len());
527527
let maybe_last_mem_reg = expected_regions_summary.last();
528528
if let Some((region_addr, region_size)) = maybe_last_mem_reg {
529-
let mut end_addr = region_addr.unchecked_add(*region_size as u64);
530-
if end_addr.raw_value() != 0 {
531-
end_addr = end_addr.unchecked_sub(1);
529+
let mut last_addr = region_addr.unchecked_add(*region_size as u64);
530+
if last_addr.raw_value() != 0 {
531+
last_addr = last_addr.unchecked_sub(1);
532532
}
533-
assert_eq!(guest_mem.end_addr(), end_addr);
533+
assert_eq!(guest_mem.last_addr(), last_addr);
534534
}
535535
for ((region_addr, region_size), mmap) in expected_regions_summary
536536
.iter()

0 commit comments

Comments
 (0)