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

runtime-rs: Implement and use try_from for DiskConfig

Browse Source 
Implement try_from trait function to convert runtime-rs BlockConfig
to cloud-hypervisor DiskConfig. This can allow for code reuse in the
future.

Fixes: #8581

Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
This commit is contained in:
Archana Shinde 2023-12-05 15:39:42 -08:00
parent b056683b7a
commit a661ac3a0e
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/runtime-rs/crates/hypervisor/src/ch/inner_device.rs
View File

@ -6,7 +6,6 @@
use super::inner::CloudHypervisorInner; use super::inner::CloudHypervisorInner;
use crate::device::DeviceType; use crate::device::DeviceType;
use crate::BlockDevice;
use crate::HybridVsockDevice; use crate::HybridVsockDevice;
use crate::NetworkConfig; use crate::NetworkConfig;
use crate::PciPath; use crate::PciPath;
@ -14,6 +13,7 @@ use crate::ShareFsConfig;
use crate::ShareFsDevice; use crate::ShareFsDevice;
use crate::VfioDevice; use crate::VfioDevice;
use crate::VmmState; use crate::VmmState;
use crate::{BlockConfig, BlockDevice};
use anyhow::{anyhow, Context, Result}; use anyhow::{anyhow, Context, Result};
use ch_config::ch_api::cloud_hypervisor_vm_device_add; use ch_config::ch_api::cloud_hypervisor_vm_device_add;
use ch_config::ch_api::{ use ch_config::ch_api::{
@ -312,20 +312,11 @@ impl CloudHypervisorInner {
.ok_or("missing socket") .ok_or("missing socket")
.map_err(|e| anyhow!(e))?; .map_err(|e| anyhow!(e))?;
let num_queues: usize = DEFAULT_DISK_QUEUES; let disk_config = DiskConfig::try_from(device.config)?;
let queue_size: u16 = DEFAULT_DISK_QUEUE_SIZE;
let block_config = DiskConfig {
path: Some(device.config.path_on_host.as_str().into()),
readonly: device.config.is_readonly,
num_queues,
queue_size,
..Default::default()
};
let response = cloud_hypervisor_vm_blockdev_add( let response = cloud_hypervisor_vm_blockdev_add(
socket.try_clone().context("failed to clone socket")?, socket.try_clone().context("failed to clone socket")?,
block_config, disk_config,
) )
.await?; .await?;
@ -388,6 +379,23 @@ impl TryFrom<NetworkConfig> for NetConfig {
Err(anyhow!("Missing mac address for network device")) Err(anyhow!("Missing mac address for network device"))
} }
} }
impl TryFrom<BlockConfig> for DiskConfig {
type Error = anyhow::Error;
fn try_from(blkcfg: BlockConfig) -> Result<Self, Self::Error> {
let disk_config: DiskConfig = DiskConfig {
path: Some(blkcfg.path_on_host.as_str().into()),
readonly: blkcfg.is_readonly,
num_queues: DEFAULT_DISK_QUEUES,
queue_size: DEFAULT_DISK_QUEUE_SIZE,
..Default::default()
};
Ok(disk_config)
}
}
#[derive(Debug)] #[derive(Debug)]
pub struct ShareFsSettings { pub struct ShareFsSettings {
cfg: ShareFsConfig, cfg: ShareFsConfig,