From d5863caa4d4eba41f323555d93133a24f0308590 Mon Sep 17 00:00:00 2001
From: Henry Wang <Henry.Wang@arm.com>
Date: Fri, 31 Jul 2020 10:54:07 +0800
Subject: [PATCH] ci: AArch64: Enable virtio-fs integration test

This commit enables the virtio-fs related integration test cases
for AArch64.

Note that to run virtio-fs cases, the host kernel should be
newer than v5.5.

Fixes: https://github.com/cloud-hypervisor/cloud-hypervisor/issues/1516

Signed-off-by: Henry Wang <henry.wang@arm.com>
---
 tests/integration.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/integration.rs b/tests/integration.rs
index c382886b6..ed91ba24d 100644
--- a/tests/integration.rs
+++ b/tests/integration.rs
@@ -1550,7 +1550,9 @@ mod tests {
 
             // ACPI is not built with mmio, hence we can't test the resize
             // feature for mmio.
+            // ACPI is currently x86_64 only, we skip this for AArch64.
             #[cfg(not(feature = "mmio"))]
+            #[cfg(target_arch = "x86_64")]
             {
                 guest
                     .ssh_command(
@@ -2620,31 +2622,26 @@ mod tests {
         }
 
         #[test]
-        #[cfg(target_arch = "x86_64")]
         fn test_virtio_fs_dax_on_default_cache_size() {
             test_virtio_fs(true, None, "none", &prepare_virtiofsd, false)
         }
 
         #[test]
-        #[cfg(target_arch = "x86_64")]
         fn test_virtio_fs_dax_on_cache_size_1_gib() {
             test_virtio_fs(true, Some(0x4000_0000), "none", &prepare_virtiofsd, false)
         }
 
         #[test]
-        #[cfg(target_arch = "x86_64")]
         fn test_virtio_fs_dax_off() {
             test_virtio_fs(false, None, "none", &prepare_virtiofsd, false)
         }
 
         #[test]
-        #[cfg(target_arch = "x86_64")]
         fn test_virtio_fs_dax_on_default_cache_size_w_vhost_user_fs_daemon() {
             test_virtio_fs(true, None, "none", &prepare_vhost_user_fs_daemon, false)
         }
 
         #[test]
-        #[cfg(target_arch = "x86_64")]
         fn test_virtio_fs_dax_on_cache_size_1_gib_w_vhost_user_fs_daemon() {
             test_virtio_fs(
                 true,
@@ -2656,7 +2653,6 @@ mod tests {
         }
 
         #[test]
-        #[cfg(target_arch = "x86_64")]
         fn test_virtio_fs_dax_off_w_vhost_user_fs_daemon() {
             test_virtio_fs(false, None, "none", &prepare_vhost_user_fs_daemon, false)
         }