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

runtime-rs: Add devno to VhostVsock

Browse Source 
A new attribute named `devno` is added to VhostVsock.
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 18:07:40 +01:00
parent 9486790089
commit 920484918c
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -974,16 +974,23 @@ struct VhostVsock {
guest_cid: u32, guest_cid: u32,
disable_modern: bool, disable_modern: bool,
iommu_platform: bool, iommu_platform: bool,
devno: Option<String>,
} }
impl VhostVsock { impl VhostVsock {
fn new(vhostfd: tokio::fs::File, guest_cid: u32, bus_type: VirtioBusType) -> VhostVsock { fn new(
vhostfd: tokio::fs::File,
guest_cid: u32,
bus_type: VirtioBusType,
devno: Option<String>,
) -> VhostVsock {
VhostVsock { VhostVsock {
bus_type, bus_type,
vhostfd, vhostfd,
guest_cid, guest_cid,
disable_modern: false, disable_modern: false,
iommu_platform: false, iommu_platform: false,
devno,
} }
} }
@ -1009,6 +1016,9 @@ impl ToQemuParams for VhostVsock {
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));
}
params.push(format!("vhostfd={}", self.vhostfd.as_raw_fd())); params.push(format!("vhostfd={}", self.vhostfd.as_raw_fd()));
params.push(format!("guest-cid={}", self.guest_cid)); params.push(format!("guest-cid={}", self.guest_cid));
@ -1859,13 +1869,28 @@ impl<'a> QemuCmdLine<'a> {
pub fn add_vsock(&mut self, vhostfd: tokio::fs::File, guest_cid: u32) -> Result<()> { pub fn add_vsock(&mut self, vhostfd: tokio::fs::File, guest_cid: u32) -> Result<()> {
clear_cloexec(vhostfd.as_raw_fd()).context("clearing O_CLOEXEC failed on vsock fd")?; clear_cloexec(vhostfd.as_raw_fd()).context("clearing O_CLOEXEC failed on vsock fd")?;
let mut vhost_vsock_pci = VhostVsock::new(vhostfd, guest_cid, bus_type(self.config)); let devno = match &mut self.ccw_subchannel {
Some(subchannel) => match subchannel.add_device("vsock-0") {
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 vhost_vsock_pci = VhostVsock::new(vhostfd, guest_cid, bus_type(self.config), devno);
if !self.config.disable_nesting_checks && should_disable_modern() { if !self.config.disable_nesting_checks && should_disable_modern() {
vhost_vsock_pci.set_disable_modern(true); vhost_vsock_pci.set_disable_modern(true);
} }
if self.config.device_info.enable_iommu_platform { if self.config.device_info.enable_iommu_platform
&& bus_type(self.config) == VirtioBusType::Ccw
{
vhost_vsock_pci.set_iommu_platform(true); vhost_vsock_pci.set_iommu_platform(true);
} }