refactor: move vmm::arch_gen::x86 to vmm::arch::x86_64::gen

The goal is to have all bindgen generated things be in modules just
called "`gen`" (so they're easy to exclude from code coverage). In this
case, instead of just moving `arch_gen` to `arch::gen` (e.g. moving
into the pre-existing `arch` module and dropping the `arch_` prefix),
directly move its `x86` submodule into `arch::x86_64`.

Signed-off-by: Patrick Roy <[email protected]>

Author: roypat

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

@@ -3,8 +3,8 @@
 
 use std::collections::BTreeMap;
 
+use vmm::arch::x86_64::gen::msr_index::*;
 use vmm::arch::x86_64::msr::MsrRange;
-use vmm::arch_gen::x86::msr_index::*;
 use vmm::cpu_config::templates::{CpuConfiguration, CustomCpuTemplate, RegisterValueFilter};
 use vmm::cpu_config::x86_64::cpuid::common::get_vendor_id_from_host;
 use vmm::cpu_config::x86_64::cpuid::{Cpuid, VENDOR_ID_AMD};

src/vmm/src/arch_gen/x86/hyperv.rs renamed to src/vmm/src/arch/x86_64/gen/hyperv.rs

@@ -18,6 +18,10 @@ pub mod msr;
 /// Logic for configuring x86_64 registers.
 pub mod regs;
 
+#[allow(clippy::all)]
+#[allow(missing_docs)]
+pub mod gen;
+
 use linux_loader::configurator::linux::LinuxBootConfigurator;
 use linux_loader::configurator::{BootConfigurator, BootParams};
 use linux_loader::loader::bootparam::boot_params;

src/vmm/src/arch_gen/x86/hyperv_tlfs.rs renamed to src/vmm/src/arch/x86_64/gen/hyperv_tlfs.rs

@@ -13,8 +13,8 @@ use libc::c_char;
 use log::debug;
 use vm_allocator::AllocPolicy;
 
+use crate::arch::x86_64::gen::mpspec;
 use crate::arch::IRQ_MAX;
-use crate::arch_gen::x86::mpspec;
 use crate::device_manager::resources::ResourceAllocator;
 use crate::vstate::memory::{
     Address, ByteValued, Bytes, GuestAddress, GuestMemory, GuestMemoryMmap,

src/vmm/src/arch_gen/x86/mod.rs renamed to src/vmm/src/arch/x86_64/gen/mod.rs

@@ -6,10 +6,10 @@ use bitflags::bitflags;
 use kvm_bindings::{kvm_msr_entry, MsrList, Msrs};
 use kvm_ioctls::{Kvm, VcpuFd};
 
-use crate::arch_gen::x86::hyperv::*;
-use crate::arch_gen::x86::hyperv_tlfs::*;
-use crate::arch_gen::x86::msr_index::*;
-use crate::arch_gen::x86::perf_event::*;
+use crate::arch::x86_64::gen::hyperv::*;
+use crate::arch::x86_64::gen::hyperv_tlfs::*;
+use crate::arch::x86_64::gen::msr_index::*;
+use crate::arch::x86_64::gen::perf_event::*;
 use crate::cpu_config::x86_64::cpuid::common::GetCpuidError;
 
 #[derive(Debug, PartialEq, Eq, thiserror::Error, displaydoc::Display)]