diff options
author | Daniel Verkamp <dverkamp@chromium.org> | 2020-02-14 16:46:36 -0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-04-23 07:17:55 +0000 |
commit | fbd6122f0b722f40bb14f0c3a26342fa46d5a89d (patch) | |
tree | 237d82fabe09b84b02ed2b05963ab698a8eaf31e /aarch64 | |
parent | 2c1417b43a1846d21bc589563460de4b962afcc6 (diff) | |
download | crosvm-fbd6122f0b722f40bb14f0c3a26342fa46d5a89d.tar crosvm-fbd6122f0b722f40bb14f0c3a26342fa46d5a89d.tar.gz crosvm-fbd6122f0b722f40bb14f0c3a26342fa46d5a89d.tar.bz2 crosvm-fbd6122f0b722f40bb14f0c3a26342fa46d5a89d.tar.lz crosvm-fbd6122f0b722f40bb14f0c3a26342fa46d5a89d.tar.xz crosvm-fbd6122f0b722f40bb14f0c3a26342fa46d5a89d.tar.zst crosvm-fbd6122f0b722f40bb14f0c3a26342fa46d5a89d.zip |
arch, devices: move serial creation to arch
Split the serial code into two parts: - Configuration and setup: arch/src/serial.rs - Serial device emulation: devices/src/serial.rs No change in functionality - this is just preparation for generalizing the command line parsing/setup code so that it can be used with virtio console devices as well. BUG=chromium:1059924 TEST=emerge-nami crosvm TEST=emerge-kevin crosvm Change-Id: I0aaf9dd6f8096eac4a17077ab5bf569f57d64ff5 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2127319 Reviewed-by: Dylan Reid <dgreid@chromium.org> Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Diffstat (limited to 'aarch64')
-rw-r--r-- | aarch64/src/fdt.rs | 3 | ||||
-rw-r--r-- | aarch64/src/lib.rs | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/aarch64/src/fdt.rs b/aarch64/src/fdt.rs index 9dcafa5..f50286e 100644 --- a/aarch64/src/fdt.rs +++ b/aarch64/src/fdt.rs @@ -10,7 +10,8 @@ use arch::fdt::{ begin_node, end_node, finish_fdt, generate_prop32, generate_prop64, property, property_cstring, property_null, property_string, property_u32, property_u64, start_fdt, Error, Result, }; -use devices::{PciInterruptPin, SERIAL_ADDR}; +use arch::SERIAL_ADDR; +use devices::PciInterruptPin; use sys_util::{GuestAddress, GuestMemory}; // This is the start of DRAM in the physical address space. diff --git a/aarch64/src/lib.rs b/aarch64/src/lib.rs index f8a36b9..67e37b4 100644 --- a/aarch64/src/lib.rs +++ b/aarch64/src/lib.rs @@ -11,11 +11,8 @@ use std::io; use std::os::unix::io::FromRawFd; use std::sync::Arc; -use arch::{RunnableLinuxVm, VmComponents, VmImage}; -use devices::{ - get_serial_tty_string, Bus, BusError, PciConfigMmio, PciDevice, PciInterruptPin, - SerialParameters, -}; +use arch::{get_serial_tty_string, RunnableLinuxVm, SerialParameters, VmComponents, VmImage}; +use devices::{Bus, BusError, PciConfigMmio, PciDevice, PciInterruptPin}; use io_jail::Minijail; use remain::sorted; use resources::SystemAllocator; |