From afa8ecc90c4c15251feb8068b521d3dcd2c33cba Mon Sep 17 00:00:00 2001
From: Praveen Paladugu <prapal@microsoft.com>
Date: Wed, 29 Jul 2020 20:20:50 +0000
Subject: [PATCH] vmm: add validation for network parameters

Signed-off-by: Praveen Paladugu <prapal@microsoft.com>
---
 vmm/src/config.rs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/vmm/src/config.rs b/vmm/src/config.rs
index 4d3d5d55d..3230e4299 100644
--- a/vmm/src/config.rs
+++ b/vmm/src/config.rs
@@ -93,6 +93,8 @@ pub enum ValidationError {
     CpuTopologyCount,
     /// One part of the CPU topology was zero
     CpuTopologyZeroPart,
+    /// Virtio needs a min of 2 queues
+    VnetQueueLowerThan2,
 }
 
 type ValidationResult<T> = std::result::Result<T, ValidationError>;
@@ -116,6 +118,7 @@ impl fmt::Display for ValidationError {
                 f,
                 "Product of CPU topology parts does not match maximum vCPUs"
             ),
+            VnetQueueLowerThan2 => write!(f, "Number of queues to virtio_net less than 2"),
         }
     }
 }
@@ -711,8 +714,7 @@ impl NetConfig {
             .0;
         let vhost_socket = parser.get("socket");
         let id = parser.get("id");
-
-        Ok(NetConfig {
+        let config = NetConfig {
             tap,
             ip,
             mask,
@@ -724,7 +726,15 @@ impl NetConfig {
             vhost_user,
             vhost_socket,
             id,
-        })
+        };
+        config.validate().map_err(Error::Validation)?;
+        Ok(config)
+    }
+    pub fn validate(&self) -> ValidationResult<()> {
+        if self.num_queues < 2 {
+            return Err(ValidationError::VnetQueueLowerThan2);
+        }
+        Ok(())
     }
 }