vmm: Add support for multiple virtio-pmem devices

Until now, the VMM was only accepting a single instance of virtio-pmem
device. This commit extend the virtio-pmem support by allowing several
devices to be created for a single VM.

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

src/main.rs

@@ -84,7 +84,8 @@ fn main() {
                     "Persistent memory parameters \"file=<backing_file_path>,\
                      size=<persistent_memory_size>\"",
                 )
-                .takes_value(true),
+                .takes_value(true)
+                .min_values(1),
         )
         .get_matches();
 
@@ -110,7 +111,7 @@ fn main() {
 
     let fs: Option<Vec<&str>> = cmd_arguments.values_of("fs").map(|x| x.collect());
 
-    let pmem = cmd_arguments.value_of("pmem");
+    let pmem: Option<Vec<&str>> = cmd_arguments.values_of("pmem").map(|x| x.collect());
 
     let vm_config = match config::VmConfig::parse(config::VmParams {
         cpus,

vmm/src/config.rs

@@ -64,7 +64,7 @@ pub struct VmParams<'a> {
     pub net: Option<&'a str>,
     pub rng: &'a str,
     pub fs: Option<Vec<&'a str>>,
-    pub pmem: Option<&'a str>,
+    pub pmem: Option<Vec<&'a str>>,
 }
 
 pub struct CpusConfig(pub u8);
@@ -302,13 +302,9 @@ pub struct PmemConfig<'a> {
 }
 
 impl<'a> PmemConfig<'a> {
-    pub fn parse(pmem: Option<&'a str>) -> Result<Option<Self>> {
-        if pmem.is_none() {
-            return Ok(None);
-        }
-
+    pub fn parse(pmem: &'a str) -> Result<Self> {
         // Split the parameters based on the comma delimiter
-        let params_list: Vec<&str> = pmem.unwrap().split(',').collect();
+        let params_list: Vec<&str> = pmem.split(',').collect();
 
         let mut file_str: &str = "";
         let mut size_str: &str = "";
@@ -325,10 +321,10 @@ impl<'a> PmemConfig<'a> {
             return Err(Error::ParsePmemFileParam);
         }
 
-        Ok(Some(PmemConfig {
+        Ok(PmemConfig {
             file: Path::new(file_str),
             size: size_str.parse::<u64>().map_err(Error::ParsePmemSizeParam)?,
-        }))
+        })
     }
 }
 
@@ -341,7 +337,7 @@ pub struct VmConfig<'a> {
     pub net: Option<NetConfig<'a>>,
     pub rng: RngConfig<'a>,
     pub fs: Option<Vec<FsConfig<'a>>>,
-    pub pmem: Option<PmemConfig<'a>>,
+    pub pmem: Option<Vec<PmemConfig<'a>>>,
 }
 
 impl<'a> VmConfig<'a> {
@@ -360,6 +356,15 @@ impl<'a> VmConfig<'a> {
             fs = Some(fs_config_list);
         }
 
+        let mut pmem: Option<Vec<PmemConfig>> = None;
+        if let Some(pmem_list) = &vm_params.pmem {
+            let mut pmem_config_list = Vec::new();
+            for item in pmem_list.iter() {
+                pmem_config_list.push(PmemConfig::parse(item)?);
+            }
+            pmem = Some(pmem_config_list);
+        }
+
         Ok(VmConfig {
             cpus: CpusConfig::parse(vm_params.cpus)?,
             memory: MemoryConfig::parse(vm_params.memory)?,
@@ -369,7 +374,7 @@ impl<'a> VmConfig<'a> {
             net: NetConfig::parse(vm_params.net)?,
             rng: RngConfig::parse(vm_params.rng)?,
             fs,
-            pmem: PmemConfig::parse(vm_params.pmem)?,
+            pmem,
         })
     }
 }

vmm/src/vm.rs

@@ -633,7 +633,8 @@ impl DeviceManager {
         }
 
         // Add virtio-pmem if required
-        if let Some(pmem_cfg) = &vm_cfg.pmem {
+        if let Some(pmem_list_cfg) = &vm_cfg.pmem {
+            for pmem_cfg in pmem_list_cfg.iter() {
                 let size = pmem_cfg.size;
 
                 let pmem_guest_addr = allocator
@@ -693,6 +694,7 @@ impl DeviceManager {
                     &interrupt_info,
                 )?;
             }
+        }
 
         let pci = Arc::new(Mutex::new(PciConfigIo::new(pci_root)));