virtio-devices: Rename BlockIoUring to Block

Now that BlockIoUring is the only implementation of virtio-block,
handling both synchronous and asynchronous backends based on the
AsyncIo trait, we can rename it to Block.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>

fuzz/fuzz_targets/block.rs

@@ -14,7 +14,7 @@ use std::mem::size_of;
 use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
 use std::path::PathBuf;
 use std::sync::Arc;
-use virtio_devices::{BlockIoUring, VirtioDevice, VirtioInterrupt, VirtioInterruptType};
+use virtio_devices::{Block, VirtioDevice, VirtioInterrupt, VirtioInterruptType};
 use vm_memory::{Bytes, GuestAddress, GuestMemoryAtomic, GuestMemoryMmap};
 use vm_virtio::Queue;
 use vmm_sys_util::eventfd::EventFd;
@@ -86,7 +86,7 @@ fuzz_target!(|bytes| {
     let disk_file: File = unsafe { File::from_raw_fd(shm) };
     let qcow_disk = Box::new(QcowDiskSync::new(disk_file, false)) as Box<dyn DiskFile>;
 
-    let mut block = BlockIoUring::new(
+    let mut block = Block::new(
         "tmp".to_owned(),
         qcow_disk,
         PathBuf::from(""),

virtio-devices/src/block.rs

@@ -91,7 +91,7 @@ pub struct BlockCounters {
     write_ops: Arc<AtomicU64>,
 }
 
-struct BlockIoUringEpollHandler {
+struct BlockEpollHandler {
     queue: Queue,
     mem: GuestMemoryAtomic<GuestMemoryMmap>,
     disk_image: Box<dyn AsyncIo>,
@@ -106,7 +106,7 @@ struct BlockIoUringEpollHandler {
     request_list: HashMap<u16, Request>,
 }
 
-impl BlockIoUringEpollHandler {
+impl BlockEpollHandler {
     fn process_queue_submit(&mut self) -> Result<bool> {
         let queue = &mut self.queue;
         let mem = self.mem.memory();
@@ -248,7 +248,7 @@ impl BlockIoUringEpollHandler {
     }
 }
 
-impl EpollHelperHandler for BlockIoUringEpollHandler {
+impl EpollHelperHandler for BlockEpollHandler {
     fn handle_event(&mut self, _helper: &mut EpollHelper, event: &epoll::Event) -> bool {
         let ev_type = event.data as u16;
         match ev_type {
@@ -304,7 +304,7 @@ impl EpollHelperHandler for BlockIoUringEpollHandler {
 }
 
 /// Virtio device for exposing block level read/write operations on a host file.
-pub struct BlockIoUring {
+pub struct Block {
     common: VirtioCommon,
     id: String,
     disk_image: Box<dyn DiskFile>,
@@ -325,7 +325,7 @@ pub struct BlockState {
     pub config: VirtioBlockConfig,
 }
 
-impl BlockIoUring {
+impl Block {
     /// Create a new virtio block device that operates on the given file.
     #[allow(clippy::too_many_arguments)]
     pub fn new(
@@ -376,7 +376,7 @@ impl BlockIoUring {
             config.num_queues = num_queues as u16;
         }
 
-        Ok(BlockIoUring {
+        Ok(Block {
             common: VirtioCommon {
                 device_type: VirtioDeviceType::TYPE_BLOCK as u32,
                 avail_features,
@@ -437,7 +437,7 @@ impl BlockIoUring {
     }
 }
 
-impl Drop for BlockIoUring {
+impl Drop for Block {
     fn drop(&mut self) {
         if let Some(kill_evt) = self.common.kill_evt.take() {
             // Ignore the result because there is nothing we can do about it.
@@ -446,7 +446,7 @@ impl Drop for BlockIoUring {
     }
 }
 
-impl VirtioDevice for BlockIoUring {
+impl VirtioDevice for Block {
     fn device_type(&self) -> u32 {
         self.common.device_type
     }
@@ -523,7 +523,7 @@ impl VirtioDevice for BlockIoUring {
                     ActivateError::BadActivate
                 })?;
 
-            let mut handler = BlockIoUringEpollHandler {
+            let mut handler = BlockEpollHandler {
                 queue,
                 mem: mem.clone(),
                 disk_image: self
@@ -547,15 +547,15 @@ impl VirtioDevice for BlockIoUring {
             let paused = self.common.paused.clone();
             let paused_sync = self.common.paused_sync.clone();
 
-            // Retrieve seccomp filter for virtio_blk_io_uring thread
+            // Retrieve seccomp filter for virtio_block thread
-            let virtio_blk_io_uring_seccomp_filter =
+            let virtio_block_seccomp_filter =
-                get_seccomp_filter(&self.seccomp_action, Thread::VirtioBlkIoUring)
+                get_seccomp_filter(&self.seccomp_action, Thread::VirtioBlock)
                     .map_err(ActivateError::CreateSeccompFilter)?;
 
             thread::Builder::new()
                 .name(format!("{}_q{}", self.id.clone(), i))
                 .spawn(move || {
-                    if let Err(e) = SeccompFilter::apply(virtio_blk_io_uring_seccomp_filter) {
+                    if let Err(e) = SeccompFilter::apply(virtio_block_seccomp_filter) {
                         error!("Error applying seccomp filter: {:?}", e);
                     } else if let Err(e) = handler.run(paused, paused_sync.unwrap()) {
                         error!("Error running worker: {:?}", e);
@@ -563,7 +563,7 @@ impl VirtioDevice for BlockIoUring {
                 })
                 .map(|thread| epoll_threads.push(thread))
                 .map_err(|e| {
-                    error!("failed to clone the virtio-blk epoll thread: {}", e);
+                    error!("failed to clone the virtio-block epoll thread: {}", e);
                     ActivateError::BadActivate
                 })?;
         }
@@ -601,7 +601,7 @@ impl VirtioDevice for BlockIoUring {
     }
 }
 
-impl Pausable for BlockIoUring {
+impl Pausable for Block {
     fn pause(&mut self) -> result::Result<(), MigratableError> {
         self.common.pause()
     }
@@ -611,7 +611,7 @@ impl Pausable for BlockIoUring {
     }
 }
 
-impl Snapshottable for BlockIoUring {
+impl Snapshottable for Block {
     fn id(&self) -> String {
         self.id.clone()
     }
@@ -651,5 +651,5 @@ impl Snapshottable for BlockIoUring {
         )))
     }
 }
-impl Transportable for BlockIoUring {}
+impl Transportable for Block {}
-impl Migratable for BlockIoUring {}
+impl Migratable for Block {}

virtio-devices/src/lib.rs

@@ -29,7 +29,7 @@ use std::io;
 #[macro_use]
 mod device;
 pub mod balloon;
-pub mod block_io_uring;
+pub mod block;
 mod console;
 pub mod epoll_helper;
 mod iommu;
@@ -45,7 +45,7 @@ pub mod vsock;
 pub mod watchdog;
 
 pub use self::balloon::*;
-pub use self::block_io_uring::*;
+pub use self::block::*;
 pub use self::console::*;
 pub use self::device::*;
 pub use self::epoll_helper::*;

virtio-devices/src/seccomp_filters.rs

@@ -13,7 +13,7 @@ use std::convert::TryInto;
 
 pub enum Thread {
     VirtioBalloon,
-    VirtioBlkIoUring,
+    VirtioBlock,
     VirtioConsole,
     VirtioIommu,
     VirtioMem,
@@ -76,7 +76,7 @@ fn virtio_balloon_thread_rules() -> Result<Vec<SyscallRuleSet>, Error> {
     ])
 }
 
-fn virtio_blk_io_uring_thread_rules() -> Result<Vec<SyscallRuleSet>, Error> {
+fn virtio_block_thread_rules() -> Result<Vec<SyscallRuleSet>, Error> {
     Ok(vec![
         allow_syscall(libc::SYS_brk),
         allow_syscall(libc::SYS_close),
@@ -423,7 +423,7 @@ fn virtio_watchdog_thread_rules() -> Result<Vec<SyscallRuleSet>, Error> {
 fn get_seccomp_filter_trap(thread_type: Thread) -> Result<SeccompFilter, Error> {
     let rules = match thread_type {
         Thread::VirtioBalloon => virtio_balloon_thread_rules()?,
-        Thread::VirtioBlkIoUring => virtio_blk_io_uring_thread_rules()?,
+        Thread::VirtioBlock => virtio_block_thread_rules()?,
         Thread::VirtioConsole => virtio_console_thread_rules()?,
         Thread::VirtioIommu => virtio_iommu_thread_rules()?,
         Thread::VirtioMem => virtio_mem_thread_rules()?,
@@ -448,7 +448,7 @@ fn get_seccomp_filter_trap(thread_type: Thread) -> Result<SeccompFilter, Error>
 fn get_seccomp_filter_log(thread_type: Thread) -> Result<SeccompFilter, Error> {
     let rules = match thread_type {
         Thread::VirtioBalloon => virtio_balloon_thread_rules()?,
-        Thread::VirtioBlkIoUring => virtio_blk_io_uring_thread_rules()?,
+        Thread::VirtioBlock => virtio_block_thread_rules()?,
         Thread::VirtioConsole => virtio_console_thread_rules()?,
         Thread::VirtioIommu => virtio_iommu_thread_rules()?,
         Thread::VirtioMem => virtio_mem_thread_rules()?,

vmm/src/device_manager.rs

@@ -1670,7 +1670,7 @@ impl DeviceManager {
             };
 
             let dev = Arc::new(Mutex::new(
-                virtio_devices::BlockIoUring::new(
+                virtio_devices::Block::new(
                     id.clone(),
                     image,
                     disk_cfg