diff --git a/devices/src/pci/vfio_pci.rs b/devices/src/pci/vfio_pci.rs
index 18ac80497d..46ee5372b4 100644
--- a/devices/src/pci/vfio_pci.rs
+++ b/devices/src/pci/vfio_pci.rs
@@ -549,22 +549,25 @@ impl VfioPciDevice {
         if let Some(ref interrupt_evt) = self.interrupt_evt {
             let mut fds = Vec::new();
             fds.push(interrupt_evt);
-            if let Err(e) = self.device.irq_enable(fds, VfioIrqType::Intx) {
+            if let Err(e) = self.device.irq_enable(fds, VFIO_PCI_INTX_IRQ_INDEX) {
                 error!("Intx enable failed: {}", e);
                 return;
             }
             if let Some(ref irq_resample_evt) = self.interrupt_resample_evt {
-                if let Err(e) = self.device.irq_mask(VfioIrqType::Intx) {
+                if let Err(e) = self.device.irq_mask(VFIO_PCI_INTX_IRQ_INDEX) {
                     error!("Intx mask failed: {}", e);
                     self.disable_intx();
                     return;
                 }
-                if let Err(e) = self.device.resample_virq_enable(irq_resample_evt) {
+                if let Err(e) = self
+                    .device
+                    .resample_virq_enable(irq_resample_evt, VFIO_PCI_INTX_IRQ_INDEX)
+                {
                     error!("resample enable failed: {}", e);
                     self.disable_intx();
                     return;
                 }
-                if let Err(e) = self.device.irq_unmask(VfioIrqType::Intx) {
+                if let Err(e) = self.device.irq_unmask(VFIO_PCI_INTX_IRQ_INDEX) {
                     error!("Intx unmask failed: {}", e);
                     self.disable_intx();
                     return;
@@ -576,7 +579,7 @@ impl VfioPciDevice {
     }
 
     fn disable_intx(&mut self) {
-        if let Err(e) = self.device.irq_disable(VfioIrqType::Intx) {
+        if let Err(e) = self.device.irq_disable(VFIO_PCI_INTX_IRQ_INDEX) {
             error!("Intx disable failed: {}", e);
         }
         self.irq_type = None;
@@ -616,7 +619,7 @@ impl VfioPciDevice {
 
         let mut fds = Vec::new();
         fds.push(irqfd);
-        if let Err(e) = self.device.irq_enable(fds, VfioIrqType::Msi) {
+        if let Err(e) = self.device.irq_enable(fds, VFIO_PCI_MSI_IRQ_INDEX) {
             error!("failed to enable msi: {}", e);
             self.enable_intx();
             return;
@@ -626,7 +629,7 @@ impl VfioPciDevice {
     }
 
     fn disable_msi(&mut self) {
-        if let Err(e) = self.device.irq_disable(VfioIrqType::Msi) {
+        if let Err(e) = self.device.irq_disable(VFIO_PCI_MSI_IRQ_INDEX) {
             error!("failed to disable msi: {}", e);
             return;
         }
@@ -643,7 +646,7 @@ impl VfioPciDevice {
         };
 
         if let Some(descriptors) = irqfds {
-            if let Err(e) = self.device.irq_enable(descriptors, VfioIrqType::Msix) {
+            if let Err(e) = self.device.irq_enable(descriptors, VFIO_PCI_MSIX_IRQ_INDEX) {
                 error!("failed to enable msix: {}", e);
                 self.enable_intx();
                 return;
@@ -657,7 +660,7 @@ impl VfioPciDevice {
     }
 
     fn disable_msix(&mut self) {
-        if let Err(e) = self.device.irq_disable(VfioIrqType::Msix) {
+        if let Err(e) = self.device.irq_disable(VFIO_PCI_MSIX_IRQ_INDEX) {
             error!("failed to disable msix: {}", e);
             return;
         }
diff --git a/devices/src/vfio.rs b/devices/src/vfio.rs
index 6646c61876..9fda0d65db 100644
--- a/devices/src/vfio.rs
+++ b/devices/src/vfio.rs
@@ -391,21 +391,13 @@ impl VfioDevice {
     /// Enable vfio device's irq and associate Irqfd Event with device.
     /// When MSIx is enabled, multi vectors will be supported, so descriptors is vector and the vector
     /// length is the num of MSIx vectors
-    pub fn irq_enable(
-        &self,
-        descriptors: Vec<&Event>,
-        irq_type: VfioIrqType,
-    ) -> Result<(), VfioError> {
+    pub fn irq_enable(&self, descriptors: Vec<&Event>, index: u32) -> Result<(), VfioError> {
         let count = descriptors.len();
         let u32_size = mem::size_of::<u32>();
         let mut irq_set = vec_with_array_field::<vfio_irq_set, u32>(count);
         irq_set[0].argsz = (mem::size_of::<vfio_irq_set>() + count * u32_size) as u32;
         irq_set[0].flags = VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_TRIGGER;
-        match irq_type {
-            VfioIrqType::Intx => irq_set[0].index = VFIO_PCI_INTX_IRQ_INDEX,
-            VfioIrqType::Msi => irq_set[0].index = VFIO_PCI_MSI_IRQ_INDEX,
-            VfioIrqType::Msix => irq_set[0].index = VFIO_PCI_MSIX_IRQ_INDEX,
-        }
+        irq_set[0].index = index;
         irq_set[0].start = 0;
         irq_set[0].count = count as u32;
 
@@ -438,11 +430,11 @@ impl VfioDevice {
     /// This function enable resample irqfd and let vfio kernel could get EOI notification.
     ///
     /// descriptor: should be resample IrqFd.
-    pub fn resample_virq_enable(&self, descriptor: &Event) -> Result<(), VfioError> {
+    pub fn resample_virq_enable(&self, descriptor: &Event, index: u32) -> Result<(), VfioError> {
         let mut irq_set = vec_with_array_field::<vfio_irq_set, u32>(1);
         irq_set[0].argsz = (mem::size_of::<vfio_irq_set>() + mem::size_of::<u32>()) as u32;
         irq_set[0].flags = VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_UNMASK;
-        irq_set[0].index = VFIO_PCI_INTX_IRQ_INDEX;
+        irq_set[0].index = index;
         irq_set[0].start = 0;
         irq_set[0].count = 1;
 
@@ -465,15 +457,11 @@ impl VfioDevice {
     }
 
     /// disable vfio device's irq and disconnect Irqfd Event with device
-    pub fn irq_disable(&self, irq_type: VfioIrqType) -> Result<(), VfioError> {
+    pub fn irq_disable(&self, index: u32) -> Result<(), VfioError> {
         let mut irq_set = vec_with_array_field::<vfio_irq_set, u32>(0);
         irq_set[0].argsz = mem::size_of::<vfio_irq_set>() as u32;
         irq_set[0].flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_TRIGGER;
-        match irq_type {
-            VfioIrqType::Intx => irq_set[0].index = VFIO_PCI_INTX_IRQ_INDEX,
-            VfioIrqType::Msi => irq_set[0].index = VFIO_PCI_MSI_IRQ_INDEX,
-            VfioIrqType::Msix => irq_set[0].index = VFIO_PCI_MSIX_IRQ_INDEX,
-        }
+        irq_set[0].index = index;
         irq_set[0].start = 0;
         irq_set[0].count = 0;
 
@@ -487,15 +475,11 @@ impl VfioDevice {
     }
 
     /// Unmask vfio device irq
-    pub fn irq_unmask(&self, irq_type: VfioIrqType) -> Result<(), VfioError> {
+    pub fn irq_unmask(&self, index: u32) -> Result<(), VfioError> {
         let mut irq_set = vec_with_array_field::<vfio_irq_set, u32>(0);
         irq_set[0].argsz = mem::size_of::<vfio_irq_set>() as u32;
         irq_set[0].flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_UNMASK;
-        match irq_type {
-            VfioIrqType::Intx => irq_set[0].index = VFIO_PCI_INTX_IRQ_INDEX,
-            VfioIrqType::Msi => irq_set[0].index = VFIO_PCI_MSI_IRQ_INDEX,
-            VfioIrqType::Msix => irq_set[0].index = VFIO_PCI_MSIX_IRQ_INDEX,
-        }
+        irq_set[0].index = index;
         irq_set[0].start = 0;
         irq_set[0].count = 1;
 
@@ -509,15 +493,11 @@ impl VfioDevice {
     }
 
     /// Mask vfio device irq
-    pub fn irq_mask(&self, irq_type: VfioIrqType) -> Result<(), VfioError> {
+    pub fn irq_mask(&self, index: u32) -> Result<(), VfioError> {
         let mut irq_set = vec_with_array_field::<vfio_irq_set, u32>(0);
         irq_set[0].argsz = mem::size_of::<vfio_irq_set>() as u32;
         irq_set[0].flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_MASK;
-        match irq_type {
-            VfioIrqType::Intx => irq_set[0].index = VFIO_PCI_INTX_IRQ_INDEX,
-            VfioIrqType::Msi => irq_set[0].index = VFIO_PCI_MSI_IRQ_INDEX,
-            VfioIrqType::Msix => irq_set[0].index = VFIO_PCI_MSIX_IRQ_INDEX,
-        }
+        irq_set[0].index = index;
         irq_set[0].start = 0;
         irq_set[0].count = 1;