From 75fbea3c46e1fbbc65468faf3b1e16afcd5663cc Mon Sep 17 00:00:00 2001
From: Rob Bradford <robert.bradford@intel.com>
Date: Mon, 21 Feb 2022 09:54:13 +0000
Subject: [PATCH] tests: Rename prepare_virtiofsd_rs_daemon

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
---
 tests/integration.rs | 44 ++++++++------------------------------------
 1 file changed, 8 insertions(+), 36 deletions(-)

diff --git a/tests/integration.rs b/tests/integration.rs
index 8f7afb7c4..42ad1b203 100644
--- a/tests/integration.rs
+++ b/tests/integration.rs
@@ -72,7 +72,7 @@ const DIRECT_KERNEL_BOOT_CMDLINE: &str =
 
 const CONSOLE_TEST_STRING: &str = "Started OpenBSD Secure Shell server";
 
-fn prepare_virtiofsd_rs_daemon(
+fn prepare_virtiofsd(
     tmp_dir: &TempDir,
     shared_dir: &str,
     cache: &str,
@@ -2754,14 +2754,7 @@ mod parallel {
     #[test]
     #[cfg(not(feature = "mshv"))]
     fn test_virtio_fs_dax_on_default_cache_size() {
-        test_virtio_fs(
-            true,
-            None,
-            "never",
-            &prepare_virtiofsd_rs_daemon,
-            false,
-            None,
-        )
+        test_virtio_fs(true, None, "never", &prepare_virtiofsd, false, None)
     }
 
     #[test]
@@ -2771,7 +2764,7 @@ mod parallel {
             true,
             Some(0x4000_0000),
             "never",
-            &prepare_virtiofsd_rs_daemon,
+            &prepare_virtiofsd,
             false,
             None,
         )
@@ -2779,39 +2772,18 @@ mod parallel {
 
     #[test]
     fn test_virtio_fs_dax_off() {
-        test_virtio_fs(
-            false,
-            None,
-            "never",
-            &prepare_virtiofsd_rs_daemon,
-            false,
-            None,
-        )
+        test_virtio_fs(false, None, "never", &prepare_virtiofsd, false, None)
     }
 
     #[test]
     #[cfg(not(feature = "mshv"))]
     fn test_virtio_fs_hotplug_dax_on() {
-        test_virtio_fs(
-            true,
-            None,
-            "never",
-            &prepare_virtiofsd_rs_daemon,
-            true,
-            None,
-        )
+        test_virtio_fs(true, None, "never", &prepare_virtiofsd, true, None)
     }
 
     #[test]
     fn test_virtio_fs_hotplug_dax_off() {
-        test_virtio_fs(
-            false,
-            None,
-            "never",
-            &prepare_virtiofsd_rs_daemon,
-            true,
-            None,
-        )
+        test_virtio_fs(false, None, "never", &prepare_virtiofsd, true, None)
     }
 
     #[test]
@@ -2821,7 +2793,7 @@ mod parallel {
             true,
             Some(0x4000_0000),
             "never",
-            &prepare_virtiofsd_rs_daemon,
+            &prepare_virtiofsd,
             true,
             Some(15),
         )
@@ -2834,7 +2806,7 @@ mod parallel {
             true,
             Some(0x4000_0000),
             "never",
-            &prepare_virtiofsd_rs_daemon,
+            &prepare_virtiofsd,
             false,
             Some(15),
         )