mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-11-25 05:03:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

crosvm: Implement the file type for serial ports

Browse source 
BUG=chromium:953983

Change-Id: I0c1dc6216ebfdb61db85d3d9665f88f7231d99c8
Reviewed-on: https://chromium-review.googlesource.com/1618281
Commit-Ready: Jorge Moreira Broche <jemoreira@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
Jorge E. Moreira 2019-05-17 13:57:04 -07:00 committed by chrome-bot
parent 3007ff3cf4
commit 9c9e0e71bd
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
devices/src/serial.rs
View file

@ -4,6 +4,7 @@
use std::collections::VecDeque; use std::collections::VecDeque;
use std::fmt::{self, Display}; use std::fmt::{self, Display};
use std::fs::File;
use std::io::{self, stdout}; use std::io::{self, stdout};
use std::path::PathBuf; use std::path::PathBuf;
use std::str::FromStr; use std::str::FromStr;
@ -51,6 +52,8 @@ const DEFAULT_BAUD_DIVISOR: u16 = 12; // 9600 bps
pub enum Error { pub enum Error {
CloneEventFd(sys_util::Error), CloneEventFd(sys_util::Error),
InvalidSerialType(String), InvalidSerialType(String),
PathRequired,
FileError(std::io::Error),
Unimplemented(SerialType), Unimplemented(SerialType),
} }
@ -62,7 +65,9 @@ impl Display for Error {
#[sorted] #[sorted]
match self { match self {
CloneEventFd(e) => write!(f, "unable to clone an EventFd: {}", e), CloneEventFd(e) => write!(f, "unable to clone an EventFd: {}", e),
FileError(e) => write!(f, "Unable to open/create file: {}", e),
InvalidSerialType(e) => write!(f, "invalid serial type: {}", e), InvalidSerialType(e) => write!(f, "invalid serial type: {}", e),
PathRequired => write!(f, "serial device type file requires a path"),
Unimplemented(e) => write!(f, "serial device type {} not implemented", e.to_string()), Unimplemented(e) => write!(f, "serial device type {} not implemented", e.to_string()),
} }
} }
@ -71,7 +76,7 @@ impl Display for Error {
/// Enum for possible type of serial devices /// Enum for possible type of serial devices
#[derive(Debug)] #[derive(Debug)]
pub enum SerialType { pub enum SerialType {
File, // NOT IMPLEMENTED File,
Stdout, Stdout,
Sink, Sink,
Syslog, Syslog,
@ -136,7 +141,13 @@ impl SerialParameters {
syslog::Facility::Daemon, syslog::Facility::Daemon,
)), )),
)), )),
SerialType::File => Err(Error::Unimplemented(SerialType::File)), SerialType::File => match &self.path {
None => Err(Error::PathRequired),
Some(path) => Ok(Serial::new_out(
evt_fd.try_clone().map_err(Error::CloneEventFd)?,
Box::new(File::create(path.as_path()).map_err(|e| Error::FileError(e))?),
)),
},
SerialType::UnixSocket => Err(Error::Unimplemented(SerialType::UnixSocket)), SerialType::UnixSocket => Err(Error::Unimplemented(SerialType::UnixSocket)),
} }
} }

4
src/main.rs
View file

@ -267,6 +267,7 @@ fn parse_serial_options(s: &str) -> argument::Result<SerialParameters> {
)) ))
})? })?
} }
"path" => serial_setting.path = Some(PathBuf::from(v)),
_ => { _ => {
return Err(argument::Error::UnknownArgument(format!( return Err(argument::Error::UnknownArgument(format!(
"serial parameter {}", "serial parameter {}",
@ -796,8 +797,9 @@ fn run_vm(args: std::env::Args) -> std::result::Result<(), ()> {
"type=TYPE,[path=PATH,num=NUM,console]", "type=TYPE,[path=PATH,num=NUM,console]",
"Comma seperated key=value pairs for setting up serial devices. Can be given more than once. "Comma seperated key=value pairs for setting up serial devices. Can be given more than once.
Possible key values: Possible key values:
type=(stdout,syslog,sink) - Where to route the serial device type=(stdout,syslog,sink,file) - Where to route the serial device
num=(1,2,3,4) - Serial Device Number num=(1,2,3,4) - Serial Device Number
path=PATH - The path to the file to write to when type=file
console - Use this serial device as the guest console. Can only be given once. Will default to first serial port if not provided. console - Use this serial device as the guest console. Can only be given once. Will default to first serial port if not provided.
"), "),
Argument::value("syslog-tag", "TAG", "When logging to syslog, use the provided tag."), Argument::value("syslog-tag", "TAG", "When logging to syslog, use the provided tag."),