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: Remove balloon options from --memory parameter

Browse Source 
The standalone `--balloon` parameter being fully functional at this
point, we can get rid of the balloon options from the --memory
parameter.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf
2020-10-14 14:00:05 +02:00
parent 3594685279
commit f4e391922f
4 changed files with 5 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vmm/src/api/openapi/cloud-hypervisor.yaml
View File

@@ -537,12 +537,6 @@ components:
hugepages:
type: boolean
default: false
balloon:
type: boolean
default: false
balloon_size:
type: integer
format: int64
zones:
type: array
items:
@@ -810,8 +804,8 @@ components:
description: desired memory ram in bytes
type: integer
format: int64
desired_ram_w_balloon:
description: desired ballon size in bytes
desired_balloon:
description: desired balloon size in bytes
type: integer
format: int64

18
vmm/src/config.rs
View File

@@ -418,10 +418,6 @@ pub struct MemoryConfig {
#[serde(default)]
pub hugepages: bool,
#[serde(default)]
pub balloon: bool,
#[serde(default)]
pub balloon_size: u64,
#[serde(default)]
pub zones: Option<Vec<MemoryZoneConfig>>,
}
@@ -436,8 +432,7 @@ impl MemoryConfig {
.add("hotplug_size")
.add("hotplugged_size")
.add("shared")
.add("hugepages")
.add("balloon");
.add("hugepages");
parser.parse(memory).map_err(Error::ParseMemory)?;
let size = parser
@@ -472,11 +467,6 @@ impl MemoryConfig {
.map_err(Error::ParseMemory)?
.unwrap_or(Toggle(false))
.0;
let balloon = parser
.convert::<Toggle>("balloon")
.map_err(Error::ParseMemory)?
.unwrap_or(Toggle(false))
.0;
let zones: Option<Vec<MemoryZoneConfig>> = if let Some(memory_zones) = &memory_zones {
let mut zones = Vec::new();
@@ -546,8 +536,6 @@ impl MemoryConfig {
hotplugged_size,
shared,
hugepages,
balloon,
balloon_size: 0,
zones,
})
}
@@ -581,8 +569,6 @@ impl Default for MemoryConfig {
hotplugged_size: None,
shared: false,
hugepages: false,
balloon: false,
balloon_size: 0,
zones: None,
}
}
@@ -2194,8 +2180,6 @@ mod tests {
hotplugged_size: None,
shared: false,
hugepages: false,
balloon: false,
balloon_size: 0,
zones: None,
},
kernel: Some(KernelConfig {