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

runtime-rs: Add devno to DeviceVirtioScsi

Browse Source 
A new attribute named `devno` is added to DeviceVirtioScsi.
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 17:45:54 +01:00
parent 2cc48f7822
commit 48e2df53f7
1 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1631,21 +1631,30 @@ struct DeviceVirtioScsi {
id: String,
disable_modern: bool,
iothread: String,
iommu_platform: bool,
devno: Option<String>,
}
impl DeviceVirtioScsi {
fn new(id: &str, disable_modern: bool, bus_type: VirtioBusType) -> Self {
fn new(id: &str, disable_modern: bool, bus_type: VirtioBusType, devno: Option<String>) -> Self {
DeviceVirtioScsi {
bus_type,
id: id.to_owned(),
disable_modern,
iothread: "".to_owned(),
iommu_platform: false,
devno,
}
}
fn set_iothread(&mut self, iothread: &str) {
self.iothread = iothread.to_owned();
}
fn set_iommu_platform(&mut self, iommu_platform: bool) -> &mut Self {
self.iommu_platform = iommu_platform;
self
}
}
#[async_trait]
@@ -1660,6 +1669,12 @@ impl ToQemuParams for DeviceVirtioScsi {
if !self.iothread.is_empty() {
params.push(format!("iothread={}", self.iothread));
}
if self.iommu_platform {
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(",")])
}
}
@@ -1820,8 +1835,32 @@ impl<'a> QemuCmdLine<'a> {
}
fn add_scsi_controller(&mut self) {
let mut virtio_scsi =
DeviceVirtioScsi::new("scsi0", should_disable_modern(), bus_type(self.config));
let devno = match &mut self.ccw_subchannel {
Some(subchannel) => match subchannel.add_device("scsi0") {
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 virtio_scsi = DeviceVirtioScsi::new(
"scsi0",
should_disable_modern(),
bus_type(self.config),
devno,
);
if self.config.device_info.enable_iommu_platform
&& bus_type(self.config) == VirtioBusType::Ccw
{
virtio_scsi.set_iommu_platform(true);
}
if self.config.enable_iothreads {
let iothread_id = "scsi-io-thread";
let iothread = ObjectIoThread::new(iothread_id);