mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-03 20:15:45 +00:00
vmm: device_manager: rename console_input to virtio_console_input
Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
parent
fec54f71b0
commit
5ed794a44c
@ -403,7 +403,7 @@ pub fn get_win_size() -> (u16, u16) {
|
|||||||
pub struct Console {
|
pub struct Console {
|
||||||
// Serial port on 0x3f8
|
// Serial port on 0x3f8
|
||||||
serial: Option<Arc<Mutex<Serial>>>,
|
serial: Option<Arc<Mutex<Serial>>>,
|
||||||
console_input: Option<Arc<virtio_devices::ConsoleInput>>,
|
virtio_console_input: Option<Arc<virtio_devices::ConsoleInput>>,
|
||||||
input_enabled: bool,
|
input_enabled: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -418,16 +418,19 @@ impl Console {
|
|||||||
.queue_input_bytes(out)?;
|
.queue_input_bytes(out)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
if self.console_input.is_some() {
|
if self.virtio_console_input.is_some() {
|
||||||
self.console_input.as_ref().unwrap().queue_input_bytes(out);
|
self.virtio_console_input
|
||||||
|
.as_ref()
|
||||||
|
.unwrap()
|
||||||
|
.queue_input_bytes(out);
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn update_console_size(&self, cols: u16, rows: u16) {
|
pub fn update_console_size(&self, cols: u16, rows: u16) {
|
||||||
if self.console_input.is_some() {
|
if self.virtio_console_input.is_some() {
|
||||||
self.console_input
|
self.virtio_console_input
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.update_console_size(cols, rows)
|
.update_console_size(cols, rows)
|
||||||
@ -1490,10 +1493,10 @@ impl DeviceManager {
|
|||||||
ConsoleOutputMode::Off => None,
|
ConsoleOutputMode::Off => None,
|
||||||
};
|
};
|
||||||
let (col, row) = get_win_size();
|
let (col, row) = get_win_size();
|
||||||
let console_input = if let Some(writer) = console_writer {
|
let virtio_console_input = if let Some(writer) = console_writer {
|
||||||
let id = String::from(CONSOLE_DEVICE_NAME);
|
let id = String::from(CONSOLE_DEVICE_NAME);
|
||||||
|
|
||||||
let (virtio_console_device, console_input) =
|
let (virtio_console_device, virtio_console_input) =
|
||||||
virtio_devices::Console::new(id.clone(), writer, col, row, console_config.iommu)
|
virtio_devices::Console::new(id.clone(), writer, col, row, console_config.iommu)
|
||||||
.map_err(DeviceManagerError::CreateVirtioConsole)?;
|
.map_err(DeviceManagerError::CreateVirtioConsole)?;
|
||||||
let virtio_console_device = Arc::new(Mutex::new(virtio_console_device));
|
let virtio_console_device = Arc::new(Mutex::new(virtio_console_device));
|
||||||
@ -1511,14 +1514,14 @@ impl DeviceManager {
|
|||||||
.unwrap()
|
.unwrap()
|
||||||
.insert(id.clone(), device_node!(id, virtio_console_device));
|
.insert(id.clone(), device_node!(id, virtio_console_device));
|
||||||
|
|
||||||
Some(console_input)
|
Some(virtio_console_input)
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
};
|
};
|
||||||
|
|
||||||
Ok(Arc::new(Console {
|
Ok(Arc::new(Console {
|
||||||
serial,
|
serial,
|
||||||
console_input,
|
virtio_console_input,
|
||||||
input_enabled: serial_config.mode.input_enabled()
|
input_enabled: serial_config.mode.input_enabled()
|
||||||
|| console_config.mode.input_enabled(),
|
|| console_config.mode.input_enabled(),
|
||||||
}))
|
}))
|
||||||
|
Loading…
Reference in New Issue
Block a user