summary refs log tree commit diff
path: root/x86_64
diff options
context:
space:
mode:
authorDaniel Verkamp <dverkamp@chromium.org>2020-02-14 16:46:36 -0800
committerCommit Bot <commit-bot@chromium.org>2020-04-23 07:17:55 +0000
commitfbd6122f0b722f40bb14f0c3a26342fa46d5a89d (patch)
tree237d82fabe09b84b02ed2b05963ab698a8eaf31e /x86_64
parent2c1417b43a1846d21bc589563460de4b962afcc6 (diff)
downloadcrosvm-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 'x86_64')
-rw-r--r--x86_64/src/lib.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/x86_64/src/lib.rs b/x86_64/src/lib.rs
index a4ba444..c073223 100644
--- a/x86_64/src/lib.rs
+++ b/x86_64/src/lib.rs
@@ -54,11 +54,11 @@ use std::mem;
 use std::sync::Arc;
 
 use crate::bootparam::boot_params;
-use arch::{RunnableLinuxVm, VmComponents, VmImage};
+use arch::{get_serial_tty_string, RunnableLinuxVm, SerialParameters, VmComponents, VmImage};
 use devices::split_irqchip_common::GsiRelay;
 use devices::{
-    get_serial_tty_string, Ioapic, PciConfigIo, PciDevice, PciInterruptPin, Pic, SerialParameters,
-    IOAPIC_BASE_ADDRESS, IOAPIC_MEM_LENGTH_BYTES,
+    Ioapic, PciConfigIo, PciDevice, PciInterruptPin, Pic, IOAPIC_BASE_ADDRESS,
+    IOAPIC_MEM_LENGTH_BYTES,
 };
 use io_jail::Minijail;
 use kvm::*;