fix: Remove decimal support for CPU templates

Decimal number system not typically used when addressing memory
locations or values. Rather remove it to remove code surface area,
decimal number support can be added back should a use-case
be raised.

Signed-off-by: Matthew Schlebusch <[email protected]>

Author: mattschlebusch

src/vmm/src/cpu_config/aarch64/custom_cpu_template.rs

@@ -157,10 +157,13 @@ mod tests {
                 }"#,
         );
         assert!(cpu_config_result.is_err());
-        assert!(cpu_config_result
-            .unwrap_err()
-            .to_string()
-            .contains("Failed to parse string [j] as a number for CPU template"));
+        let error_msg: String = cpu_config_result.unwrap_err().to_string();
+        // Formatted error expected clarifying the number system prefix is missing
+        assert!(
+            error_msg.contains("No supported number system prefix found in value"),
+            "{}",
+            error_msg
+        );
 
         // Malformed address as binary
         let cpu_config_result = serde_json::from_str::<CustomCpuTemplate>(
@@ -184,7 +187,7 @@ mod tests {
             r#"{
                     "reg_modifiers":  [
                         {
-                            "addr": "200",
+                            "addr": "0x200",
                             "bitmap": "0bx0?1_0_0x_?x1xxxx00xxx1xxxxxxxxxxx1"
                         },
                     ]
@@ -200,7 +203,7 @@ mod tests {
             r#"{
                     "reg_modifiers":  [
                         {
-                            "addr": "200",
+                            "addr": "0x200",
                             "bitmap": "0bx00100x0x1xxxx05xxx1xxxxxxxxxxx1"
                         },
                     ]

src/vmm/src/cpu_config/templates_serde.rs

@@ -1,8 +1,6 @@
 // Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use std::str::FromStr;
-
 use serde::de::Error as SerdeError;
 use serde::{Deserialize, Deserializer, Serializer};
 
@@ -29,7 +27,11 @@ macro_rules! deserialize_from_str {
             } else if let Some(s) = number_str.strip_prefix("0x") {
                 $type::from_str_radix(s, 16)
             } else {
-                $type::from_str(&number_str)
+                return Err(D::Error::custom(format!(
+                    "No supported number system prefix found in value [{}]. Make sure to prefix \
+                     the number with '0x' for hexadecimal numbers or '0b' for binary numbers.",
+                    number_str,
+                )));
             }
             .map_err(|err| {
                 D::Error::custom(format!(
@@ -54,12 +56,6 @@ mod tests {
 
     #[test]
     fn test_deserialize_from_str() {
-        let valid_string = "69";
-        let deserializer: StrDeserializer<Error> = valid_string.into_deserializer();
-        let valid_value = deserialize_from_str_u32(deserializer);
-        assert!(valid_value.is_ok());
-        assert_eq!(valid_value.unwrap(), 69);
-
         let valid_string = "0b1000101";
         let deserializer: StrDeserializer<Error> = valid_string.into_deserializer();
         let valid_value = deserialize_from_str_u32(deserializer);
@@ -76,5 +72,10 @@ mod tests {
         let deserializer: StrDeserializer<Error> = invalid_string.into_deserializer();
         let invalid_value = deserialize_from_str_u32(deserializer);
         assert!(invalid_value.is_err());
+
+        let invalid_string = "69";
+        let deserializer: StrDeserializer<Error> = invalid_string.into_deserializer();
+        let invalid_value = deserialize_from_str_u32(deserializer);
+        assert!(invalid_value.is_err());
     }
 }

src/vmm/src/cpu_config/x86_64/custom_cpu_template.rs

@@ -390,10 +390,13 @@ mod tests {
                 }"#,
         );
         assert!(cpu_template_result.is_err());
-        assert!(cpu_template_result
-            .unwrap_err()
-            .to_string()
-            .contains("Failed to parse string [0jj0] as a number for CPU template -"));
+        let error_msg: String = cpu_template_result.unwrap_err().to_string();
+        // Formatted error expected clarifying the number system prefix is missing
+        assert!(
+            error_msg.contains("No supported number system prefix found in value"),
+            "{}",
+            error_msg
+        );
 
         // Malformed CPUID leaf address
         let cpu_template_result = serde_json::from_str::<CustomCpuTemplate>(
@@ -414,17 +417,19 @@ mod tests {
                 }"#,
         );
         assert!(cpu_template_result.is_err());
-        assert!(cpu_template_result
-            .unwrap_err()
-            .to_string()
-            .contains("Failed to parse string [k] as a number for CPU template"));
-
+        let error_msg: String = cpu_template_result.unwrap_err().to_string();
+        // Formatted error expected clarifying the number system prefix is missing
+        assert!(
+            error_msg.contains("No supported number system prefix found in value"),
+            "{}",
+            error_msg
+        );
         // Malformed 64-bit bitmap - filter failed
         let cpu_template_result = serde_json::from_str::<CustomCpuTemplate>(
             r#"{
                     "msr_modifiers":  [
                         {
-                            "addr": "200",
+                            "addr": "0x200",
                             "bitmap": "0bx0?1_0_0x_?x1xxxx00xxx1xxxxxxxxxxx1"
                         },
                     ]
@@ -439,7 +444,7 @@ mod tests {
             r#"{
                     "msr_modifiers":  [
                         {
-                            "addr": "200",
+                            "addr": "0x200",
                             "bitmap": "0bx00100x0x1xxxx05xxx1xxxxxxxxxxx1"
                         },
                     ]

src/vmm/src/cpu_config/x86_64/test_utils.rs

@@ -88,7 +88,7 @@ pub const TEST_TEMPLATE_JSON: &str = r#"{
             "bitmap": "0bx00111xxx1xxxx111xxxxx101xxxxxx1"
         },
         {
-            "addr": "2",
+            "addr": "0b11",
             "bitmap": "0bx00100xxx1xxxxxx0000000xxxxxxxx1"
         },
         {