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 /src/linux.rs | |
| 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 'src/linux.rs')
| -rw-r--r-- | src/linux.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/linux.rs b/src/linux.rs index 3e2045f..ec2067c 100644 --- a/src/linux.rs +++ b/src/linux.rs @@ -1012,9 +1012,9 @@ fn create_pmem_device( .map_err(Error::AllocatePmemDeviceAddress)?; let slot = vm - .add_mmap_arena( + .add_memory_region( GuestAddress(mapping_address), - arena, + Box::new(arena), /* read_only = */ disk.read_only, /* log_dirty_pages = */ false, ) |