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

fs: change vhostuser and virtio into const

Browse Source 
change fs mode vhostuser and virtio into const.

Signed-off-by: Chao Wu <chaowu@linux.alibaba.com>
This commit is contained in:
Chao Wu 2022-07-06 11:38:12 +08:00
parent e14e98bbeb
commit 47a4142e0d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dragonball/src/device_manager/fs_dev_mgr.rs
View File

@ -27,6 +27,10 @@ const USE_SHARED_IRQ: bool = true;
const USE_GENERIC_IRQ: bool = true; const USE_GENERIC_IRQ: bool = true;
// Default cache size is 2 Gi since this is a typical VM memory size. // Default cache size is 2 Gi since this is a typical VM memory size.
const DEFAULT_CACHE_SIZE: u64 = 2 * 1024 * 1024 * 1024; const DEFAULT_CACHE_SIZE: u64 = 2 * 1024 * 1024 * 1024;
// We have 2 supported fs device mode, vhostuser and virtio
const VHOSTUSER_FS_MODE: &str = "vhostuser";
// We have 2 supported fs device mode, vhostuser and virtio
const VIRTIO_FS_MODE: &str = "virtio";
/// Errors associated with `FsDeviceConfig`. /// Errors associated with `FsDeviceConfig`.
#[derive(Debug, thiserror::Error)] #[derive(Debug, thiserror::Error)]
@ -152,7 +156,7 @@ impl std::default::Default for FsDeviceConfigInfo {
impl FsDeviceConfigInfo { impl FsDeviceConfigInfo {
/// The default mode is set to 'virtio' for 'virtio-fs' device. /// The default mode is set to 'virtio' for 'virtio-fs' device.
pub fn default_fs_mode() -> String { pub fn default_fs_mode() -> String {
String::from("virtio") String::from(VIRTIO_FS_MODE)
} }
/// The default cache policy /// The default cache policy
@ -227,7 +231,7 @@ impl ConfigItem for FsDeviceConfigInfo {
fn check_conflicts(&self, other: &Self) -> Result<(), FsDeviceError> { fn check_conflicts(&self, other: &Self) -> Result<(), FsDeviceError> {
if self.tag == other.tag { if self.tag == other.tag {
Err(FsDeviceError::FsDeviceTagAlreadyExists(self.tag.clone())) Err(FsDeviceError::FsDeviceTagAlreadyExists(self.tag.clone()))
} else if self.mode.as_str() == "vhostuser" && self.sock_path == other.sock_path { } else if self.mode.as_str() == VHOSTUSER_FS_MODE && self.sock_path == other.sock_path {
Err(FsDeviceError::FsDevicePathAlreadyExists( Err(FsDeviceError::FsDevicePathAlreadyExists(
self.sock_path.clone(), self.sock_path.clone(),
)) ))
@ -354,8 +358,8 @@ impl FsDeviceMgr {
ctx: &mut DeviceOpContext, ctx: &mut DeviceOpContext,
epoll_mgr: EpollManager, epoll_mgr: EpollManager,
) -> std::result::Result<DbsVirtioDevice, FsDeviceError> { ) -> std::result::Result<DbsVirtioDevice, FsDeviceError> {
match config.mode.as_str() { match &config.mode as &str {
"virtio" => Self::attach_virtio_fs_devices(config, ctx, epoll_mgr), VIRTIO_FS_MODE => Self::attach_virtio_fs_devices(config, ctx, epoll_mgr),
_ => Err(FsDeviceError::CreateFsDevice(virtio::Error::InvalidInput)), _ => Err(FsDeviceError::CreateFsDevice(virtio::Error::InvalidInput)),
} }
} }