From ad521fd4e47783affe2e1226a77267070a670645 Mon Sep 17 00:00:00 2001
From: Sebastien Boeuf <sebastien.boeuf@intel.com>
Date: Mon, 8 Nov 2021 16:52:53 +0100
Subject: [PATCH] option_parser: Create generic type Tuple

Creates a new generic type Tuple so that the same implementation of
FromStr trait can be reused for both parsing a list of two integers and
parsing a list of one integer associated with a list of integers.

This anticipates the need for retrieving sublists, which will be needed
when trying to describe the host CPU affinity for every vCPU.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
---
 option_parser/src/lib.rs | 46 ++++++++++++++++++++++++++++------------
 vmm/src/config.rs        |  4 ++--
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/option_parser/src/lib.rs b/option_parser/src/lib.rs
index 3e54e4fb9..86424ed95 100644
--- a/option_parser/src/lib.rs
+++ b/option_parser/src/lib.rs
@@ -5,6 +5,7 @@
 
 use std::collections::HashMap;
 use std::fmt;
+use std::num::ParseIntError;
 use std::str::FromStr;
 
 #[derive(Default)]
@@ -240,17 +241,39 @@ impl FromStr for IntegerList {
     }
 }
 
-pub struct TupleTwoIntegers(pub Vec<(u64, u64)>);
+pub trait TupleValue {
+    fn parse_value(input: &str) -> Result<Self, ParseIntError>
+    where
+        Self: Sized;
+}
 
-pub enum TupleTwoIntegersParseError {
+impl TupleValue for u64 {
+    fn parse_value(input: &str) -> Result<Self, ParseIntError> {
+        input.parse::<u64>()
+    }
+}
+
+impl TupleValue for Vec<u64> {
+    fn parse_value(input: &str) -> Result<Self, ParseIntError> {
+        input
+            .trim_matches(|c| c == '[' || c == ']')
+            .split(',')
+            .map(|i| i.parse::<u64>())
+            .collect::<Result<Vec<u64>, _>>()
+    }
+}
+
+pub struct Tuple<T>(pub Vec<(u64, T)>);
+
+pub enum TupleError {
     InvalidValue(String),
 }
 
-impl FromStr for TupleTwoIntegers {
-    type Err = TupleTwoIntegersParseError;
+impl<T: TupleValue> FromStr for Tuple<T> {
+    type Err = TupleError;
 
     fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
-        let mut list = Vec::new();
+        let mut list: Vec<(u64, T)> = Vec::new();
         let tuples_list: Vec<&str> = s
             .trim()
             .trim_matches(|c| c == '[' || c == ']')
@@ -261,22 +284,19 @@ impl FromStr for TupleTwoIntegers {
             let items: Vec<&str> = tuple.split('@').collect();
 
             if items.len() != 2 {
-                return Err(TupleTwoIntegersParseError::InvalidValue(
-                    (*tuple).to_string(),
-                ));
+                return Err(TupleError::InvalidValue((*tuple).to_string()));
             }
 
             let item1 = items[0]
                 .parse::<u64>()
-                .map_err(|_| TupleTwoIntegersParseError::InvalidValue(items[0].to_owned()))?;
-            let item2 = items[1]
-                .parse::<u64>()
-                .map_err(|_| TupleTwoIntegersParseError::InvalidValue(items[1].to_owned()))?;
+                .map_err(|_| TupleError::InvalidValue(items[0].to_owned()))?;
+            let item2 = TupleValue::parse_value(items[1])
+                .map_err(|_| TupleError::InvalidValue(items[1].to_owned()))?;
 
             list.push((item1, item2));
         }
 
-        Ok(TupleTwoIntegers(list))
+        Ok(Tuple(list))
     }
 }
 
diff --git a/vmm/src/config.rs b/vmm/src/config.rs
index 667e8fd53..ac0373ee6 100644
--- a/vmm/src/config.rs
+++ b/vmm/src/config.rs
@@ -6,7 +6,7 @@
 use clap::ArgMatches;
 use net_util::MacAddr;
 use option_parser::{
-    ByteSized, IntegerList, OptionParser, OptionParserError, StringList, Toggle, TupleTwoIntegers,
+    ByteSized, IntegerList, OptionParser, OptionParserError, StringList, Toggle, Tuple,
 };
 use std::collections::HashMap;
 use std::convert::From;
@@ -1942,7 +1942,7 @@ impl NumaConfig {
             .map_err(Error::ParseNuma)?
             .map(|v| v.0.iter().map(|e| *e as u8).collect());
         let distances = parser
-            .convert::<TupleTwoIntegers>("distances")
+            .convert::<Tuple<u64>>("distances")
             .map_err(Error::ParseNuma)?
             .map(|v| {
                 v.0.iter()