refactor(vmm): rename utilities to test_utils

`utilities` has only test related code/binaries,
so rename the module with more descriptive name.

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

Author: ShadowCurse

src/vmm/benches/block_request.rs

@@ -11,7 +11,7 @@ use vm_memory::GuestAddress;
 use vmm::devices::virtio::block::virtio::test_utils::RequestDescriptorChain;
 use vmm::devices::virtio::block::virtio::{Request, RequestHeader, VIRTIO_BLK_T_IN};
 use vmm::devices::virtio::test_utils::VirtQueue;
-use vmm::utilities::test_utils::single_region_mem;
+use vmm::test_utils::test_utils::single_region_mem;
 
 pub fn block_request_benchmark(c: &mut Criterion) {
     let mem = single_region_mem(2 * 65562);

src/vmm/benches/queue.rs

@@ -12,7 +12,7 @@ use criterion::{criterion_group, criterion_main, Criterion};
 use vm_memory::GuestAddress;
 use vmm::devices::virtio::queue::{VIRTQ_DESC_F_NEXT, VIRTQ_DESC_F_WRITE};
 use vmm::devices::virtio::test_utils::VirtQueue;
-use vmm::utilities::test_utils::single_region_mem;
+use vmm::test_utils::test_utils::single_region_mem;
 
 /// Create one chain with n descriptors
 /// Descriptor buffers will leave at the offset of 2048 bytes

src/vmm/src/acpi/mod.rs

@@ -186,7 +186,7 @@ pub mod tests {
     use crate::acpi::{AcpiError, AcpiTableWriter};
     use crate::arch::x86_64::layout::{SYSTEM_MEM_SIZE, SYSTEM_MEM_START};
     use crate::builder::tests::default_vmm;
-    use crate::utilities::test_utils::arch_mem;
+    use crate::test_utils::test_utils::arch_mem;
 
     struct MockSdt(Vec<u8>);
 

src/vmm/src/arch/aarch64/fdt.rs

@@ -460,7 +460,7 @@ mod tests {
     use crate::arch::aarch64::gic::create_gic;
     use crate::arch::aarch64::layout;
     use crate::device_manager::resources::ResourceAllocator;
-    use crate::utilities::test_utils::arch_mem;
+    use crate::test_utils::test_utils::arch_mem;
 
     const LEN: u64 = 4096;
 

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

@@ -117,7 +117,7 @@ fn get_fdt_addr(mem: &GuestMemoryMmap) -> u64 {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::utilities::test_utils::arch_mem;
+    use crate::test_utils::test_utils::arch_mem;
 
     #[test]
     fn test_regions_lt_1024gb() {

src/vmm/src/arch/aarch64/vcpu.rs

@@ -218,7 +218,7 @@ mod tests {
 
     use super::*;
     use crate::arch::aarch64::layout;
-    use crate::utilities::test_utils::arch_mem;
+    use crate::test_utils::test_utils::arch_mem;
 
     #[test]
     fn test_setup_regs() {

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

@@ -222,7 +222,7 @@ mod tests {
     use linux_loader::loader::bootparam::boot_e820_entry;
 
     use super::*;
-    use crate::utilities::test_utils::{arch_mem, single_region_mem};
+    use crate::test_utils::test_utils::{arch_mem, single_region_mem};
 
     #[test]
     fn regions_lt_4gb() {

src/vmm/src/arch/x86_64/mptable.rs

@@ -316,7 +316,7 @@ mod tests {
 
     use super::*;
     use crate::arch::SYSTEM_MEM_START;
-    use crate::utilities::test_utils::single_region_mem_at;
+    use crate::test_utils::test_utils::single_region_mem_at;
     use crate::vstate::memory::Bytes;
 
     fn table_entry_size(type_: u8) -> usize {

src/vmm/src/arch/x86_64/regs.rs

@@ -243,7 +243,7 @@ mod tests {
     use kvm_ioctls::Kvm;
 
     use super::*;
-    use crate::utilities::test_utils::single_region_mem;
+    use crate::test_utils::test_utils::single_region_mem;
     use crate::vstate::memory::{Bytes, GuestAddress, GuestMemoryMmap};
 
     fn read_u64(gm: &GuestMemoryMmap, offset: u64) -> u64 {

src/vmm/src/builder.rs

@@ -1033,7 +1033,7 @@ pub mod tests {
     use crate::devices::virtio::{TYPE_BALLOON, TYPE_BLOCK, TYPE_RNG};
     use crate::mmds::data_store::{Mmds, MmdsVersion};
     use crate::mmds::ns::MmdsNetworkStack;
-    use crate::utilities::test_utils::{arch_mem, single_region_mem, single_region_mem_at};
+    use crate::test_utils::test_utils::{arch_mem, single_region_mem, single_region_mem_at};
     use crate::vmm_config::balloon::{BalloonBuilder, BalloonDeviceConfig, BALLOON_DEV_ID};
     use crate::vmm_config::boot_source::DEFAULT_KERNEL_CMDLINE;
     use crate::vmm_config::drive::{BlockBuilder, BlockDeviceConfig};