External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-01-03 11:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: save console_resize_pipe info to Vmm

Browse Source 
With this change all the information to manage console devices is now
available within Vmm Object.

Signed-off-by: Praveen K Paladugu <prapal@linux.microsoft.com>
This commit is contained in:
Praveen K Paladugu 2024-05-02 21:18:23 +00:00 committed by Rob Bradford
parent d784bf0c75
commit 385f9a9aa9
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
vmm/src/console_devices.rs
View File

@ -10,6 +10,7 @@
// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause // SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause
// //
use crate::sigwinch_listener::listen_for_sigwinch_on_tty;
use crate::vm_config::ConsoleOutputMode; use crate::vm_config::ConsoleOutputMode;
use crate::Vmm; use crate::Vmm;
use libc::cfmakeraw; use libc::cfmakeraw;
@ -54,6 +55,10 @@ pub enum ConsoleDeviceError {
/// Cannot duplicate file descriptor /// Cannot duplicate file descriptor
#[error("Cannot duplicate file descriptor: {0}")] #[error("Cannot duplicate file descriptor: {0}")]
DupFd(#[source] vmm_sys_util::errno::Error), DupFd(#[source] vmm_sys_util::errno::Error),
/// Error starting sigwinch listener
#[error("Error starting sigwinch listener: {0}")]
StartSigwinchListener(#[source] std::io::Error),
} }
type ConsoleDeviceResult<T> = result::Result<T, ConsoleDeviceError>; type ConsoleDeviceResult<T> = result::Result<T, ConsoleDeviceError>;
@ -179,6 +184,14 @@ pub(crate) fn pre_create_console_devices(vmm: &mut Vmm) -> ConsoleDeviceResult<C
console_info.console_main_fd = Some(main_fd.into_raw_fd()); console_info.console_main_fd = Some(main_fd.into_raw_fd());
set_raw_mode(&sub_fd.as_raw_fd(), vmm.original_termios_opt.clone())?; set_raw_mode(&sub_fd.as_raw_fd(), vmm.original_termios_opt.clone())?;
vmconfig.console.file = Some(path.clone()); vmconfig.console.file = Some(path.clone());
vmm.console_resize_pipe = Some(
listen_for_sigwinch_on_tty(
sub_fd,
&vmm.seccomp_action,
vmm.hypervisor.hypervisor_type(),
)
.map_err(ConsoleDeviceError::StartSigwinchListener)?,
);
} }
ConsoleOutputMode::Tty => { ConsoleOutputMode::Tty => {
// Duplicating the file descriptors like this is needed as otherwise // Duplicating the file descriptors like this is needed as otherwise
@ -192,6 +205,18 @@ pub(crate) fn pre_create_console_devices(vmm: &mut Vmm) -> ConsoleDeviceResult<C
// SAFETY: stdout is valid and owned solely by us. // SAFETY: stdout is valid and owned solely by us.
let stdout = unsafe { File::from_raw_fd(stdout) }; let stdout = unsafe { File::from_raw_fd(stdout) };
// SAFETY: FFI call. Trivially safe.
if unsafe { libc::isatty(libc::STDOUT_FILENO) } == 1 {
vmm.console_resize_pipe = Some(
listen_for_sigwinch_on_tty(
stdout.try_clone().unwrap(),
&vmm.seccomp_action,
vmm.hypervisor.hypervisor_type(),
)
.map_err(ConsoleDeviceError::StartSigwinchListener)?,
);
}
// Make sure stdout is in raw mode, if it's a terminal. // Make sure stdout is in raw mode, if it's a terminal.
set_raw_mode(&stdout, vmm.original_termios_opt.clone())?; set_raw_mode(&stdout, vmm.original_termios_opt.clone())?;
console_info.console_main_fd = Some(stdout.into_raw_fd()); console_info.console_main_fd = Some(stdout.into_raw_fd());

2
vmm/src/lib.rs
View File

@ -549,6 +549,7 @@ pub struct Vmm {
signals: Option<Handle>, signals: Option<Handle>,
threads: Vec<thread::JoinHandle<()>>, threads: Vec<thread::JoinHandle<()>>,
original_termios_opt: Arc<Mutex<Option<termios>>>, original_termios_opt: Arc<Mutex<Option<termios>>>,
console_resize_pipe: Option<File>,
} }
impl Vmm { impl Vmm {
@ -683,6 +684,7 @@ impl Vmm {
signals: None, signals: None,
threads: vec![], threads: vec![],
original_termios_opt: Arc::new(Mutex::new(None)), original_termios_opt: Arc::new(Mutex::new(None)),
console_resize_pipe: None,
}) })
} }