github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-13 13:46:46 +00:00
Code Issues Projects Releases Wiki Activity

dragonball: refactor legacy device initialization

Browse Source 
If the serial path is given, legacy_manager should create socket console
based on that path. Or the console should be created based on stdio.

Fixes: #5914

Signed-off-by: Yushuo <y-shuo@linux.alibaba.com>
This commit is contained in:
Yushuo 2022-12-15 15:49:24 +08:00
parent 39394fa2a8
commit d14c3af35c
2 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/dragonball/src/api/v1/vmm_action.rs
View File

@ -406,19 +406,10 @@ impl VmmService {
} }
config.vpmu_feature = machine_config.vpmu_feature; config.vpmu_feature = machine_config.vpmu_feature;
let vm_id = vm.shared_info().read().unwrap().id.clone(); // If serial_path is:
let serial_path = match machine_config.serial_path { // - None, legacy_manager will create_stdio_console.
Some(value) => value, // - Some(path), legacy_manager will create_socket_console on that path.
None => { config.serial_path = machine_config.serial_path;
if config.serial_path.is_none() {
String::from("/run/dragonball/") + &vm_id + "_com1"
} else {
// Safe to unwrap() because we have checked it has a value.
config.serial_path.as_ref().unwrap().clone()
}
}
};
config.serial_path = Some(serial_path);
vm.set_vm_config(config.clone()); vm.set_vm_config(config.clone());
self.machine_config = config; self.machine_config = config;

24
src/dragonball/src/device_manager/mod.rs
View File

@ -595,23 +595,17 @@ impl DeviceManager {
.map_err(|_| StartMicroVmError::EventFd)?; .map_err(|_| StartMicroVmError::EventFd)?;
info!(self.logger, "init console path: {:?}", com1_sock_path); info!(self.logger, "init console path: {:?}", com1_sock_path);
if let Some(legacy_manager) = self.legacy_manager.as_ref() { if let Some(legacy_manager) = self.legacy_manager.as_ref() {
if let Some(path) = com1_sock_path {
// Currently, the `com1_sock_path` "stdio" is only reserved for creating the stdio console
if path != "stdio" {
let com1 = legacy_manager.get_com1_serial();
self.con_manager
.create_socket_console(com1, path)
.map_err(StartMicroVmError::DeviceManager)?;
return Ok(());
}
}
let com1 = legacy_manager.get_com1_serial(); let com1 = legacy_manager.get_com1_serial();
self.con_manager if let Some(path) = com1_sock_path {
.create_stdio_console(com1) self.con_manager
.map_err(StartMicroVmError::DeviceManager)?; .create_socket_console(com1, path)
.map_err(StartMicroVmError::DeviceManager)?;
} else {
self.con_manager
.create_stdio_console(com1)
.map_err(StartMicroVmError::DeviceManager)?;
}
} }
Ok(()) Ok(())