External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-01 11:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: memory_manager: Provide file offset through create_ram_region()

Browse Source 
In anticipation for the need to map part of a file with the function
create_ram_region(), it is extended to accept a file offset as argument.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2020-08-18 17:32:44 +02:00 committed by Samuel Ortiz
parent 59d4a56ab7
commit 7cd3867e2c
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vmm/src/memory_manager.rs
View File

@ -270,6 +270,7 @@ impl MemoryManager {
for region in ext_regions.iter() {
mem_regions.push(MemoryManager::create_ram_region(
&Some(region.backing_file.clone()),
0,
region.start_addr,
region.size as usize,
true,
@ -282,6 +283,7 @@ impl MemoryManager {
for region in ram_regions.iter() {
mem_regions.push(MemoryManager::create_ram_region(
&config.file,
0,
region.0,
region.1,
false,
@ -311,6 +313,7 @@ impl MemoryManager {
);
virtiomem_region = Some(MemoryManager::create_ram_region(
&config.file,
0,
start_addr,
size as usize,
false,
@ -501,8 +504,10 @@ impl MemoryManager {
}
}
#[allow(clippy::too_many_arguments)]
fn create_ram_region(
backing_file: &Option<PathBuf>,
mut file_offset: u64,
start_addr: GuestAddress,
size: usize,
copy_on_write: bool,
@ -513,6 +518,12 @@ impl MemoryManager {
Ok(Arc::new(match backing_file {
Some(ref file) => {
let f = if file.is_dir() {
// Override file offset as it does not apply in this case.
info!(
"Ignoring file offset since the backing file is a \
temporary file created from the specified directory."
);
file_offset = 0;
let fs_str = format!("{}{}", file.display(), "/tmpfile_XXXXXX");
let fs = ffi::CString::new(fs_str).unwrap();
let mut path = fs.as_bytes_with_nul().to_owned();
@ -540,7 +551,7 @@ impl MemoryManager {
}
GuestRegionMmap::new(
MmapRegion::build(
Some(FileOffset::new(f, 0)),
Some(FileOffset::new(f, file_offset)),
size,
libc::PROT_READ | libc::PROT_WRITE,
mmap_flags,
@ -643,6 +654,7 @@ impl MemoryManager {
// Allocate memory for the region
let region = MemoryManager::create_ram_region(
&self.backing_file,
0,
start_addr,
size,
false,