chore: move vmm::vstate code under vmm::arch

Move the rest of vstate architecture-specific code under `vmm::arch`.

Signed-off-by: Babis Chalios <[email protected]>

Author: bchalios

src/snapshot-editor/src/edit_vmstate.rs

@@ -99,7 +99,7 @@ mod tests {
         const KVM_REG_SIZE_U32: u64 = 0x20000000000000;
 
         use vmm::arch::aarch64::regs::Aarch64RegisterRef;
-        use vmm::vstate::vcpu::aarch64::VcpuState;
+        use vmm::arch::aarch64::vcpu::VcpuState;
 
         let vcpu_state = VcpuState {
             regs: {
@@ -158,7 +158,7 @@ mod tests {
         const KVM_REG_SIZE_U32: u64 = 0x20000000000000;
 
         use vmm::arch::aarch64::regs::Aarch64RegisterRef;
-        use vmm::vstate::vcpu::aarch64::VcpuState;
+        use vmm::arch::aarch64::vcpu::VcpuState;
 
         let vcpu_state = VcpuState {
             regs: {

src/vmm/src/arch/aarch64/vstate/kvm.rs renamed to src/vmm/src/arch/aarch64/kvm.rs

@@ -10,8 +10,6 @@ use crate::cpu_config::templates::KvmCapability;
 /// ['Kvm'] initialization can't fail for Aarch64
 pub type KvmArchError = Infallible;
 
-/// Errors associated with the wrappers over KVM ioctls.
-/// Needs `rustfmt::skip` to make multiline comments work
 /// Optional capabilities.
 #[derive(Debug, Default)]
 pub struct OptionalCapabilities {

src/vmm/src/arch/aarch64/mod.rs

@@ -5,14 +5,16 @@ pub(crate) mod cache_info;
 mod fdt;
 /// Module for the global interrupt controller configuration.
 pub mod gic;
+/// Architecture specific KVM-related code
+pub mod kvm;
 /// Layout for this aarch64 system.
 pub mod layout;
 /// Logic for configuring aarch64 registers.
 pub mod regs;
-/// Helper methods for VcpuFd.
+/// Architecture specific vCPU code
 pub mod vcpu;
-/// Architecture specific microVM state.
-pub mod vstate;
+/// Architecture specific VM state code
+pub mod vm;
 
 use std::cmp::min;
 use std::collections::HashMap;