nvme_test: Added NvmeWorkersContext input for the NvmeWorkers struct

vm/devices/storage/nvme_test/src/pci.rs

@@ -15,6 +15,7 @@ use crate::VENDOR_ID;
 use crate::spec;
 use crate::workers::IoQueueEntrySizes;
 use crate::workers::NvmeWorkers;
+use crate::workers::NvmeWorkersContext;
 use chipset_device::ChipsetDevice;
 use chipset_device::io::IoError;
 use chipset_device::io::IoError::InvalidRegister;
@@ -146,16 +147,16 @@ impl NvmeFaultController {
             .collect();
 
         let qe_sizes = Arc::new(Default::default());
-        let admin = NvmeWorkers::new(
+        let admin = NvmeWorkers::new(NvmeWorkersContext {
             driver_source,
-            guest_memory,
+            mem: guest_memory,
             interrupts,
-            caps.max_io_queues,
-            caps.max_io_queues,
-            Arc::clone(&qe_sizes),
-            caps.subsystem_id,
+            max_sqs: caps.max_io_queues,
+            max_cqs: caps.max_io_queues,
+            qe_sizes: Arc::clone(&qe_sizes),
+            subsystem_id: caps.subsystem_id,
             fault_configuration,
-        );
+        });
 
         Self {
             cfg_space,

vm/devices/storage/nvme_test/src/workers.rs

@@ -10,6 +10,7 @@ mod io;
 pub use admin::NsidConflict;
 pub use coordinator::NvmeFaultControllerClient;
 pub use coordinator::NvmeWorkers;
+pub use coordinator::NvmeWorkersContext;
 
 use crate::PAGE_SIZE;
 use inspect::Inspect;

vm/devices/storage/nvme_test/src/workers/coordinator.rs

@@ -31,6 +31,18 @@ use vmcore::interrupt::Interrupt;
 use vmcore::vm_task::VmTaskDriver;
 use vmcore::vm_task::VmTaskDriverSource;
 
+/// An input context for the NvmeWorkers
+pub struct NvmeWorkersContext<'a> {
+    pub driver_source: &'a VmTaskDriverSource,
+    pub mem: GuestMemory,
+    pub interrupts: Vec<Interrupt>,
+    pub max_sqs: u16,
+    pub max_cqs: u16,
+    pub qe_sizes: Arc<Mutex<IoQueueEntrySizes>>,
+    pub subsystem_id: Guid,
+    pub fault_configuration: FaultConfiguration,
+}
+
 pub struct NvmeWorkers {
     _task: Task<()>,
     send: mesh::Sender<CoordinatorRequest>,
@@ -53,16 +65,18 @@ impl InspectMut for NvmeWorkers {
 }
 
 impl NvmeWorkers {
-    pub fn new(
-        driver_source: &VmTaskDriverSource,
-        mem: GuestMemory,
-        interrupts: Vec<Interrupt>,
-        max_sqs: u16,
-        max_cqs: u16,
-        qe_sizes: Arc<Mutex<IoQueueEntrySizes>>,
-        subsystem_id: Guid,
-        fault_configuration: FaultConfiguration,
-    ) -> Self {
+    pub fn new(context: NvmeWorkersContext<'_>) -> Self {
+        let NvmeWorkersContext {
+            driver_source,
+            mem,
+            interrupts,
+            subsystem_id,
+            max_sqs,
+            max_cqs,
+            qe_sizes,
+            fault_configuration,
+        } = context;
+
         let num_qids = 2 + max_sqs.max(max_cqs) * 2;
         let doorbells: Vec<_> = (0..num_qids)
             .map(|_| Arc::new(DoorbellRegister::new()))