github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-03 18:04:16 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: add Capability of HybridVsockSupport for Hypervisor.

Browse Source 
Add Cap of HybridVsockSupport for hypervisors CLH and Dragonball
which use hybrid-vsock, default for Qemu, which uses legacy vsock.

Fixes: #8474

Signed-off-by: alex.lyn <alex.lyn@antgroup.com>
This commit is contained in:
alex.lyn
2023-12-04 14:38:06 +08:00
parent c5178dd258
commit 60f88da5e1
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/runtime-rs/crates/hypervisor/src/ch/inner.rs
View File

@@ -83,7 +83,8 @@ impl CloudHypervisorInner {
capabilities.set( capabilities.set(
CapabilityBits::BlockDeviceSupport CapabilityBits::BlockDeviceSupport
| CapabilityBits::BlockDeviceHotplugSupport | CapabilityBits::BlockDeviceHotplugSupport
| CapabilityBits::FsSharingSupport, | CapabilityBits::FsSharingSupport
| CapabilityBits::HybridVsockSupport,
); );
let (tx, rx) = channel(true); let (tx, rx) = channel(true);

5
src/runtime-rs/crates/hypervisor/src/ch/inner_hypervisor.rs
View File

@@ -690,11 +690,14 @@ impl CloudHypervisorInner {
let flags = if guest_protection_is_tdx(self.guest_protection_to_use.clone()) { let flags = if guest_protection_is_tdx(self.guest_protection_to_use.clone()) {
// TDX does not permit the use of virtio-fs. // TDX does not permit the use of virtio-fs.
CapabilityBits::BlockDeviceSupport | CapabilityBits::BlockDeviceHotplugSupport CapabilityBits::BlockDeviceSupport
| CapabilityBits::BlockDeviceHotplugSupport
| CapabilityBits::HybridVsockSupport
} else { } else {
CapabilityBits::BlockDeviceSupport CapabilityBits::BlockDeviceSupport
| CapabilityBits::BlockDeviceHotplugSupport | CapabilityBits::BlockDeviceHotplugSupport
| CapabilityBits::FsSharingSupport | CapabilityBits::FsSharingSupport
| CapabilityBits::HybridVsockSupport
}; };
caps.set(flags); caps.set(flags);

3
src/runtime-rs/crates/hypervisor/src/dragonball/inner.rs
View File

@@ -76,7 +76,8 @@ impl DragonballInner {
capabilities.set( capabilities.set(
CapabilityBits::BlockDeviceSupport CapabilityBits::BlockDeviceSupport
| CapabilityBits::BlockDeviceHotplugSupport | CapabilityBits::BlockDeviceHotplugSupport
| CapabilityBits::FsSharingSupport, | CapabilityBits::FsSharingSupport
| CapabilityBits::HybridVsockSupport,
); );
DragonballInner { DragonballInner {
id: "".to_string(), id: "".to_string(),