main, vmm: Remove guest_numa_node option from memory zones

The way to describe guest NUMA nodes has been updated through previous
commits, letting the user describe the full NUMA topology through the
--numa parameter (or NumaConfig).

That's why we can remove the deprecated and unused 'guest_numa_node'
option.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2020-09-04 11:54:41 +02:00
parent f21c04166a
commit 1970ee89da
4 changed files with 2 additions and 13 deletions

View File

@ -121,7 +121,7 @@ fn create_app<'a, 'b>(
"User defined memory zone parameters \
\"size=<guest_memory_region_size>,file=<backing_file>,\
shared=on|off,hugepages=on|off,host_numa_node=<node_id>,\
guest_numa_node=<node_id>,id=<zone_identifier>\"",
id=<zone_identifier>\"",
)
.takes_value(true)
.min_values(1)

View File

@ -477,9 +477,6 @@ components:
host_numa_node:
type: integer
format: uint32
guest_numa_node:
type: integer
format: uint32
MemoryConfig:
required:

View File

@ -366,8 +366,6 @@ pub struct MemoryZoneConfig {
pub hugepages: bool,
#[serde(default)]
pub host_numa_node: Option<u32>,
#[serde(default)]
pub guest_numa_node: Option<u32>,
}
#[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
@ -449,8 +447,7 @@ impl MemoryConfig {
.add("file")
.add("shared")
.add("hugepages")
.add("host_numa_node")
.add("guest_numa_node");
.add("host_numa_node");
parser.parse(memory_zone).map_err(Error::ParseMemoryZone)?;
let id = parser.get("id").ok_or(Error::ParseMemoryZoneIdMissing)?;
@ -473,9 +470,6 @@ impl MemoryConfig {
let host_numa_node = parser
.convert::<u32>("host_numa_node")
.map_err(Error::ParseMemoryZone)?;
let guest_numa_node = parser
.convert::<u32>("guest_numa_node")
.map_err(Error::ParseMemoryZone)?;
zones.push(MemoryZoneConfig {
id,
@ -484,7 +478,6 @@ impl MemoryConfig {
shared,
hugepages,
host_numa_node,
guest_numa_node,
});
}
Some(zones)

View File

@ -414,7 +414,6 @@ impl MemoryManager {
shared: config.shared,
hugepages: config.hugepages,
host_numa_node: None,
guest_numa_node: None,
}];
(config.size, zones)