github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-30 04:34:27 +00:00
Code Issues Projects Releases Wiki Activity

dragonball: update vsock dependency

Browse Source 
1. fix vsock device init failed
2. fix VsockDeviceConfigInfo not found

Signed-off-by: wllenyj <wllenyj@linux.alibaba.com>
This commit is contained in:
wllenyj 2022-05-26 17:29:50 +08:00 committed by Chao Wu
parent dd003ebe0e
commit d88b1bf01c
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dragonball/src/api/v1/mod.rs
View File

@ -4,9 +4,7 @@
//! API Version 1 related data structures to configure the vmm. //! API Version 1 related data structures to configure the vmm.
mod vmm_action; mod vmm_action;
pub use self::vmm_action::{ pub use self::vmm_action::*;
VmmAction, VmmActionError, VmmData, VmmRequest, VmmResponse, VmmService,
};
/// Wrapper for configuring the microVM boot source. /// Wrapper for configuring the microVM boot source.
mod boot_source; mod boot_source;

8
src/dragonball/src/api/v1/vmm_action.rs
View File

@ -17,20 +17,20 @@ use crate::vm::{CpuTopology, KernelConfigInfo, VmConfigInfo};
use crate::vmm::Vmm; use crate::vmm::Vmm;
#[cfg(feature = "virtio-blk")] #[cfg(feature = "virtio-blk")]
use crate::device_manager::blk_dev_mgr::{ pub use crate::device_manager::blk_dev_mgr::{
BlockDeviceConfigInfo, BlockDeviceConfigUpdateInfo, BlockDeviceError, BlockDeviceMgr, BlockDeviceConfigInfo, BlockDeviceConfigUpdateInfo, BlockDeviceError, BlockDeviceMgr,
}; };
#[cfg(feature = "virtio-fs")] #[cfg(feature = "virtio-fs")]
use crate::device_manager::fs_dev_mgr::{ pub use crate::device_manager::fs_dev_mgr::{
FsDeviceConfigInfo, FsDeviceConfigUpdateInfo, FsDeviceError, FsDeviceMgr, FsMountConfigInfo, FsDeviceConfigInfo, FsDeviceConfigUpdateInfo, FsDeviceError, FsDeviceMgr, FsMountConfigInfo,
}; };
#[cfg(feature = "virtio-net")] #[cfg(feature = "virtio-net")]
use crate::device_manager::virtio_net_dev_mgr::{ pub use crate::device_manager::virtio_net_dev_mgr::{
VirtioNetDeviceConfigInfo, VirtioNetDeviceConfigUpdateInfo, VirtioNetDeviceError, VirtioNetDeviceConfigInfo, VirtioNetDeviceConfigUpdateInfo, VirtioNetDeviceError,
VirtioNetDeviceMgr, VirtioNetDeviceMgr,
}; };
#[cfg(feature = "virtio-vsock")] #[cfg(feature = "virtio-vsock")]
use crate::device_manager::vsock_dev_mgr::{VsockDeviceConfigInfo, VsockDeviceError}; pub use crate::device_manager::vsock_dev_mgr::{VsockDeviceConfigInfo, VsockDeviceError};
use super::*; use super::*;

14
src/dragonball/src/device_manager/vsock_dev_mgr.rs
View File

@ -88,6 +88,20 @@ pub struct VsockDeviceConfigInfo {
pub use_generic_irq: Option<bool>, pub use_generic_irq: Option<bool>,
} }
impl Default for VsockDeviceConfigInfo {
fn default() -> Self {
Self {
id: String::default(),
guest_cid: 0,
uds_path: None,
tcp_addr: None,
queue_size: Vec::from(QUEUE_SIZES),
use_shared_irq: None,
use_generic_irq: None,
}
}
}
impl VsockDeviceConfigInfo { impl VsockDeviceConfigInfo {
/// Get number and size of queues supported. /// Get number and size of queues supported.
pub fn queue_sizes(&self) -> Vec<u16> { pub fn queue_sizes(&self) -> Vec<u16> {