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: cleanup legacy console device management

Browse Source 
Signed-off-by: Praveen K Paladugu <prapal@linux.microsoft.com>
This commit is contained in:
Praveen K Paladugu
2024-05-03 21:33:17 +00:00
committed by Rob Bradford
parent 52eebaf6b2
commit dc723171a7
3 changed files with 13 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vmm/src/vm.rs
+2 -30
View File
@@ -22,7 +22,7 @@ use crate::coredump::{
CpuElf64Writable, DumpState, Elf64Writable, GuestDebuggable, GuestDebuggableError, NoteDescType,
};
use crate::cpu;
use crate::device_manager::{DeviceManager, DeviceManagerError, PtyPair};
use crate::device_manager::{DeviceManager, DeviceManagerError};
use crate::device_tree::DeviceTree;
#[cfg(feature = "guest_debug")]
use crate::gdb::{Debuggable, DebuggableError, GdbRequestPayload, GdbResponsePayload};
@@ -488,9 +488,6 @@ impl Vm {
hypervisor: Arc<dyn hypervisor::Hypervisor>,
activate_evt: EventFd,
timestamp: Instant,
serial_pty: Option<PtyPair>,
console_pty: Option<PtyPair>,
debug_console_pty: Option<PtyPair>,
console_info: Option<ConsoleInfo>,
console_resize_pipe: Option<File>,
original_termios: Arc<Mutex<Option<termios>>>,
@@ -648,14 +645,7 @@ impl Vm {
device_manager
.lock()
.unwrap()
.create_devices(
serial_pty,
console_pty,
debug_console_pty,
console_info,
console_resize_pipe,
original_termios,
)
.create_devices(console_info, console_resize_pipe, original_termios)
.map_err(Error::DeviceManager)?;
#[cfg(feature = "tdx")]
@@ -806,9 +796,6 @@ impl Vm {
seccomp_action: &SeccompAction,
hypervisor: Arc<dyn hypervisor::Hypervisor>,
activate_evt: EventFd,
serial_pty: Option<PtyPair>,
console_pty: Option<PtyPair>,
debug_console_pty: Option<PtyPair>,
console_info: Option<ConsoleInfo>,
console_resize_pipe: Option<File>,
original_termios: Arc<Mutex<Option<termios>>>,
@@ -887,9 +874,6 @@ impl Vm {
hypervisor,
activate_evt,
timestamp,
serial_pty,
console_pty,
debug_console_pty,
console_info,
console_resize_pipe,
original_termios,
@@ -1366,18 +1350,6 @@ impl Vm {
Ok(())
}
pub fn serial_pty(&self) -> Option<PtyPair> {
self.device_manager.lock().unwrap().serial_pty()
}
pub fn console_pty(&self) -> Option<PtyPair> {
self.device_manager.lock().unwrap().console_pty()
}
pub fn debug_console_pty(&self) -> Option<PtyPair> {
self.device_manager.lock().unwrap().debug_console_pty()
}
pub fn console_resize_pipe(&self) -> Option<Arc<File>> {
self.device_manager.lock().unwrap().console_resize_pipe()
}