From aead6dd59f96f5bdfdf2ef829ec91cc4f502484d Mon Sep 17 00:00:00 2001 From: Muminul Islam Date: Sat, 21 Mar 2026 17:36:12 -0700 Subject: [PATCH] tests: use basic_regular_guest macro in test_virtio_vsock_hotplug Replace manual UbuntuDiskConfig and GuestFactory guest creation with the basic_regular_guest! macro in test_virtio_vsock_hotplug. The aarch64 variant chains with_kernel_path for EDK2 firmware support. Signed-off-by: Muminul Islam --- cloud-hypervisor/tests/integration.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cloud-hypervisor/tests/integration.rs b/cloud-hypervisor/tests/integration.rs index b5c8f0477..d56c25f78 100644 --- a/cloud-hypervisor/tests/integration.rs +++ b/cloud-hypervisor/tests/integration.rs @@ -2730,13 +2730,11 @@ mod common_parallel { #[test] fn test_virtio_vsock_hotplug() { - let disk_config = UbuntuDiskConfig::new(JAMMY_IMAGE_NAME.to_string()); #[cfg(target_arch = "x86_64")] - let guest = GuestFactory::new_regular_guest_factory().create_guest(Box::new(disk_config)); + let guest = basic_regular_guest!(JAMMY_IMAGE_NAME); #[cfg(target_arch = "aarch64")] - let guest = GuestFactory::new_regular_guest_factory() - .create_guest(Box::new(disk_config)) - .with_kernel_path(edk2_path().to_str().unwrap()); + let guest = + basic_regular_guest!(JAMMY_IMAGE_NAME).with_kernel_path(edk2_path().to_str().unwrap()); _test_virtio_vsock(&guest, true); }