refactor: guest_config into cpu_config

This refactoring is done to reduce nesting of modules inside
`guest_config` crate and give it a more proper name.

Reason for renaming:
Originally `guest_config` was intended as a module with separate modules
inside, each corresponding to separate device that can be configured
by the user. But as of right now it only contains CPU related configs
(CpuConfiguration, Static/CustomCpuTemplates, etc...).

Reason for restructuring:
Because Firecracker supports x86_64 and aarch64 `guest_config`
is divided into several `x86_64` and `aarch64` modules at
different depth levels.

This is how it looks now:
  src/vmm/src/guest_config/
  ├── aarch64
  │   ├── mod.rs
  │   └── static_cpu_templates
  ├── mod.rs
  ├── templates
  │   ├── aarch64.rs
  │   ├── mod.rs
  │   ├── test_utils
  │   │   ├── aarch64.rs
  │   │   ├── mod.rs
  │   │   └── x86_64.rs
  │   └── x86_64.rs
  ├── templates_serde.rs
  └── x86_64
      ├── cpuid
      ├── mod.rs
      └── static_cpu_templates

There are 3 levels of `x86_64`/`aarch64` separation.

With this refactoring tree looks like this:
  src/vmm/src/cpu_config/
  ├── aarch64
  │   ├── custom_cpu_template.rs
  │   ├── mod.rs
  │   ├── static_cpu_templates
  │   └── test_utils.rs
  ├── mod.rs
  ├── templates.rs
  ├── templates_serde.rs
  └── x86_64
      ├── cpuid
      ├── custom_cpu_template.rs
      ├── mod.rs
      ├── static_cpu_templates
      └── test_utils.rs

Only 1 level of `x86_64`/`aarch64` separation.

Signed-off-by: Egor Lazarchuk <[email protected]>

Author: ShadowCurse

src/api_server/src/parsed_request.rs

