@@ -438,7 +438,7 @@ impl GuestMemoryMmap {
438
438
return Err ( Error :: UnsortedMemoryRegions ) ;
439
439
}
440
440
441
- if prev. end_addr ( ) >= next. start_addr ( ) {
441
+ if prev. last_addr ( ) >= next. start_addr ( ) {
442
442
return Err ( Error :: MemoryRegionOverlap ) ;
443
443
}
444
444
}
@@ -458,7 +458,7 @@ impl GuestMemory for GuestMemoryMmap {
458
458
let index = match self . regions . binary_search_by_key ( & addr, |x| x. start_addr ( ) ) {
459
459
Ok ( x) => Some ( x) ,
460
460
// 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 ) ,
462
462
_ => None ,
463
463
} ;
464
464
index. map ( |x| self . regions [ x] . as_ref ( ) )
@@ -526,11 +526,11 @@ mod tests {
526
526
assert_eq ! ( guest_mem. num_regions( ) , expected_regions_summary. len( ) ) ;
527
527
let maybe_last_mem_reg = expected_regions_summary. last ( ) ;
528
528
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 ) ;
532
532
}
533
- assert_eq ! ( guest_mem. end_addr ( ) , end_addr ) ;
533
+ assert_eq ! ( guest_mem. last_addr ( ) , last_addr ) ;
534
534
}
535
535
for ( ( region_addr, region_size) , mmap) in expected_regions_summary
536
536
. iter ( )
0 commit comments