github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-06 12:06:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9517 from amshinde/update-storage-source-pciblock

Browse Source 
runtime-rs: Update storage source for pci block devices
This commit is contained in:
Alex Lyn 2024-04-23 07:32:36 +08:00 committed by GitHub
commit bc2cf95e7a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/kata-types/src/config/hypervisor/mod.rs
View File

@ -50,9 +50,15 @@ pub const VIRTIO_BLK_PCI: &str = "virtio-blk-pci";
/// Virtual MMIO block device driver. /// Virtual MMIO block device driver.
pub const VIRTIO_BLK_MMIO: &str = "virtio-blk-mmio"; pub const VIRTIO_BLK_MMIO: &str = "virtio-blk-mmio";
const VIRTIO_BLK_CCW: &str = "virtio-blk-ccw"; /// Virtual CCW block device driver.
const VIRTIO_SCSI: &str = "virtio-scsi"; pub const VIRTIO_BLK_CCW: &str = "virtio-blk-ccw";
const VIRTIO_PMEM: &str = "virtio-pmem";
/// Virtual SCSI block device driver.
pub const VIRTIO_SCSI: &str = "virtio-scsi";
/// Virtual PMEM device driver.
pub const VIRTIO_PMEM: &str = "virtio-pmem";
const VIRTIO_9P: &str = "virtio-9p"; const VIRTIO_9P: &str = "virtio-9p";
const VIRTIO_FS: &str = "virtio-fs"; const VIRTIO_FS: &str = "virtio-fs";
const VIRTIO_FS_INLINE: &str = "inline-virtio-fs"; const VIRTIO_FS_INLINE: &str = "inline-virtio-fs";

29
src/runtime-rs/crates/resource/src/rootfs/block_rootfs.rs
View File

@ -16,6 +16,9 @@ use hypervisor::{
}, },
BlockConfig, BlockConfig,
}; };
use kata_types::config::hypervisor::{
VIRTIO_BLK_CCW, VIRTIO_BLK_MMIO, VIRTIO_BLK_PCI, VIRTIO_PMEM, VIRTIO_SCSI,
};
use kata_types::mount::Mount; use kata_types::mount::Mount;
use nix::sys::stat::{self, SFlag}; use nix::sys::stat::{self, SFlag};
use std::fs; use std::fs;
@ -48,7 +51,7 @@ impl BlockRootfs {
let block_device_config = &mut BlockConfig { let block_device_config = &mut BlockConfig {
major: stat::major(dev_id) as i64, major: stat::major(dev_id) as i64,
minor: stat::minor(dev_id) as i64, minor: stat::minor(dev_id) as i64,
driver_option: block_driver, driver_option: block_driver.clone(),
..Default::default() ..Default::default()
}; };
@ -67,8 +70,30 @@ impl BlockRootfs {
let mut device_id: String = "".to_owned(); let mut device_id: String = "".to_owned();
if let DeviceType::Block(device) = device_info { if let DeviceType::Block(device) = device_info {
storage.driver = device.config.driver_option; storage.driver = device.config.driver_option;
storage.source = device.config.virt_path;
device_id = device.device_id; device_id = device.device_id;
match block_driver.as_str() {
VIRTIO_BLK_PCI => {
storage.source = device
.config
.pci_path
.ok_or("PCI path missing for pci block device")
.map_err(|e| anyhow!(e))?
.to_string();
}
VIRTIO_BLK_MMIO => {
storage.source = device.config.virt_path;
}
VIRTIO_SCSI | VIRTIO_BLK_CCW | VIRTIO_PMEM => {
return Err(anyhow!(
"Complete support for block driver {} has not been implemented yet",
block_driver
));
}
_ => {
return Err(anyhow!("Unknown block driver : {}", block_driver));
}
}
} }
Ok(Self { Ok(Self {