mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-05 13:05:45 +00:00
tests: Factorize memory hotplug enabling
Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
parent
d30de8ecee
commit
b31589f6bc
@ -756,6 +756,13 @@ mod tests {
|
|||||||
.unwrap_or_default();
|
.unwrap_or_default();
|
||||||
assert_eq!(reboot_count, current_reboot_count + 1);
|
assert_eq!(reboot_count, current_reboot_count + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn enable_memory_hotplug(&self) {
|
||||||
|
self.ssh_command(
|
||||||
|
"echo online | sudo tee /sys/devices/system/memory/auto_online_blocks",
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
struct GuestCommand<'a> {
|
struct GuestCommand<'a> {
|
||||||
@ -1049,11 +1056,7 @@ mod tests {
|
|||||||
// ACPI feature is needed.
|
// ACPI feature is needed.
|
||||||
#[cfg(feature = "acpi")]
|
#[cfg(feature = "acpi")]
|
||||||
{
|
{
|
||||||
guest
|
guest.enable_memory_hotplug();
|
||||||
.ssh_command(
|
|
||||||
"echo online | sudo tee /sys/devices/system/memory/auto_online_blocks",
|
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
// Add RAM to the VM
|
// Add RAM to the VM
|
||||||
let desired_ram = 1024 << 20;
|
let desired_ram = 1024 << 20;
|
||||||
@ -1198,11 +1201,7 @@ mod tests {
|
|||||||
// ACPI feature is needed.
|
// ACPI feature is needed.
|
||||||
#[cfg(feature = "acpi")]
|
#[cfg(feature = "acpi")]
|
||||||
{
|
{
|
||||||
guest
|
guest.enable_memory_hotplug();
|
||||||
.ssh_command(
|
|
||||||
"echo online | sudo tee /sys/devices/system/memory/auto_online_blocks",
|
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
// Add RAM to the VM
|
// Add RAM to the VM
|
||||||
let desired_ram = 1024 << 20;
|
let desired_ram = 1024 << 20;
|
||||||
@ -1412,11 +1411,7 @@ mod tests {
|
|||||||
// ACPI feature is needed.
|
// ACPI feature is needed.
|
||||||
#[cfg(feature = "acpi")]
|
#[cfg(feature = "acpi")]
|
||||||
{
|
{
|
||||||
guest
|
guest.enable_memory_hotplug();
|
||||||
.ssh_command(
|
|
||||||
"echo online | sudo tee /sys/devices/system/memory/auto_online_blocks",
|
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
// Add RAM to the VM
|
// Add RAM to the VM
|
||||||
let desired_ram = 1024 << 20;
|
let desired_ram = 1024 << 20;
|
||||||
@ -2245,11 +2240,7 @@ mod tests {
|
|||||||
|
|
||||||
assert!(guest.get_total_memory().unwrap_or_default() > 2_880_000);
|
assert!(guest.get_total_memory().unwrap_or_default() > 2_880_000);
|
||||||
|
|
||||||
guest
|
guest.enable_memory_hotplug();
|
||||||
.ssh_command(
|
|
||||||
"echo online | sudo tee /sys/devices/system/memory/auto_online_blocks",
|
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
resize_zone_command(&api_socket, "mem0", "3G");
|
resize_zone_command(&api_socket, "mem0", "3G");
|
||||||
thread::sleep(std::time::Duration::new(5, 0));
|
thread::sleep(std::time::Duration::new(5, 0));
|
||||||
@ -2340,11 +2331,7 @@ mod tests {
|
|||||||
assert!(guest.check_numa_node_distances(1, "20 10 25").unwrap());
|
assert!(guest.check_numa_node_distances(1, "20 10 25").unwrap());
|
||||||
assert!(guest.check_numa_node_distances(2, "25 30 10").unwrap());
|
assert!(guest.check_numa_node_distances(2, "25 30 10").unwrap());
|
||||||
|
|
||||||
guest
|
guest.enable_memory_hotplug();
|
||||||
.ssh_command(
|
|
||||||
"echo online | sudo tee /sys/devices/system/memory/auto_online_blocks",
|
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
// Resize every memory zone and check each associated NUMA node
|
// Resize every memory zone and check each associated NUMA node
|
||||||
// has been assigned the right amount of memory.
|
// has been assigned the right amount of memory.
|
||||||
@ -4184,11 +4171,7 @@ mod tests {
|
|||||||
|
|
||||||
assert!(guest.get_total_memory().unwrap_or_default() > 480_000);
|
assert!(guest.get_total_memory().unwrap_or_default() > 480_000);
|
||||||
|
|
||||||
guest
|
guest.enable_memory_hotplug();
|
||||||
.ssh_command(
|
|
||||||
"echo online | sudo tee /sys/devices/system/memory/auto_online_blocks",
|
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
// Add RAM to the VM
|
// Add RAM to the VM
|
||||||
let desired_ram = 1024 << 20;
|
let desired_ram = 1024 << 20;
|
||||||
@ -4217,11 +4200,7 @@ mod tests {
|
|||||||
|
|
||||||
assert!(guest.get_total_memory().unwrap_or_default() > 960_000);
|
assert!(guest.get_total_memory().unwrap_or_default() > 960_000);
|
||||||
|
|
||||||
guest
|
guest.enable_memory_hotplug();
|
||||||
.ssh_command(
|
|
||||||
"echo online | sudo tee /sys/devices/system/memory/auto_online_blocks",
|
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
// Add RAM to the VM
|
// Add RAM to the VM
|
||||||
let desired_ram = 2048 << 20;
|
let desired_ram = 2048 << 20;
|
||||||
@ -4277,11 +4256,7 @@ mod tests {
|
|||||||
|
|
||||||
assert!(guest.get_total_memory().unwrap_or_default() > 480_000);
|
assert!(guest.get_total_memory().unwrap_or_default() > 480_000);
|
||||||
|
|
||||||
guest
|
guest.enable_memory_hotplug();
|
||||||
.ssh_command(
|
|
||||||
"echo online | sudo tee /sys/devices/system/memory/auto_online_blocks",
|
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
// Add RAM to the VM
|
// Add RAM to the VM
|
||||||
let desired_ram = 1024 << 20;
|
let desired_ram = 1024 << 20;
|
||||||
@ -4355,11 +4330,7 @@ mod tests {
|
|||||||
assert_eq!(guest.get_cpu_count().unwrap_or_default(), 2);
|
assert_eq!(guest.get_cpu_count().unwrap_or_default(), 2);
|
||||||
assert!(guest.get_total_memory().unwrap_or_default() > 480_000);
|
assert!(guest.get_total_memory().unwrap_or_default() > 480_000);
|
||||||
|
|
||||||
guest
|
guest.enable_memory_hotplug();
|
||||||
.ssh_command(
|
|
||||||
"echo online | sudo tee /sys/devices/system/memory/auto_online_blocks",
|
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
// Resize the VM
|
// Resize the VM
|
||||||
let desired_vcpus = 4;
|
let desired_vcpus = 4;
|
||||||
|
Loading…
Reference in New Issue
Block a user