kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

pci: Add error propagation to PCI BAR reprogramming

Browse Source 
Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf
2019-10-28 18:15:08 -07:00
committed by Samuel Ortiz
parent 3e819ac797
commit d6c68e4738
5 changed files with 56 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vfio/src/vfio_pci.rs
View File

@@ -23,7 +23,7 @@ use pci::{
use std::os::unix::io::AsRawFd;
use std::ptr::null_mut;
use std::sync::Arc;
use std::{fmt, io};
use std::{fmt, io, result};
use vfio_bindings::bindings::vfio::*;
use vm_allocator::SystemAllocator;
use vm_memory::{Address, GuestAddress, GuestUsize};
@@ -1004,7 +1004,7 @@ impl PciDevice for VfioPciDevice {
}
}
fn move_bar(&mut self, old_base: u64, new_base: u64) {
fn move_bar(&mut self, old_base: u64, new_base: u64) -> result::Result<(), io::Error> {
for region in self.mmio_regions.iter_mut() {
if region.start.raw_value() == old_base {
region.start = GuestAddress(new_base);
@@ -1023,7 +1023,7 @@ impl PciDevice for VfioPciDevice {
};
// Safe because the guest regions are guaranteed not to overlap.
unsafe {
self.vm_fd.set_user_memory_region(old_mem_region).unwrap();
self.vm_fd.set_user_memory_region(old_mem_region)?;
}
// Insert new region to KVM
@@ -1036,11 +1036,13 @@ impl PciDevice for VfioPciDevice {
};
// Safe because the guest regions are guaranteed not to overlap.
unsafe {
self.vm_fd.set_user_memory_region(new_mem_region).unwrap();
self.vm_fd.set_user_memory_region(new_mem_region)?;
}
}
}
}
}
Ok(())
}
}