kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: Improve naming of ConsoleInfo struct members

Browse Source 
These aren't FDs and we don't need to know that they are the main ones.

Signed-off-by: Rob Bradford <rbradford@meta.com>
This commit is contained in:
Rob Bradford
2026-03-06 09:05:30 -08:00
parent 9cb49a244e
commit 9d712a10a6
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vmm/src/console_devices.rs
View File

@@ -67,10 +67,10 @@ pub enum ConsoleTransport {
#[derive(Clone)]
pub struct ConsoleInfo {
pub console_main_fd: ConsoleTransport,
pub serial_main_fd: ConsoleTransport,
pub console: ConsoleTransport,
pub serial: ConsoleTransport,
#[cfg(target_arch = "x86_64")]
pub debug_main_fd: ConsoleTransport,
pub debug: ConsoleTransport,
}
fn modify_mode<F: FnOnce(&mut termios)>(
@@ -181,7 +181,7 @@ pub(crate) fn pre_create_console_devices(vmm: &mut Vmm) -> ConsoleDeviceResult<C
let mut original_termios_opt = vmm.original_termios_opt.lock().unwrap();
let console_info = ConsoleInfo {
console_main_fd: match vmconfig.console.mode {
console: match vmconfig.console.mode {
ConsoleOutputMode::File => {
let file = File::create(vmconfig.console.file.as_ref().unwrap())
.map_err(ConsoleDeviceError::CreateConsoleDevice)?;
@@ -230,7 +230,7 @@ pub(crate) fn pre_create_console_devices(vmm: &mut Vmm) -> ConsoleDeviceResult<C
ConsoleOutputMode::Null => ConsoleTransport::Null,
ConsoleOutputMode::Off => ConsoleTransport::Off,
},
serial_main_fd: match vmconfig.serial.mode {
serial: match vmconfig.serial.mode {
ConsoleOutputMode::File => {
let file = File::create(vmconfig.serial.file.as_ref().unwrap())
.map_err(ConsoleDeviceError::CreateConsoleDevice)?;
@@ -268,7 +268,7 @@ pub(crate) fn pre_create_console_devices(vmm: &mut Vmm) -> ConsoleDeviceResult<C
ConsoleOutputMode::Off => ConsoleTransport::Off,
},
#[cfg(target_arch = "x86_64")]
debug_main_fd: match vmconfig.debug_console.mode {
debug: match vmconfig.debug_console.mode {
ConsoleOutputMode::File => {
let file = File::create(vmconfig.debug_console.file.as_ref().unwrap())
.map_err(ConsoleDeviceError::CreateConsoleDevice)?;