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

runtime-rs: support iommu_platform for qemu virtio-serial device

Browse Source 
iommu_platform is only turned on for CCW systems.

PartialEq is added to VirtioBusType to enable the '==' operator.

Signed-off-by: Pavel Mores <pmores@redhat.com>
This commit is contained in:
Pavel Mores 2024-04-24 17:39:54 +02:00
parent 66a2dc48ae
commit 0d038f20cc
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ trait ToQemuParams: Send + Sync {
async fn qemu_params(&self) -> Result<Vec<String>>; async fn qemu_params(&self) -> Result<Vec<String>>;
} }
#[derive(Debug)] #[derive(Debug, PartialEq)]
enum VirtioBusType { enum VirtioBusType {
Pci, Pci,
Ccw, Ccw,
@ -1047,6 +1047,7 @@ impl ToQemuParams for DeviceVirtioNet {
struct DeviceVirtioSerial { struct DeviceVirtioSerial {
id: String, id: String,
bus_type: VirtioBusType, bus_type: VirtioBusType,
iommu_platform: bool,
} }
impl DeviceVirtioSerial { impl DeviceVirtioSerial {
@ -1054,8 +1055,14 @@ impl DeviceVirtioSerial {
DeviceVirtioSerial { DeviceVirtioSerial {
id: id.to_owned(), id: id.to_owned(),
bus_type, bus_type,
iommu_platform: false,
} }
} }
fn set_iommu_platform(&mut self, iommu_platform: bool) -> &mut Self {
self.iommu_platform = iommu_platform;
self
}
} }
#[async_trait] #[async_trait]
@ -1064,6 +1071,9 @@ impl ToQemuParams for DeviceVirtioSerial {
let mut params = Vec::new(); let mut params = Vec::new();
params.push(format!("virtio-serial-{}", self.bus_type)); params.push(format!("virtio-serial-{}", self.bus_type));
params.push(format!("id={}", self.id)); params.push(format!("id={}", self.id));
if self.iommu_platform {
params.push("iommu_platform=on".to_owned());
}
Ok(vec!["-device".to_owned(), params.join(",")]) Ok(vec!["-device".to_owned(), params.join(",")])
} }
} }
@ -1378,7 +1388,10 @@ 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 serial_dev = DeviceVirtioSerial::new("serial0", self.bus_type()); let mut serial_dev = DeviceVirtioSerial::new("serial0", self.bus_type());
if self.config.device_info.enable_iommu_platform && self.bus_type() == VirtioBusType::Ccw {
serial_dev.set_iommu_platform(true);
}
self.devices.push(Box::new(serial_dev)); self.devices.push(Box::new(serial_dev));
let chardev_name = "charconsole0"; let chardev_name = "charconsole0";