From 4b77ac26d14c1ee432710415522be46b504681df Mon Sep 17 00:00:00 2001
From: Muminul Islam <muislam@microsoft.com>
Date: Sat, 21 Mar 2026 18:39:05 -0700
Subject: [PATCH] tests: extract _test_counters to tests_wrappers

Extract test logic from test_counters into a shared
_test_counters wrapper function in tests_wrappers.rs.
Update the parent test case to use the basic_regular_guest
macro. The wrapper uses default_kernel_cmdline() for
kernel/cmdline setup.

Signed-off-by: Muminul Islam <muislam@microsoft.com>
---
 .../tests/common/tests_wrappers.rs            | 34 ++++++++++++++++++
 cloud-hypervisor/tests/integration.rs         | 36 ++-----------------
 2 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/cloud-hypervisor/tests/common/tests_wrappers.rs b/cloud-hypervisor/tests/common/tests_wrappers.rs
index 6f002fee7..81afdadc6 100644
--- a/cloud-hypervisor/tests/common/tests_wrappers.rs
+++ b/cloud-hypervisor/tests/common/tests_wrappers.rs
@@ -3040,3 +3040,37 @@ pub(crate) fn _test_net_hotplug(
 
     handle_child_output(r, &output);
 }
+
+pub(crate) fn _test_counters(guest: &Guest) {
+    let api_socket = temp_api_path(&guest.tmp_dir);
+
+    let mut cmd = GuestCommand::new(guest);
+    cmd.default_cpus()
+        .default_memory()
+        .default_kernel_cmdline()
+        .default_disks()
+        .args(["--net", guest.default_net_string().as_str()])
+        .args(["--api-socket", &api_socket])
+        .capture_output();
+
+    let mut child = cmd.spawn().unwrap();
+
+    let r = std::panic::catch_unwind(|| {
+        guest.wait_vm_boot().unwrap();
+
+        let orig_counters = get_counters(&api_socket);
+        guest
+            .ssh_command("dd if=/dev/zero of=test count=8 bs=1M")
+            .unwrap();
+
+        let new_counters = get_counters(&api_socket);
+
+        // Check that all the counters have increased
+        assert!(new_counters > orig_counters);
+    });
+
+    kill_child(&mut child);
+    let output = child.wait_with_output().unwrap();
+
+    handle_child_output(r, &output);
+}
diff --git a/cloud-hypervisor/tests/integration.rs b/cloud-hypervisor/tests/integration.rs
index 770313eee..47b898029 100644
--- a/cloud-hypervisor/tests/integration.rs
+++ b/cloud-hypervisor/tests/integration.rs
@@ -5008,40 +5008,8 @@ mod common_parallel {
 
     #[test]
     fn test_counters() {
-        let disk_config = UbuntuDiskConfig::new(JAMMY_IMAGE_NAME.to_string());
-        let guest = Guest::new(Box::new(disk_config));
-        let api_socket = temp_api_path(&guest.tmp_dir);
-
-        let mut cmd = GuestCommand::new(&guest);
-        cmd.default_cpus()
-            .default_memory()
-            .args(["--kernel", direct_kernel_boot_path().to_str().unwrap()])
-            .args(["--cmdline", DIRECT_KERNEL_BOOT_CMDLINE])
-            .default_disks()
-            .args(["--net", guest.default_net_string().as_str()])
-            .args(["--api-socket", &api_socket])
-            .capture_output();
-
-        let mut child = cmd.spawn().unwrap();
-
-        let r = std::panic::catch_unwind(|| {
-            guest.wait_vm_boot().unwrap();
-
-            let orig_counters = get_counters(&api_socket);
-            guest
-                .ssh_command("dd if=/dev/zero of=test count=8 bs=1M")
-                .unwrap();
-
-            let new_counters = get_counters(&api_socket);
-
-            // Check that all the counters have increased
-            assert!(new_counters > orig_counters);
-        });
-
-        kill_child(&mut child);
-        let output = child.wait_with_output().unwrap();
-
-        handle_child_output(r, &output);
+        let guest = basic_regular_guest!(JAMMY_IMAGE_NAME);
+        _test_counters(&guest);
     }
 
     #[test]