From ce6d88d1872f25dad7748d007e9ec119537dd817 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Thu, 28 Apr 2022 15:51:43 +0100 Subject: [PATCH] vmm: Merge aarch64 use statements These were in their own block and not organised lexically. Signed-off-by: Rob Bradford --- vmm/src/vm.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/vmm/src/vm.rs b/vmm/src/vm.rs index e9c97be52..b6be80496 100644 --- a/vmm/src/vm.rs +++ b/vmm/src/vm.rs @@ -31,6 +31,10 @@ use crate::{ PciDeviceInfo, CPU_MANAGER_SNAPSHOT_ID, DEVICE_MANAGER_SNAPSHOT_ID, MEMORY_MANAGER_SNAPSHOT_ID, }; use anyhow::anyhow; +#[cfg(target_arch = "aarch64")] +use arch::aarch64::gic::gicv3_its::kvm::{KvmGicV3Its, GIC_V3_ITS_SNAPSHOT_ID}; +#[cfg(target_arch = "aarch64")] +use arch::aarch64::gic::kvm::create_gic; use arch::get_host_cpu_phys_bits; #[cfg(target_arch = "x86_64")] use arch::layout::{KVM_IDENTITY_MAP_START, KVM_TSS_START}; @@ -40,6 +44,8 @@ use arch::EntryPoint; #[cfg(target_arch = "aarch64")] use arch::PciSpaceInfo; use arch::{NumaNode, NumaNodes}; +#[cfg(target_arch = "aarch64")] +use devices::interrupt_controller::{self, InterruptController}; use devices::AcpiNotificationFlags; #[cfg(all(target_arch = "x86_64", feature = "gdb"))] use gdbstub_arch::x86::reg::X86_64CoreRegs; @@ -92,13 +98,6 @@ use vmm_sys_util::signal::unblock_signal; use vmm_sys_util::sock_ctrl_msg::ScmSocket; use vmm_sys_util::terminal::Terminal; -#[cfg(target_arch = "aarch64")] -use arch::aarch64::gic::gicv3_its::kvm::{KvmGicV3Its, GIC_V3_ITS_SNAPSHOT_ID}; -#[cfg(target_arch = "aarch64")] -use arch::aarch64::gic::kvm::create_gic; -#[cfg(target_arch = "aarch64")] -use devices::interrupt_controller::{self, InterruptController}; - /// Errors associated with VM management #[derive(Debug, Error)] pub enum Error {