diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-06-14 11:25:18 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-06-14 11:25:18 +0000 |
| commit | b7966a9d2e768533acac0f37bdeb293c256109d3 (patch) | |
| tree | 357a365ecc99e4bec214d084352e316769f70041 /arch | |
| parent | 1e318da5b57c12f67bed3b528100dbe4ec287ac5 (diff) | |
| parent | d42d3fec7a9535b664b89d30fd48c90feda59957 (diff) | |
| download | crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar.gz crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar.bz2 crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar.lz crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar.xz crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.tar.zst crosvm-b7966a9d2e768533acac0f37bdeb293c256109d3.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/src/pstore.rs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/src/pstore.rs b/arch/src/pstore.rs index a06ea1b..a6c5e61 100644 --- a/arch/src/pstore.rs +++ b/arch/src/pstore.rs @@ -64,8 +64,13 @@ pub fn create_memory_region( let memory_mapping = MemoryMapping::from_fd(&file, pstore.size as usize).map_err(Error::MmapError)?; - vm.add_mmio_memory(GuestAddress(address), memory_mapping, false, false) - .map_err(Error::SysUtilError)?; + vm.add_memory_region( + GuestAddress(address), + Box::new(memory_mapping), + false, + false, + ) + .map_err(Error::SysUtilError)?; Ok(RamoopsRegion { address, |