chore: move KVM architecture-specific state in vmm::arch module

Move KVM architecture-specific code under the `vmm::arch` module, so
that we start having all architecture-specific code under a single
module.

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

Author: bchalios

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

@@ -11,6 +11,8 @@ pub mod layout;
 pub mod regs;
 /// Helper methods for VcpuFd.
 pub mod vcpu;
+/// Architecture specific microVM state.
+pub mod vstate;
 
 use std::cmp::min;
 use std::collections::HashMap;

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

@@ -0,0 +1,5 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+/// Architecture specific KVM-related code
+pub mod kvm;

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

@@ -12,6 +12,8 @@ use vm_memory::GuestAddress;
 #[cfg(target_arch = "aarch64")]
 pub mod aarch64;
 
+#[cfg(target_arch = "aarch64")]
+pub use aarch64::vstate::kvm::{Kvm, KvmArchError, OptionalCapabilities};
 #[cfg(target_arch = "aarch64")]
 pub use aarch64::{
     ConfigurationError, MMIO_MEM_SIZE, MMIO_MEM_START, arch_memory_regions, configure_system,
@@ -30,6 +32,8 @@ pub use crate::arch::x86_64::{
     layout::IOAPIC_ADDR, layout::IRQ_BASE, layout::IRQ_MAX, layout::SYSTEM_MEM_SIZE,
     layout::SYSTEM_MEM_START,
 };
+#[cfg(target_arch = "x86_64")]
+pub use x86_64::vstate::kvm::{Kvm, KvmArchError};
 
 /// Types of devices that can get attached to this platform.
 #[derive(Clone, Debug, PartialEq, Eq, Hash, Copy, Serialize, Deserialize)]

src/vmm/src/arch/mod.rs

@@ -19,6 +19,8 @@ mod mptable;
 pub mod msr;
 /// Logic for configuring x86_64 registers.
 pub mod regs;
+/// Architecture specific microVM state.
+pub mod vstate;
 /// Logic for configuring XSTATE features.
 pub mod xstate;
 
@@ -221,7 +223,7 @@ fn configure_pvh(
     // boot_params.  This will be stored at PVH_INFO_START address, and %rbx
     // will be initialized to contain PVH_INFO_START prior to starting the
     // guest, as required by the PVH ABI.
-    #[allow(clippy::cast_possible_truncation)] // the vec lenghts are single digit integers
+    #[allow(clippy::cast_possible_truncation)] // the vec lengths are single digit integers
     let mut start_info = hvm_start_info {
         magic: XEN_HVM_START_MAGIC_VALUE,
         version: 1,

src/vmm/src/arch/x86_64/mod.rs

@@ -0,0 +1,5 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+/// Architecture specific KVM-related code
+pub mod kvm;

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

@@ -5,19 +5,10 @@ use kvm_bindings::KVM_API_VERSION;
 use kvm_ioctls::Kvm as KvmFd;
 use serde::{Deserialize, Serialize};
 
+pub use crate::arch::{Kvm, KvmArchError};
 use crate::cpu_config::templates::KvmCapability;
 use crate::vstate::memory::{GuestMemory, GuestMemoryMmap};
 
-#[cfg(target_arch = "aarch64")]
-mod aarch64;
-#[cfg(target_arch = "x86_64")]
-mod x86_64;
-
-#[cfg(target_arch = "aarch64")]
-pub use aarch64::{Kvm, KvmArchError, OptionalCapabilities};
-#[cfg(target_arch = "x86_64")]
-pub use x86_64::{Kvm, KvmArchError};
-
 /// Errors associated with the wrappers over KVM ioctls.
 /// Needs `rustfmt::skip` to make multiline comments work
 #[rustfmt::skip]