@@ -315,7 +315,7 @@ pub mod tests {
 
     use micro_http::HttpConnection;
     use vmm::builder::StartMicrovmError;
-    use vmm::guest_config::templates::test_utils::build_test_template;
+    use vmm::cpu_config::templates::test_utils::build_test_template;
     use vmm::resources::VmmConfig;
     use vmm::rpc_interface::VmmActionError;
     use vmm::vmm_config::balloon::{BalloonDeviceConfig, BalloonStats};

src/api_server/src/request/cpu_configuration.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use logger::{IncMetric, METRICS};
-use vmm::guest_config::templates::CustomCpuTemplate;
+use vmm::cpu_config::templates::CustomCpuTemplate;
 
 use super::super::VmmAction;
 use crate::parsed_request::{Error, ParsedRequest};
@@ -24,9 +24,7 @@ pub(crate) fn parse_put_cpu_config(body: &Body) -> Result<ParsedRequest, Error>
 mod tests {
     use logger::{IncMetric, METRICS};
     use micro_http::Body;
-    use vmm::guest_config::templates::test_utils::{
-        build_test_template, TEST_INVALID_TEMPLATE_JSON,
-    };
+    use vmm::cpu_config::templates::test_utils::{build_test_template, TEST_INVALID_TEMPLATE_JSON};
     use vmm::rpc_interface::VmmAction;
 
     use super::*;

src/api_server/src/request/machine_configuration.rs

@@ -46,7 +46,7 @@ pub(crate) fn parse_patch_machine_config(body: &Body) -> Result<ParsedRequest, E
 
 #[cfg(test)]
 mod tests {
-    use vmm::guest_config::templates::StaticCpuTemplate;
+    use vmm::cpu_config::templates::StaticCpuTemplate;
 
     use super::*;
     use crate::parsed_request::tests::vmm_action_from_request;

src/cpu-template-helper/src/dump/aarch64.rs

@@ -1,8 +1,8 @@
 // Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use vmm::guest_config::templates::aarch64::RegisterModifier;
-use vmm::guest_config::templates::{CpuConfiguration, CustomCpuTemplate, RegisterValueFilter};
+use vmm::cpu_config::aarch64::custom_cpu_template::RegisterModifier;
+use vmm::cpu_config::templates::{CpuConfiguration, CustomCpuTemplate, RegisterValueFilter};
 
 use crate::utils::aarch64::reg_modifier;
 

src/cpu-template-helper/src/dump/mod.rs

@@ -8,7 +8,7 @@ mod x86_64;
 
 use std::sync::{Arc, Mutex};
 
-use vmm::guest_config::templates::CustomCpuTemplate;
+use vmm::cpu_config::templates::CustomCpuTemplate;
 use vmm::{DumpCpuConfigError, Vmm};
 
 #[cfg(target_arch = "aarch64")]

src/cpu-template-helper/src/dump/x86_64.rs

@@ -3,11 +3,11 @@
 
 use std::collections::HashMap;
 
-use vmm::guest_config::templates::x86_64::{
+use vmm::cpu_config::templates::{CpuConfiguration, CustomCpuTemplate, RegisterValueFilter};
+use vmm::cpu_config::x86_64::cpuid::Cpuid;
+use vmm::cpu_config::x86_64::custom_cpu_template::{
     CpuidLeafModifier, CpuidRegister, CpuidRegisterModifier, RegisterModifier,
 };
-use vmm::guest_config::templates::{CpuConfiguration, CustomCpuTemplate, RegisterValueFilter};
-use vmm::guest_config::x86_64::cpuid::Cpuid;
 
 use crate::utils::x86_64::{cpuid_leaf_modifier, cpuid_reg_modifier, msr_modifier};
 
@@ -52,7 +52,7 @@ fn msrs_to_modifier(msrs: &HashMap<u32, u64>) -> Vec<RegisterModifier> {
 mod tests {
     use std::collections::BTreeMap;
 
-    use vmm::guest_config::x86_64::cpuid::{
+    use vmm::cpu_config::x86_64::cpuid::{
         CpuidEntry, CpuidKey, CpuidRegisters, IntelCpuid, KvmCpuidFlags,
     };
 

src/cpu-template-helper/src/main.rs

@@ -5,7 +5,7 @@ use std::fs::{read_to_string, write};
 use std::path::PathBuf;
 
 use clap::{Parser, Subcommand};
-use vmm::guest_config::templates::{CustomCpuTemplate, GetCpuTemplate, GetCpuTemplateError};
+use vmm::cpu_config::templates::{CustomCpuTemplate, GetCpuTemplate, GetCpuTemplateError};
 
 mod dump;
 mod strip;

src/cpu-template-helper/src/strip/aarch64.rs

@@ -1,8 +1,8 @@
 // Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use vmm::guest_config::templates::aarch64::RegisterModifier;
-use vmm::guest_config::templates::CustomCpuTemplate;
+use vmm::cpu_config::aarch64::custom_cpu_template::RegisterModifier;
+use vmm::cpu_config::templates::CustomCpuTemplate;
 
 use crate::strip::strip_common;
 use crate::utils::aarch64::RegModifierMap;
@@ -30,8 +30,8 @@ pub fn strip(templates: Vec<CustomCpuTemplate>) -> Vec<CustomCpuTemplate> {
 
 #[cfg(test)]
 mod tests {
-    use vmm::guest_config::templates::aarch64::RegisterModifier;
-    use vmm::guest_config::templates::RegisterValueFilter;
+    use vmm::cpu_config::aarch64::custom_cpu_template::RegisterModifier;
+    use vmm::cpu_config::templates::RegisterValueFilter;
 
     use super::*;
     use crate::utils::aarch64::reg_modifier;

src/cpu-template-helper/src/strip/x86_64.rs

@@ -1,8 +1,8 @@
 // Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use vmm::guest_config::templates::x86_64::{CpuidLeafModifier, RegisterModifier};
-use vmm::guest_config::templates::CustomCpuTemplate;
+use vmm::cpu_config::templates::CustomCpuTemplate;
+use vmm::cpu_config::x86_64::custom_cpu_template::{CpuidLeafModifier, RegisterModifier};
 
 use crate::strip::strip_common;
 use crate::utils::x86_64::{CpuidModifierMap, MsrModifierMap};
@@ -43,12 +43,12 @@ pub fn strip(templates: Vec<CustomCpuTemplate>) -> Vec<CustomCpuTemplate> {
 
 #[cfg(test)]
 mod tests {
-    use vmm::guest_config::templates::x86_64::CpuidRegister::*;
-    use vmm::guest_config::templates::x86_64::{
+    use vmm::cpu_config::templates::RegisterValueFilter;
+    use vmm::cpu_config::x86_64::cpuid::KvmCpuidFlags;
+    use vmm::cpu_config::x86_64::custom_cpu_template::CpuidRegister::*;
+    use vmm::cpu_config::x86_64::custom_cpu_template::{
         CpuidLeafModifier, CpuidRegisterModifier, RegisterModifier,
     };
-    use vmm::guest_config::templates::RegisterValueFilter;
-    use vmm::guest_config::x86_64::cpuid::KvmCpuidFlags;
 
     use super::*;
     use crate::utils::x86_64::{cpuid_leaf_modifier, cpuid_reg_modifier, msr_modifier};

src/cpu-template-helper/src/utils/aarch64.rs

@@ -4,8 +4,8 @@
 use std::collections::HashMap;
 use std::fmt::Display;
 
-use vmm::guest_config::templates::aarch64::RegisterModifier;
-use vmm::guest_config::templates::RegisterValueFilter;
+use vmm::cpu_config::aarch64::custom_cpu_template::RegisterModifier;
+use vmm::cpu_config::templates::RegisterValueFilter;
 
 use super::{ModifierMapKey, ModifierMapValue};