External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-07-02 16:02:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

pci: Extend the Device trait to carry the device BARs

Browse Source 
When reading from or writing to a PCI BAR to handle a VM exit, we need
to have the BAR address itself to be able to support multiple BARs PCI
devices.

Fixes: #87

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2019-07-03 01:27:38 +02:00
parent 8173e1ccd7
commit 4605ecf1a8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pci/src/device.rs
View File

@ -90,11 +90,11 @@ pub trait PciDevice: BusDevice {
/// Reads from a BAR region mapped in to the device.
/// * `addr` - The guest address inside the BAR.
/// * `data` - Filled with the data from `addr`.
fn read_bar(&mut self, addr: u64, data: &mut [u8]);
fn read_bar(&mut self, base: u64, offset: u64, data: &mut [u8]);
/// Writes to a BAR region mapped in to the device.
/// * `addr` - The guest address inside the BAR.
/// * `data` - The data to write.
fn write_bar(&mut self, addr: u64, data: &[u8]);
fn write_bar(&mut self, base: u64, offset: u64, data: &[u8]);
/// Invoked when the device is sandboxed.
fn on_device_sandboxed(&mut self) {}
}

12
vm-virtio/src/transport/pci_device.rs
View File

@ -480,7 +480,7 @@ impl PciDevice for VirtioPciDevice {
Ok(ranges)
}
fn read_bar(&mut self, offset: u64, data: &mut [u8]) {
fn read_bar(&mut self, _base: u64, offset: u64, data: &mut [u8]) {
match offset {
o if o < COMMON_CONFIG_BAR_OFFSET + COMMON_CONFIG_SIZE => self.common_config.read(
o - COMMON_CONFIG_BAR_OFFSET,
@ -524,7 +524,7 @@ impl PciDevice for VirtioPciDevice {
}
}
fn write_bar(&mut self, offset: u64, data: &[u8]) {
fn write_bar(&mut self, _base: u64, offset: u64, data: &[u8]) {
match offset {
o if o < COMMON_CONFIG_BAR_OFFSET + COMMON_CONFIG_SIZE => self.common_config.write(
o - COMMON_CONFIG_BAR_OFFSET,
@ -607,11 +607,11 @@ impl PciDevice for VirtioPciDevice {
}
impl BusDevice for VirtioPciDevice {
fn read(&mut self, _base: u64, offset: u64, data: &mut [u8]) {
self.read_bar(offset, data)
fn read(&mut self, base: u64, offset: u64, data: &mut [u8]) {
self.read_bar(base, offset, data)
}
fn write(&mut self, _base: u64, offset: u64, data: &[u8]) {
self.write_bar(offset, data)
fn write(&mut self, base: u64, offset: u64, data: &[u8]) {
self.write_bar(base, offset, data)
}
}