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: Derive Debug and PartialEq for configuration structures

Browse Source 
In anticipation for the writing of unit tests comparing two VmConfig
structures, this commit derives the PartialEq trait for VmConfig and
all embedded structures.

This patch also derives the Debug trait for the same set of structures
so that we can print them to facilitate debugging.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf
2019-12-13 11:56:37 +01:00
parent 93f5f6ed45
commit d1390906c8
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vmm/src/config.rs
+16 -16
View File
@@ -182,7 +182,7 @@ fn parse_on_off(param: &str) -> Result<bool> {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
pub struct CpusConfig { pub struct CpusConfig {
pub boot_vcpus: u8, pub boot_vcpus: u8,
pub max_vcpus: u8, pub max_vcpus: u8,
@@ -241,7 +241,7 @@ impl Default for CpusConfig {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
pub struct MemoryConfig { pub struct MemoryConfig {
pub size: u64, pub size: u64,
#[serde(default)] #[serde(default)]
@@ -299,12 +299,12 @@ impl Default for MemoryConfig {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
pub struct KernelConfig { pub struct KernelConfig {
pub path: PathBuf, pub path: PathBuf,
} }
#[derive(Clone, Default, Deserialize, Serialize)] #[derive(Clone, Debug, Default, PartialEq, Deserialize, Serialize)]
pub struct CmdlineConfig { pub struct CmdlineConfig {
pub args: String, pub args: String,
} }
@@ -319,7 +319,7 @@ impl CmdlineConfig {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
pub struct DiskConfig { pub struct DiskConfig {
pub path: PathBuf, pub path: PathBuf,
#[serde(default)] #[serde(default)]
@@ -349,7 +349,7 @@ impl DiskConfig {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
pub struct NetConfig { pub struct NetConfig {
#[serde(default = "default_netconfig_tap")] #[serde(default = "default_netconfig_tap")]
pub tap: Option<String>, pub tap: Option<String>,
@@ -433,7 +433,7 @@ impl NetConfig {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
pub struct RngConfig { pub struct RngConfig {
pub src: PathBuf, pub src: PathBuf,
#[serde(default)] #[serde(default)]
@@ -472,7 +472,7 @@ impl Default for RngConfig {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
pub struct FsConfig { pub struct FsConfig {
pub tag: String, pub tag: String,
pub sock: PathBuf, pub sock: PathBuf,
@@ -582,7 +582,7 @@ impl FsConfig {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
pub struct PmemConfig { pub struct PmemConfig {
pub file: PathBuf, pub file: PathBuf,
pub size: u64, pub size: u64,
@@ -627,7 +627,7 @@ impl PmemConfig {
} }
} }
#[derive(Clone, PartialEq, Deserialize, Serialize)] #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
pub enum ConsoleOutputMode { pub enum ConsoleOutputMode {
Off, Off,
Tty, Tty,
@@ -644,7 +644,7 @@ impl ConsoleOutputMode {
} }
} }
#[derive(Clone, Deserialize, Serialize)] #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
pub struct ConsoleConfig { pub struct ConsoleConfig {
#[serde(default = "default_consoleconfig_file")] #[serde(default = "default_consoleconfig_file")]
pub file: Option<PathBuf>, pub file: Option<PathBuf>,
@@ -718,7 +718,7 @@ impl ConsoleConfig {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
pub struct DeviceConfig { pub struct DeviceConfig {
pub path: PathBuf, pub path: PathBuf,
#[serde(default)] #[serde(default)]
@@ -748,7 +748,7 @@ impl DeviceConfig {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
pub struct VhostUserNetConfig { pub struct VhostUserNetConfig {
pub sock: String, pub sock: String,
#[serde(default = "default_vunetconfig_num_queues")] #[serde(default = "default_vunetconfig_num_queues")]
@@ -823,7 +823,7 @@ impl VhostUserNetConfig {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
pub struct VsockConfig { pub struct VsockConfig {
pub cid: u64, pub cid: u64,
pub sock: PathBuf, pub sock: PathBuf,
@@ -862,7 +862,7 @@ impl VsockConfig {
} }
} }
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
pub struct VhostUserBlkConfig { pub struct VhostUserBlkConfig {
pub sock: String, pub sock: String,
#[serde(default = "default_vublkconfig_num_queues")] #[serde(default = "default_vublkconfig_num_queues")]
@@ -934,7 +934,7 @@ impl VhostUserBlkConfig {
} }
} }
#[derive(Clone, Deserialize, Serialize)] #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
pub struct VmConfig { pub struct VmConfig {
#[serde(default)] #[serde(default)]
pub cpus: CpusConfig, pub cpus: CpusConfig,