diff --git a/src/crosvm.rs b/src/crosvm.rs index 05e1689416..94ff6ea4ea 100644 --- a/src/crosvm.rs +++ b/src/crosvm.rs @@ -6,7 +6,8 @@ //! configs. pub mod argument; -pub mod linux; +#[path = "linux.rs"] +pub mod platform; #[cfg(feature = "plugin")] pub mod plugin; diff --git a/src/main.rs b/src/main.rs index 51bb072096..af722931da 100644 --- a/src/main.rs +++ b/src/main.rs @@ -28,7 +28,7 @@ use base::{ }; use crosvm::{ argument::{self, print_help, set_arguments, Argument}, - linux, BindMount, Config, DiskOption, Executable, GidMap, SharedDir, TouchDeviceOption, + platform, BindMount, Config, DiskOption, Executable, GidMap, SharedDir, TouchDeviceOption, }; #[cfg(feature = "gpu")] use devices::virtio::gpu::{GpuMode, GpuParameters}; @@ -1604,7 +1604,7 @@ writeback=BOOL - Indicates whether the VM can use writeback caching (default: fa } } } - Ok(()) => match linux::run_config(cfg) { + Ok(()) => match platform::run_config(cfg) { Ok(_) => { info!("crosvm has exited normally"); Ok(()) diff --git a/tests/boot.rs b/tests/boot.rs index 4277072816..5eab683ddb 100644 --- a/tests/boot.rs +++ b/tests/boot.rs @@ -15,7 +15,7 @@ use libc::{cpu_set_t, sched_getaffinity}; use arch::{set_default_serial_parameters, SerialHardware, SerialParameters, SerialType}; use base::syslog; -use crosvm::{linux, Config, Executable}; +use crosvm::{platform, Config, Executable}; const CHROOT_KERNEL_PATH: &str = "/mnt/host/source/src/third_party/kernel/v4.19/"; const CONTAINER_VM_DEFCONFIG: &str = "arch/x86/configs/chromiumos-container-vm-x86_64_defconfig"; @@ -243,6 +243,6 @@ fn boot() { set_default_serial_parameters(&mut c.serial_parameters); c.executable_path = Some(Executable::Kernel(kernel_path)); - let r = linux::run_config(c); + let r = platform::run_config(c); r.expect("failed to run linux"); }