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

kata-types: don't check virtio_fs_daemon for inline-virtio-fs

Browse Source 
If the shared_fs is set to "inline-virtio-fs", the "virtio_fs_daemon"
should be ignored.

Fixes: #5104

Signed-off-by: Bin Liu <bin@hyper.sh>
This commit is contained in:
Bin Liu 2022-09-05 17:41:51 +08:00
parent 662ce3d6f2
commit fc9c6f87a3
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -818,11 +818,15 @@ impl SharedFsInfo {
validate_path_pattern(&self.valid_virtio_fs_daemon_paths, path) validate_path_pattern(&self.valid_virtio_fs_daemon_paths, path)
} }
fn adjust_virtio_fs(&mut self, _inline: bool) -> Result<()> { fn adjust_virtio_fs(&mut self, inline: bool) -> Result<()> {
// inline mode doesn't need external virtiofsd daemon
if !inline {
resolve_path!( resolve_path!(
self.virtio_fs_daemon, self.virtio_fs_daemon,
"Virtio-fs daemon path {} is invalid: {}" "Virtio-fs daemon path {} is invalid: {}"
)?; )?;
}
if self.virtio_fs_cache.is_empty() { if self.virtio_fs_cache.is_empty() {
self.virtio_fs_cache = default::DEFAULT_VIRTIO_FS_CACHE_MODE.to_string(); self.virtio_fs_cache = default::DEFAULT_VIRTIO_FS_CACHE_MODE.to_string();
} }
@ -836,16 +840,13 @@ impl SharedFsInfo {
} }
fn validate_virtio_fs(&self, inline: bool) -> Result<()> { fn validate_virtio_fs(&self, inline: bool) -> Result<()> {
if inline && !self.virtio_fs_daemon.is_empty() { // inline mode doesn't need external virtiofsd daemon
return Err(eother!( if !inline {
"Executable path for inline-virtio-fs is not empty: {}",
&self.virtio_fs_daemon
));
}
validate_path!( validate_path!(
self.virtio_fs_daemon, self.virtio_fs_daemon,
"Virtio-fs daemon path {} is invalid: {}" "Virtio-fs daemon path {} is invalid: {}"
)?; )?;
}
let l = ["none", "auto", "always"]; let l = ["none", "auto", "always"];