External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-01-10 14:47:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Use more generic MmapRegion constructor

Browse Source 
Switch to MmapRegion::build() and fill in the fields appropriately.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-03-19 10:10:41 +00:00 committed by Sebastien Boeuf
parent 7257e890ef
commit d11a67b0fe
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vmm/src/device_manager.rs
View File

@ -26,8 +26,8 @@ use arch::layout;
use arch::layout::{APIC_START, IOAPIC_SIZE, IOAPIC_START}; use arch::layout::{APIC_START, IOAPIC_SIZE, IOAPIC_START};
use devices::{ioapic, BusDevice, HotPlugNotificationFlags}; use devices::{ioapic, BusDevice, HotPlugNotificationFlags};
use kvm_ioctls::*; use kvm_ioctls::*;
use libc::O_TMPFILE;
use libc::TIOCGWINSZ; use libc::TIOCGWINSZ;
use libc::{MAP_NORESERVE, MAP_SHARED, O_RDONLY, O_TMPFILE, PROT_READ, PROT_WRITE};
#[cfg(feature = "pci_support")] #[cfg(feature = "pci_support")]
use pci::{ use pci::{
DeviceRelocation, PciBarRegionType, PciBus, PciConfigIo, PciConfigMmio, PciDevice, PciRoot, DeviceRelocation, PciBarRegionType, PciBus, PciConfigIo, PciConfigMmio, PciDevice, PciRoot,
@ -1403,9 +1403,17 @@ impl DeviceManager {
} }
let cloned_file = file.try_clone().map_err(DeviceManagerError::CloneFile)?; let cloned_file = file.try_clone().map_err(DeviceManagerError::CloneFile)?;
let mmap_region = let mmap_region = MmapRegion::build(
MmapRegion::from_file(FileOffset::new(cloned_file, 0), size as usize) Some(FileOffset::new(cloned_file, 0)),
.map_err(DeviceManagerError::NewMmapRegion)?; size as usize,
if pmem_cfg.readonly {
PROT_READ
} else {
PROT_READ | PROT_WRITE
},
MAP_NORESERVE | MAP_SHARED,
)
.map_err(DeviceManagerError::NewMmapRegion)?;
let addr: u64 = mmap_region.as_ptr() as u64; let addr: u64 = mmap_region.as_ptr() as u64;
self._mmap_regions.push(mmap_region); self._mmap_regions.push(mmap_region);