From b1b96a5c4981cc14cacaf522a24caac08c6f11b1 Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Wed, 20 Sep 2023 13:37:25 +0100 Subject: [PATCH] runtime-rs: ch: Remove erroneous "virtio-blk-mmio" check Remove the `VIRTIO_BLK_MMIO` check which appears to have been added erroneously in the first place. Signed-off-by: James O. D. Hunt --- src/libs/kata-types/src/config/hypervisor/ch.rs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/libs/kata-types/src/config/hypervisor/ch.rs b/src/libs/kata-types/src/config/hypervisor/ch.rs index cc752e3852..6831ee9cdb 100644 --- a/src/libs/kata-types/src/config/hypervisor/ch.rs +++ b/src/libs/kata-types/src/config/hypervisor/ch.rs @@ -13,7 +13,6 @@ use super::{default, register_hypervisor_plugin}; use crate::config::default::MAX_CH_VCPUS; use crate::config::default::MIN_CH_MEMORY_SIZE_MB; -use crate::config::hypervisor::VIRTIO_BLK_MMIO; use crate::config::{ConfigPlugin, TomlConfig}; use crate::{eother, resolve_path, validate_path}; @@ -103,12 +102,6 @@ impl ConfigPlugin for CloudHypervisorConfig { return Err(eother!("Valid CH jailer path list should be empty")); } - if !ch.blockdev_info.disable_block_device_use - && ch.blockdev_info.block_device_driver == VIRTIO_BLK_MMIO - { - return Err(eother!("CH doesn't support virtio-blk-mmio")); - } - if ch.boot_info.kernel.is_empty() { return Err(eother!("Guest kernel image for CH is empty")); }