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

runtime-rs: Add devno to DeviceVirtioSerial

Browse Source 
A new attribute named `devno` is added to DeviceVirtioSerial.
It will be used to specify a device number for a CCW bus type.

Signed-off-by: Hyounggyu Choi <Hyounggyu.Choi@ibm.com>
This commit is contained in:
Hyounggyu Choi 2024-11-21 20:00:15 +01:00
parent 516daecc50
commit 9486790089
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/runtime-rs/crates/hypervisor/src/qemu/cmdline_generator.rs
View File

@ -1240,14 +1240,16 @@ struct DeviceVirtioSerial {
id: String, id: String,
bus_type: VirtioBusType, bus_type: VirtioBusType,
iommu_platform: bool, iommu_platform: bool,
devno: Option<String>,
} }
impl DeviceVirtioSerial { impl DeviceVirtioSerial {
fn new(id: &str, bus_type: VirtioBusType) -> DeviceVirtioSerial { fn new(id: &str, bus_type: VirtioBusType, devno: Option<String>) -> DeviceVirtioSerial {
DeviceVirtioSerial { DeviceVirtioSerial {
id: id.to_owned(), id: id.to_owned(),
bus_type, bus_type,
iommu_platform: false, iommu_platform: false,
devno,
} }
} }
@ -1266,6 +1268,9 @@ impl ToQemuParams for DeviceVirtioSerial {
if self.iommu_platform { if self.iommu_platform {
params.push("iommu_platform=on".to_owned()); params.push("iommu_platform=on".to_owned());
} }
if let Some(devno) = &self.devno {
params.push(format!("devno={}", devno));
}
Ok(vec!["-device".to_owned(), params.join(",")]) Ok(vec!["-device".to_owned(), params.join(",")])
} }
} }
@ -1942,7 +1947,20 @@ impl<'a> QemuCmdLine<'a> {
} }
pub fn add_console(&mut self, console_socket_path: &str) { pub fn add_console(&mut self, console_socket_path: &str) {
let mut serial_dev = DeviceVirtioSerial::new("serial0", bus_type(self.config)); let devno = match &mut self.ccw_subchannel {
Some(subchannel) => match subchannel.add_device("serial0") {
Ok(slot) => {
let addr = subchannel.address_format_ccw(slot);
Some(addr)
}
Err(err) => {
info!(sl!(), "failed to add device to subchannel: {:?}", err);
None
}
},
None => None,
};
let mut serial_dev = DeviceVirtioSerial::new("serial0", bus_type(self.config), devno);
if self.config.device_info.enable_iommu_platform if self.config.device_info.enable_iommu_platform
&& bus_type(self.config) == VirtioBusType::Ccw && bus_type(self.config) == VirtioBusType::Ccw
{ {