diff --git a/pci/src/msix.rs b/pci/src/msix.rs
index ba0e027cf..106bbae92 100644
--- a/pci/src/msix.rs
+++ b/pci/src/msix.rs
@@ -8,8 +8,7 @@ extern crate vm_memory;
 
 use std::sync::Arc;
 
-use crate::device::InterruptParameters;
-use crate::{set_kvm_routes, InterruptDelivery, InterruptRoute, PciCapability, PciCapabilityID};
+use crate::{set_kvm_routes, InterruptRoute, PciCapability, PciCapabilityID};
 use byteorder::{ByteOrder, LittleEndian};
 use kvm_bindings::{kvm_irq_routing_entry, KVM_IRQ_ROUTING_MSI};
 use kvm_ioctls::VmFd;
@@ -59,7 +58,6 @@ pub struct MsixConfig {
     pub irq_routes: Vec<InterruptRoute>,
     vm_fd: Arc<VmFd>,
     gsi_msi_routes: Arc<Mutex<HashMap<u32, kvm_irq_routing_entry>>>,
-    interrupt_cb: Option<Arc<InterruptDelivery>>,
     masked: bool,
     enabled: bool,
 }
@@ -90,16 +88,11 @@ impl MsixConfig {
             irq_routes,
             vm_fd,
             gsi_msi_routes,
-            interrupt_cb: None,
             masked: false,
             enabled: false,
         }
     }
 
-    pub fn register_interrupt_cb(&mut self, cb: Arc<InterruptDelivery>) {
-        self.interrupt_cb = Some(cb);
-    }
-
     pub fn masked(&self) -> bool {
         self.masked
     }
@@ -366,13 +359,9 @@ impl MsixConfig {
 
     fn inject_msix_and_clear_pba(&mut self, vector: usize) {
         // Inject the MSI message
-        if let Some(cb) = &self.interrupt_cb {
-            match (cb)(InterruptParameters {
-                msix: Some(&self.table_entries[vector]),
-            }) {
-                Ok(_) => debug!("MSI-X injected on vector control flip"),
-                Err(e) => error!("failed to inject MSI-X: {}", e),
-            };
+        match self.irq_routes[vector].irq_fd.write(1) {
+            Ok(_) => debug!("MSI-X injected on vector control flip"),
+            Err(e) => error!("failed to inject MSI-X: {}", e),
         }
 
         // Clear the bit from PBA
diff --git a/vm-virtio/src/transport/pci_device.rs b/vm-virtio/src/transport/pci_device.rs
index 6409b31fa..fab540366 100755
--- a/vm-virtio/src/transport/pci_device.rs
+++ b/vm-virtio/src/transport/pci_device.rs
@@ -498,11 +498,6 @@ impl PciDevice for VirtioPciDevice {
 
     fn assign_msix(&mut self, msi_cb: Arc<InterruptDelivery>) {
         if let Some(msix_config) = &self.msix_config {
-            msix_config
-                .lock()
-                .unwrap()
-                .register_interrupt_cb(msi_cb.clone());
-
             let msix_config_clone = msix_config.clone();
 
             let common_config_msi_vector = self.common_config.msix_config.clone();