diff options
| -rw-r--r-- | devices/src/serial.rs | 15 | ||||
| -rw-r--r-- | src/main.rs | 4 |
2 files changed, 16 insertions, 3 deletions
diff --git a/devices/src/serial.rs b/devices/src/serial.rs index 4d12512..1fa7b61 100644 --- a/devices/src/serial.rs +++ b/devices/src/serial.rs @@ -4,6 +4,7 @@ use std::collections::VecDeque; use std::fmt::{self, Display}; +use std::fs::File; use std::io::{self, stdout}; use std::path::PathBuf; use std::str::FromStr; @@ -51,6 +52,8 @@ const DEFAULT_BAUD_DIVISOR: u16 = 12; // 9600 bps pub enum Error { CloneEventFd(sys_util::Error), InvalidSerialType(String), + PathRequired, + FileError(std::io::Error), Unimplemented(SerialType), } @@ -62,7 +65,9 @@ impl Display for Error { #[sorted] match self { 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), + PathRequired => write!(f, "serial device type file requires a path"), 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 #[derive(Debug)] pub enum SerialType { - File, // NOT IMPLEMENTED + File, Stdout, Sink, Syslog, @@ -136,7 +141,13 @@ impl SerialParameters { 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)), } } diff --git a/src/main.rs b/src/main.rs index 6b948e6..092664a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -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!( "serial parameter {}", @@ -796,8 +797,9 @@ fn run_vm(args: std::env::Args) -> std::result::Result<(), ()> { "type=TYPE,[path=PATH,num=NUM,console]", "Comma seperated key=value pairs for setting up serial devices. Can be given more than once. 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 + 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. "), Argument::value("syslog-tag", "TAG", "When logging to syslog, use the provided tag."), |