virtio-devices: Add set_notifier() method to VirtioInterrupt

It is currently left as unimplemented!().

No functional change intended as there are no callers.

Signed-off-by: Demi Marie Obenour <demiobenour@gmail.com>

Cargo.lock

@@ -2455,6 +2455,7 @@ dependencies = [
  "byteorder",
  "epoll",
  "event_monitor",
+ "hypervisor",
  "libc",
  "log",
  "mshv-ioctls",

fuzz/Cargo.lock

@@ -1372,6 +1372,7 @@ dependencies = [
  "byteorder",
  "epoll",
  "event_monitor",
+ "hypervisor",
  "libc",
  "log",
  "net_util",

fuzz/fuzz_targets/balloon.rs

@@ -119,6 +119,15 @@ impl VirtioInterrupt for NoopVirtioInterrupt {
     fn trigger(&self, _int_type: VirtioInterruptType) -> std::result::Result<(), std::io::Error> {
         Ok(())
     }
+
+    fn set_notifier(
+        &self,
+        _interrupt: u32,
+        _eventfd: Option<EventFd>,
+        _vm: &dyn hypervisor::Vm,
+    ) -> std::io::Result<()> {
+        unimplemented!()
+    }
 }
 
 macro_rules! align {

fuzz/fuzz_targets/block.rs

@@ -121,6 +121,15 @@ impl VirtioInterrupt for NoopVirtioInterrupt {
     fn trigger(&self, _int_type: VirtioInterruptType) -> std::result::Result<(), std::io::Error> {
         Ok(())
     }
+
+    fn set_notifier(
+        &self,
+        _interrupt: u32,
+        _eventfd: Option<EventFd>,
+        _vm: &dyn hypervisor::Vm,
+    ) -> std::io::Result<()> {
+        unimplemented!()
+    }
 }
 
 fn setup_virt_queue(bytes: &[u8; QUEUE_DATA_SIZE]) -> Queue {

fuzz/fuzz_targets/console.rs

@@ -148,6 +148,15 @@ impl VirtioInterrupt for NoopVirtioInterrupt {
     fn trigger(&self, _int_type: VirtioInterruptType) -> std::result::Result<(), std::io::Error> {
         Ok(())
     }
+
+    fn set_notifier(
+        &self,
+        _interrupt: u32,
+        _eventfd: Option<EventFd>,
+        _vm: &dyn hypervisor::Vm,
+    ) -> std::io::Result<()> {
+        unimplemented!()
+    }
 }
 
 fn setup_virt_queues(bytes: &[&[u8; QUEUE_DATA_SIZE]], base_addr: u64) -> Vec<Queue> {

fuzz/fuzz_targets/iommu.rs

@@ -130,6 +130,15 @@ impl VirtioInterrupt for NoopVirtioInterrupt {
     fn trigger(&self, _int_type: VirtioInterruptType) -> std::result::Result<(), std::io::Error> {
         Ok(())
     }
+
+    fn set_notifier(
+        &self,
+        _interrupt: u32,
+        _eventfd: Option<EventFd>,
+        _vm: &dyn hypervisor::Vm,
+    ) -> std::io::Result<()> {
+        unimplemented!()
+    }
 }
 
 fn setup_virt_queue(bytes: &[u8; QUEUE_DATA_SIZE]) -> Queue {

fuzz/fuzz_targets/mem.rs

@@ -125,6 +125,15 @@ impl VirtioInterrupt for NoopVirtioInterrupt {
     fn trigger(&self, _int_type: VirtioInterruptType) -> std::result::Result<(), std::io::Error> {
         Ok(())
     }
+
+    fn set_notifier(
+        &self,
+        _interrupt: u32,
+        _eventfd: Option<EventFd>,
+        _vm: &dyn hypervisor::Vm,
+    ) -> std::io::Result<()> {
+        unimplemented!()
+    }
 }
 
 // Create a dummy virtio-mem device for fuzzing purpose only

fuzz/fuzz_targets/net.rs

@@ -166,6 +166,15 @@ impl VirtioInterrupt for NoopVirtioInterrupt {
     fn trigger(&self, _int_type: VirtioInterruptType) -> std::result::Result<(), std::io::Error> {
         Ok(())
     }
+
+    fn set_notifier(
+        &self,
+        _interrupt: u32,
+        _eventfd: Option<EventFd>,
+        _vm: &dyn hypervisor::Vm,
+    ) -> std::io::Result<()> {
+        unimplemented!()
+    }
 }
 
 fn setup_virt_queues(bytes: &[&[u8; QUEUE_DATA_SIZE]], base_addr: u64) -> Vec<Queue> {

fuzz/fuzz_targets/pmem.rs

@@ -95,6 +95,15 @@ impl VirtioInterrupt for NoopVirtioInterrupt {
     fn trigger(&self, _int_type: VirtioInterruptType) -> std::result::Result<(), std::io::Error> {
         Ok(())
     }
+
+    fn set_notifier(
+        &self,
+        _interrupt: u32,
+        _eventfd: Option<EventFd>,
+        _vm: &dyn hypervisor::Vm,
+    ) -> std::io::Result<()> {
+        unimplemented!()
+    }
 }
 
 // Create a dummy virtio-pmem device for fuzzing purpose only

fuzz/fuzz_targets/rng.rs

@@ -119,6 +119,15 @@ impl VirtioInterrupt for NoopVirtioInterrupt {
     fn trigger(&self, _int_type: VirtioInterruptType) -> std::result::Result<(), std::io::Error> {
         Ok(())
     }
+
+    fn set_notifier(
+        &self,
+        _interrupt: u32,
+        _eventfd: Option<EventFd>,
+        _vm: &dyn hypervisor::Vm,
+    ) -> std::io::Result<()> {
+        unimplemented!()
+    }
 }
 
 fn setup_virt_queue(bytes: &[u8; QUEUE_DATA_SIZE]) -> Queue {

fuzz/fuzz_targets/vsock.rs

@@ -128,6 +128,15 @@ impl VirtioInterrupt for NoopVirtioInterrupt {
     fn trigger(&self, _int_type: VirtioInterruptType) -> std::result::Result<(), std::io::Error> {
         Ok(())
     }
+
+    fn set_notifier(
+        &self,
+        _interrupt: u32,
+        _eventfd: Option<EventFd>,
+        _vm: &dyn hypervisor::Vm,
+    ) -> std::io::Result<()> {
+        unimplemented!()
+    }
 }
 
 fn setup_virt_queue(bytes: &[u8; QUEUE_DATA_SIZE]) -> Queue {

fuzz/fuzz_targets/watchdog.rs

@@ -84,6 +84,15 @@ impl VirtioInterrupt for NoopVirtioInterrupt {
     fn trigger(&self, _int_type: VirtioInterruptType) -> std::result::Result<(), std::io::Error> {
         Ok(())
     }
+
+    fn set_notifier(
+        &self,
+        _interrupt: u32,
+        _eventfd: Option<EventFd>,
+        _vm: &dyn hypervisor::Vm,
+    ) -> std::io::Result<()> {
+        unimplemented!()
+    }
 }
 
 fn setup_virt_queue(bytes: &[u8; QUEUE_DATA_SIZE]) -> Queue {

virtio-devices/Cargo.toml

@@ -17,6 +17,7 @@ block = { path = "../block" }
 byteorder = { workspace = true }
 epoll = { workspace = true }
 event_monitor = { path = "../event_monitor" }
+hypervisor = { path = "../hypervisor" }
 libc = { workspace = true }
 log = { workspace = true }
 mshv-ioctls = { workspace = true, optional = true }

virtio-devices/src/device.rs

@@ -37,6 +37,12 @@ pub trait VirtioInterrupt: Send + Sync {
     fn notifier(&self, _int_type: VirtioInterruptType) -> Option<EventFd> {
         None
     }
+    fn set_notifier(
+        &self,
+        int_type: u32,
+        notifier: Option<EventFd>,
+        vm: &dyn hypervisor::Vm,
+    ) -> std::io::Result<()>;
 }
 
 #[derive(Clone)]

virtio-devices/src/transport/pci_device.rs

@@ -914,6 +914,15 @@ impl VirtioInterrupt for VirtioInterruptMsix {
         self.interrupt_source_group
             .notifier(vector as InterruptIndex)
     }
+
+    fn set_notifier(
+        &self,
+        _interrupt: u32,
+        _eventfd: Option<EventFd>,
+        _vm: &dyn hypervisor::Vm,
+    ) -> std::io::Result<()> {
+        unimplemented!()
+    }
 }
 
 impl PciDevice for VirtioPciDevice {

virtio-devices/src/vsock/mod.rs

@@ -188,6 +188,15 @@ pub mod unit_tests {
         ) -> std::result::Result<(), std::io::Error> {
             Ok(())
         }
+
+        fn set_notifier(
+            &self,
+            _interrupt: u32,
+            _eventfd: Option<EventFd>,
+            _vm: &dyn hypervisor::Vm,
+        ) -> std::io::Result<()> {
+            unimplemented!()
+        }
     }
 
     pub struct TestBackend {