From b8a46a4b856c4c75f150aa736bb2de63346e3132 Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Thu, 23 Mar 2023 13:23:49 +0000 Subject: [PATCH] runtime-rs: ch: Enable feature Enable the Cloud Hypervisor driver (the `cloud-hypervisor` build feature) for the rust runtime. Fixes: #6264. Signed-off-by: James O. D. Hunt --- src/runtime-rs/crates/hypervisor/README.md | 14 -------------- .../crates/runtimes/virt_container/Cargo.toml | 7 +++---- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/runtime-rs/crates/hypervisor/README.md b/src/runtime-rs/crates/hypervisor/README.md index dcaa4e57e6..8c1fe0ed7d 100644 --- a/src/runtime-rs/crates/hypervisor/README.md +++ b/src/runtime-rs/crates/hypervisor/README.md @@ -7,20 +7,6 @@ External hypervisor support is currently being developed. See [the main tracking issue](https://github.com/kata-containers/kata-containers/issues/4634) for further details. -### Cloud Hypervisor - -A basic implementation currently exists for Cloud Hypervisor. However, -since it is not yet fully functional, the feature is disabled by -default. When the implementation matures, the feature will be enabled -by default. - -> **Note:** -> -> To enable the feature, follow the instructions on https://github.com/kata-containers/kata-containers/pull/6201. - -See the [Cloud Hypervisor tracking issue](https://github.com/kata-containers/kata-containers/issues/6263) -for further details. - Some key points for supporting multi-vmm in rust runtime. ## 1. Hypervisor Config diff --git a/src/runtime-rs/crates/runtimes/virt_container/Cargo.toml b/src/runtime-rs/crates/runtimes/virt_container/Cargo.toml index 0a63195eb3..a3a0a11a65 100644 --- a/src/runtime-rs/crates/runtimes/virt_container/Cargo.toml +++ b/src/runtime-rs/crates/runtimes/virt_container/Cargo.toml @@ -28,7 +28,7 @@ tracing = "0.1.36" agent = { path = "../../agent" } common = { path = "../common" } -hypervisor = { path = "../../hypervisor" } +hypervisor = { path = "../../hypervisor", features = ["cloud-hypervisor"] } kata-sys-util = { path = "../../../../libs/kata-sys-util" } kata-types = { path = "../../../../libs/kata-types" } logging = { path = "../../../../libs/logging"} @@ -37,8 +37,7 @@ persist = { path = "../../persist"} resource = { path = "../../resource" } [features] -default = [] +default = ["cloud-hypervisor"] -# Feature is not yet complete, so not enabled by default. -# See https://github.com/kata-containers/kata-containers/issues/6264. +# Enable the Cloud Hypervisor driver cloud-hypervisor = []