From 277ff84e552ef7de49ed2967834adf5b861be590 Mon Sep 17 00:00:00 2001 From: Jianyong Wu Date: Sun, 26 Sep 2021 16:10:15 +0800 Subject: [PATCH] tests: Enable memory hotplug and virtio_balloon on arm64 Memory hotplug and virtio_balloon works on arm64 with: - memory hotplug: An updated kernel using ACPI - virtio balloon: `stress` installed in the cloud image Therefore, we can enable test cases for them in integration test. Signed-off-by: Jianyong Wu Signed-off-by: Henry Wang --- tests/integration.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/integration.rs b/tests/integration.rs index 007eec5ed..70d84071c 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -4285,12 +4285,18 @@ mod tests { } #[test] - #[cfg(target_arch = "x86_64")] fn test_memory_hotplug() { - let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); + #[cfg(target_arch = "aarch64")] + let focal_image = FOCAL_IMAGE_UPDATE_KERNEL_NAME.to_string(); + #[cfg(target_arch = "x86_64")] + let focal_image = FOCAL_IMAGE_NAME.to_string(); + let focal = UbuntuDiskConfig::new(focal_image); let guest = Guest::new(Box::new(focal)); let api_socket = temp_api_path(&guest.tmp_dir); + #[cfg(target_arch = "aarch64")] + let kernel_path = edk2_path(); + #[cfg(target_arch = "x86_64")] let kernel_path = direct_kernel_boot_path(); let mut child = GuestCommand::new(&guest) @@ -4697,7 +4703,6 @@ mod tests { } #[test] - #[cfg(target_arch = "x86_64")] fn test_virtio_balloon() { let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string()); let guest = Guest::new(Box::new(focal));