mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-05 02:02:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

devices: remove ioevents() overrides that can use the defaults

Browse source 
A few PciDevice implementations were providing an ioevents function that
did the same thing as the default trait implementation. Remove them to
clarify which devices actually need ioevent support.

BUG=None
TEST=cargo build

Change-Id: I40a6ca14028ea1d739f169c81079ffac648e7035
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3770820
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Tested-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
This commit is contained in:
Daniel Verkamp 2022-07-13 17:18:25 -07:00 committed by crosvm LUCI
parent 022fb73b67
commit 6385eee278
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
devices/src/pci/pcie/pci_bridge.rs
View file

@ -12,8 +12,7 @@ use crate::pci::{
PciDeviceError, PciHeaderType, PCI_VENDOR_ID_INTEL,
};
use crate::PciInterruptPin;
use base::{warn, AsRawDescriptors, Event, RawDescriptor, Tube};
use hypervisor::Datamatch;
use base::{warn, AsRawDescriptors, RawDescriptor, Tube};
use resources::{Alloc, MmioType, SystemAllocator};
use crate::pci::pcie::pcie_device::PcieDevice;
@ -283,10 +282,6 @@ impl PciDevice for PciBridge {
Ok(())
}
fn ioevents(&self) -> Vec<(&Event, u64, Datamatch)> {
Vec::new()
}
fn read_config_register(&self, reg_idx: usize) -> u32 {
let mut data: u32 = self.config.read_reg(reg_idx);

6
devices/src/pci/vfio_pci.rs
View file

@ -20,7 +20,7 @@ use base::{
error, pagesize, warn, AsRawDescriptor, AsRawDescriptors, Event, EventToken, Protection,
RawDescriptor, Tube, WaitContext,
};
use hypervisor::{Datamatch, MemSlot};
use hypervisor::MemSlot;
use resources::{Alloc, MmioType, SystemAllocator};
@ -1549,10 +1549,6 @@ impl PciDevice for VfioPciDevice {
Ok(())
}
fn ioevents(&self) -> Vec<(&Event, u64, Datamatch)> {
Vec::new()
}
fn read_config_register(&self, reg_idx: usize) -> u32 {
#[cfg(feature = "direct")]
if reg_idx == HEADER_TYPE_REG {