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: Derive the clone trait for VmConfig

Browse Source 
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz
2019-09-23 19:56:48 +02:00
committed by Rob Bradford
parent acc60b0ad5
commit b79c1f7722
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
vmm/src/config.rs
View File

@@ -116,6 +116,7 @@ fn parse_size(size: &str) -> Result<u64> {
Ok(res << shift) Ok(res << shift)
} }
#[derive(Clone, Debug)]
pub struct CpusConfig(pub u8); pub struct CpusConfig(pub u8);
impl CpusConfig { impl CpusConfig {
@@ -132,6 +133,7 @@ impl From<&CpusConfig> for u8 {
} }
} }
#[derive(Clone, Debug)]
pub struct MemoryConfig { pub struct MemoryConfig {
pub size: u64, pub size: u64,
pub file: Option<PathBuf>, pub file: Option<PathBuf>,
@@ -172,6 +174,7 @@ impl MemoryConfig {
} }
} }
#[derive(Clone, Debug)]
pub struct KernelConfig { pub struct KernelConfig {
pub path: PathBuf, pub path: PathBuf,
} }
@@ -184,6 +187,7 @@ impl KernelConfig {
} }
} }
#[derive(Clone)]
pub struct CmdlineConfig { pub struct CmdlineConfig {
pub args: Cmdline, pub args: Cmdline,
pub offset: GuestAddress, pub offset: GuestAddress,
@@ -204,7 +208,7 @@ impl CmdlineConfig {
} }
} }
#[derive(Debug)] #[derive(Clone, Debug)]
pub struct DiskConfig { pub struct DiskConfig {
pub path: PathBuf, pub path: PathBuf,
} }
@@ -217,6 +221,7 @@ impl DiskConfig {
} }
} }
#[derive(Clone, Debug)]
pub struct NetConfig { pub struct NetConfig {
pub tap: Option<String>, pub tap: Option<String>,
pub ip: Ipv4Addr, pub ip: Ipv4Addr,
@@ -268,6 +273,7 @@ impl NetConfig {
} }
} }
#[derive(Clone, Debug)]
pub struct RngConfig { pub struct RngConfig {
pub src: PathBuf, pub src: PathBuf,
} }
@@ -280,7 +286,7 @@ impl RngConfig {
} }
} }
#[derive(Debug)] #[derive(Clone, Debug)]
pub struct FsConfig { pub struct FsConfig {
pub tag: String, pub tag: String,
pub sock: PathBuf, pub sock: PathBuf,
@@ -368,6 +374,7 @@ impl FsConfig {
} }
} }
#[derive(Clone, Debug)]
pub struct PmemConfig { pub struct PmemConfig {
pub file: PathBuf, pub file: PathBuf,
pub size: u64, pub size: u64,
@@ -400,7 +407,7 @@ impl PmemConfig {
} }
} }
#[derive(PartialEq)] #[derive(Clone, PartialEq)]
pub enum ConsoleOutputMode { pub enum ConsoleOutputMode {
Off, Off,
Tty, Tty,
@@ -417,6 +424,7 @@ impl ConsoleOutputMode {
} }
} }
#[derive(Clone)]
pub struct ConsoleConfig { pub struct ConsoleConfig {
pub file: Option<PathBuf>, pub file: Option<PathBuf>,
pub mode: ConsoleOutputMode, pub mode: ConsoleOutputMode,
@@ -450,7 +458,7 @@ impl ConsoleConfig {
} }
} }
#[derive(Debug)] #[derive(Clone, Debug)]
pub struct DeviceConfig { pub struct DeviceConfig {
pub path: PathBuf, pub path: PathBuf,
} }
@@ -463,6 +471,7 @@ impl DeviceConfig {
} }
} }
#[derive(Clone, Debug)]
pub struct VhostUserNetConfig { pub struct VhostUserNetConfig {
pub mac: MacAddr, pub mac: MacAddr,
pub vu_cfg: VhostUserConfig, pub vu_cfg: VhostUserConfig,
@@ -521,6 +530,7 @@ impl VhostUserNetConfig {
} }
} }
#[derive(Clone, Debug)]
pub struct VsockConfig { pub struct VsockConfig {
pub cid: u64, pub cid: u64,
pub sock: PathBuf, pub sock: PathBuf,
@@ -553,6 +563,7 @@ impl VsockConfig {
} }
} }
#[derive(Clone, Debug)]
pub struct VhostUserBlkConfig { pub struct VhostUserBlkConfig {
pub wce: bool, pub wce: bool,
pub vu_cfg: VhostUserConfig, pub vu_cfg: VhostUserConfig,
@@ -608,6 +619,7 @@ impl VhostUserBlkConfig {
} }
} }
#[derive(Clone)]
pub struct VmConfig { pub struct VmConfig {
pub cpus: CpusConfig, pub cpus: CpusConfig,
pub memory: MemoryConfig, pub memory: MemoryConfig,