From e91638e6c5d45c687680b2439db1e0d4071eff6d Mon Sep 17 00:00:00 2001
From: Sebastien Boeuf <sebastien.boeuf@intel.com>
Date: Mon, 20 Jan 2020 16:41:25 +0100
Subject: [PATCH] pci: Cleanup the crate from unneeded types

Both InterruptDelivery and InterruptParameters can be removed from the
pci crate as they are not used anymore.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
---
 pci/src/device.rs | 8 --------
 pci/src/lib.rs    | 3 +--
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/pci/src/device.rs b/pci/src/device.rs
index b20f61789..16fda6f18 100755
--- a/pci/src/device.rs
+++ b/pci/src/device.rs
@@ -3,7 +3,6 @@
 // found in the LICENSE-BSD-3-Clause file.
 
 use crate::configuration::{self, PciBarRegionType};
-use crate::msix::MsixTableEntry;
 use devices::BusDevice;
 use std::any::Any;
 use std::fmt::{self, Display};
@@ -11,13 +10,6 @@ use std::{self, io, result};
 use vm_allocator::SystemAllocator;
 use vm_memory::{GuestAddress, GuestUsize};
 
-pub struct InterruptParameters<'a> {
-    pub msix: Option<&'a MsixTableEntry>,
-}
-
-pub type InterruptDelivery =
-    Box<dyn Fn(InterruptParameters) -> result::Result<(), io::Error> + Send + Sync>;
-
 #[derive(Debug)]
 pub enum Error {
     /// Setup of the device capabilities failed.
diff --git a/pci/src/lib.rs b/pci/src/lib.rs
index 91bdf5c9d..5e7ad586f 100644
--- a/pci/src/lib.rs
+++ b/pci/src/lib.rs
@@ -21,8 +21,7 @@ pub use self::configuration::{
     PciNetworkControllerSubclass, PciProgrammingInterface, PciSerialBusSubClass, PciSubclass,
 };
 pub use self::device::{
-    BarReprogrammingParams, DeviceRelocation, Error as PciDeviceError, InterruptDelivery,
-    InterruptParameters, PciDevice,
+    BarReprogrammingParams, DeviceRelocation, Error as PciDeviceError, PciDevice,
 };
 pub use self::msi::{msi_num_enabled_vectors, MsiCap, MsiConfig};
 pub use self::msix::{MsixCap, MsixConfig, MsixTableEntry, MSIX_TABLE_ENTRY_SIZE};