kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vmm: config: Make VhostUser configs serializable

Browse Source 
They point to a vm_virtio structure (VhostUserConfig) and in order to
make the whole config serializable (through the serde crate for
example), we'd have to add a serde dependency to the vm_virtio crate.

Instead we use a local, serializable structure and convert it to
VhostUserConfig from the DeviceManager code.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz
2019-09-27 09:46:19 +02:00
parent aa31748781
commit 6a722e5c0b
2 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vmm/src/config.rs
+11 -5
View File
@@ -12,7 +12,6 @@ use std::net::AddrParseError;
use std::net::Ipv4Addr;
use std::path::PathBuf;
use std::result;
use vm_virtio::vhost_user::VhostUserConfig;
pub const DEFAULT_VCPUS: &str = "1";
pub const DEFAULT_MEMORY: &str = "size=512M";
@@ -459,10 +458,17 @@ impl DeviceConfig {
}
}
#[derive(Clone, Debug)]
pub struct VuConfig {
pub sock: String,
pub num_queues: usize,
pub queue_size: u16,
}
#[derive(Clone, Debug)]
pub struct VhostUserNetConfig {
pub mac: MacAddr,
pub vu_cfg: VhostUserConfig,
pub vu_cfg: VuConfig,
}
impl VhostUserNetConfig {
@@ -508,7 +514,7 @@ impl VhostUserNetConfig {
.map_err(Error::ParseVuQueueSizeParam)?;
}
let vu_cfg = VhostUserConfig {
let vu_cfg = VuConfig {
sock: sock.to_string(),
num_queues,
queue_size,
@@ -554,7 +560,7 @@ impl VsockConfig {
#[derive(Clone, Debug)]
pub struct VhostUserBlkConfig {
pub wce: bool,
pub vu_cfg: VhostUserConfig,
pub vu_cfg: VuConfig,
}
impl VhostUserBlkConfig {
@@ -597,7 +603,7 @@ impl VhostUserBlkConfig {
wce = wce_str.parse().map_err(Error::ParseVuBlkWceParam)?;
}
let vu_cfg = VhostUserConfig {
let vu_cfg = VuConfig {
sock: sock.to_string(),
num_queues,
queue_size,