zhenxing
/
zCore
forked from rcore-os/zCore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove map_at_ext in vmar

This commit is contained in:
Ben Pig Chu 2020-09-13 15:25:48 +08:00
parent a98aa368e8
commit 31fde3be20
2 changed files with 11 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
zircon-object/src/vm/vmar.rs
View File

@ -157,30 +157,7 @@ impl VmAddressRegion {
len: usize,
flags: MMUFlags,
) -> ZxResult<VirtAddr> {
self.map_at_ext(vmar_offset, vmo, vmo_offset, len, flags, false, true)
}
/// Map the `vmo` into this VMAR at given `offset`.
#[allow(clippy::too_many_arguments)]
pub fn map_at_ext(
&self,
vmar_offset: usize,
vmo: Arc<VmObject>,
vmo_offset: usize,
len: usize,
flags: MMUFlags,
overwrite: bool,
map_range: bool,
) -> ZxResult<VirtAddr> {
self.map_ext(
Some(vmar_offset),
vmo,
vmo_offset,
len,
flags,
overwrite,
map_range,
)
self.map_ext(Some(vmar_offset), vmo, vmo_offset, len, flags, false, true)
}
/// Map the `vmo` into this VMAR.

31
zircon-syscall/src/vmar.rs
View File

@ -147,27 +147,16 @@ impl Syscall<'_> {
if len == 0 {
return Err(ZxError::INVALID_ARGS);
}
let vaddr = if is_specific {
vmar.map_at_ext(
vmar_offset,
vmo,
vmo_offset,
len,
mapping_flags,
overwrite,
map_range,
)?
} else {
vmar.map_ext(
None,
vmo,
vmo_offset,
len,
mapping_flags,
overwrite,
map_range,
)?
};
let vmar_offset = if is_specific { Some(vmar_offset) } else { None };
let vaddr = vmar.map_ext(
vmar_offset,
vmo,
vmo_offset,
len,
mapping_flags,
overwrite,
map_range,
)?;
info!("vmar.map: at {:#x?}", vaddr);
mapped_addr.write(vaddr)?;
Ok(())