github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-05 11:36:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10697 from Apokleos/no-sharefs

Browse Source 
runtime-rs: Support shared_fs = "none" for CoCo
This commit is contained in:
Fupan Li 2025-06-12 11:48:00 +08:00 committed by GitHub
commit 7c1f8c9009
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,6 +65,7 @@ pub const VIRTIO_PMEM: &str = "virtio-pmem";
mod firecracker; mod firecracker;
pub use self::firecracker::{FirecrackerConfig, HYPERVISOR_NAME_FIRECRACKER}; pub use self::firecracker::{FirecrackerConfig, HYPERVISOR_NAME_FIRECRACKER};
const NO_VIRTIO_FS: &str = "none";
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";
@ -943,6 +944,7 @@ pub struct SharedFsInfo {
/// Shared file system type: /// Shared file system type:
/// - virtio-fs (default) /// - virtio-fs (default)
/// - virtio-9p` /// - virtio-9p`
/// - none
pub shared_fs: Option<String>, pub shared_fs: Option<String>,
/// Path to vhost-user-fs daemon. /// Path to vhost-user-fs daemon.
@ -992,6 +994,11 @@ pub struct SharedFsInfo {
impl SharedFsInfo { impl SharedFsInfo {
/// Adjust the configuration information after loading from configuration file. /// Adjust the configuration information after loading from configuration file.
pub fn adjust_config(&mut self) -> Result<()> { pub fn adjust_config(&mut self) -> Result<()> {
if self.shared_fs.as_deref() == Some(NO_VIRTIO_FS) {
self.shared_fs = None;
return Ok(());
}
if self.shared_fs.as_deref() == Some("") { if self.shared_fs.as_deref() == Some("") {
self.shared_fs = Some(default::DEFAULT_SHARED_FS_TYPE.to_string()); self.shared_fs = Some(default::DEFAULT_SHARED_FS_TYPE.to_string());
} }