From dfd07ae6d0f48c1f856a60d642594543fdc4c4a9 Mon Sep 17 00:00:00 2001
From: Muminul Islam <muislam@microsoft.com>
Date: Sat, 21 Mar 2026 18:22:59 -0700
Subject: [PATCH] tests: extract _test_virtio_console to tests_wrappers

Extract test logic from test_virtio_console into a shared
_test_virtio_console 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            | 39 ++++++++++++++++
 cloud-hypervisor/tests/integration.rs         | 44 +------------------
 2 files changed, 41 insertions(+), 42 deletions(-)

diff --git a/cloud-hypervisor/tests/common/tests_wrappers.rs b/cloud-hypervisor/tests/common/tests_wrappers.rs
index c1a21986b..874ad795c 100644
--- a/cloud-hypervisor/tests/common/tests_wrappers.rs
+++ b/cloud-hypervisor/tests/common/tests_wrappers.rs
@@ -2362,3 +2362,42 @@ pub(crate) fn _test_multiple_network_interfaces(guest: &Guest) {
 
     handle_child_output(r, &output);
 }
+
+pub(crate) fn _test_virtio_console(guest: &Guest) {
+    let mut child = GuestCommand::new(guest)
+        .default_cpus()
+        .default_memory()
+        .default_kernel_cmdline()
+        .default_disks()
+        .default_net()
+        .args(["--console", "tty"])
+        .args(["--serial", "null"])
+        .capture_output()
+        .spawn()
+        .unwrap();
+
+    let text = String::from("On a branch floating down river a cricket, singing.");
+    let cmd = format!("echo {text} | sudo tee /dev/hvc0");
+
+    let r = std::panic::catch_unwind(|| {
+        guest.wait_vm_boot().unwrap();
+
+        assert!(
+            guest
+                .does_device_vendor_pair_match("0x1043", "0x1af4")
+                .unwrap_or_default()
+        );
+
+        guest.ssh_command(&cmd).unwrap();
+    });
+
+    kill_child(&mut child);
+    let output = child.wait_with_output().unwrap();
+    handle_child_output(r, &output);
+
+    let r = std::panic::catch_unwind(|| {
+        assert!(String::from_utf8_lossy(&output.stdout).contains(&text));
+    });
+
+    handle_child_output(r, &output);
+}
diff --git a/cloud-hypervisor/tests/integration.rs b/cloud-hypervisor/tests/integration.rs
index 3677fbe2a..55f081d12 100644
--- a/cloud-hypervisor/tests/integration.rs
+++ b/cloud-hypervisor/tests/integration.rs
@@ -2197,48 +2197,8 @@ mod common_parallel {
 
     #[test]
     fn test_virtio_console() {
-        let disk_config = UbuntuDiskConfig::new(JAMMY_IMAGE_NAME.to_string());
-        let guest = Guest::new(Box::new(disk_config));
-
-        let kernel_path = direct_kernel_boot_path();
-
-        let mut child = GuestCommand::new(&guest)
-            .default_cpus()
-            .default_memory()
-            .args(["--kernel", kernel_path.to_str().unwrap()])
-            .args(["--cmdline", DIRECT_KERNEL_BOOT_CMDLINE])
-            .default_disks()
-            .default_net()
-            .args(["--console", "tty"])
-            .args(["--serial", "null"])
-            .capture_output()
-            .spawn()
-            .unwrap();
-
-        let text = String::from("On a branch floating down river a cricket, singing.");
-        let cmd = format!("echo {text} | sudo tee /dev/hvc0");
-
-        let r = std::panic::catch_unwind(|| {
-            guest.wait_vm_boot().unwrap();
-
-            assert!(
-                guest
-                    .does_device_vendor_pair_match("0x1043", "0x1af4")
-                    .unwrap_or_default()
-            );
-
-            guest.ssh_command(&cmd).unwrap();
-        });
-
-        kill_child(&mut child);
-        let output = child.wait_with_output().unwrap();
-        handle_child_output(r, &output);
-
-        let r = std::panic::catch_unwind(|| {
-            assert!(String::from_utf8_lossy(&output.stdout).contains(&text));
-        });
-
-        handle_child_output(r, &output);
+        let guest = basic_regular_guest!(JAMMY_IMAGE_NAME);
+        _test_virtio_console(&guest);
     }
 
     #[test]