From 3f1149ed2dd6218067c8a43c1ebfeed2392c9a7a Mon Sep 17 00:00:00 2001
From: Guramrit Singh <gurasingh@microsoft.com>
Date: Thu, 16 Oct 2025 09:26:51 -0700
Subject: [PATCH 1/2] Fixed the function definition for the helper function.
 Does not need tuple input

---
 .../vmm_tests/tests/tests/multiarch/openhcl_servicing.rs  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vmm_tests/vmm_tests/tests/tests/multiarch/openhcl_servicing.rs b/vmm_tests/vmm_tests/tests/tests/multiarch/openhcl_servicing.rs
index 430b4f0cca..ea782eddcc 100644
--- a/vmm_tests/vmm_tests/tests/tests/multiarch/openhcl_servicing.rs
+++ b/vmm_tests/vmm_tests/tests/tests/multiarch/openhcl_servicing.rs
@@ -285,7 +285,7 @@ async fn servicing_keepalive_with_nvme_fault(
         config,
         fault_configuration,
         fault_start_updater,
-        (igvm_file,),
+        igvm_file,
     )
     .await
 }
@@ -310,7 +310,7 @@ async fn servicing_keepalive_verify_no_duplicate_aers(
         config,
         fault_configuration,
         fault_start_updater,
-        (igvm_file,),
+        igvm_file,
     )
     .await
 }
@@ -350,7 +350,7 @@ async fn servicing_keepalive_with_nvme_identify_fault(
         config,
         fault_configuration,
         fault_start_updater,
-        (igvm_file,),
+        igvm_file,
     )
     .await
 }
@@ -359,7 +359,7 @@ async fn apply_fault_with_keepalive(
     config: PetriVmBuilder<OpenVmmPetriBackend>,
     fault_configuration: FaultConfiguration,
     mut fault_start_updater: CellUpdater<bool>,
-    (igvm_file,): (ResolvedArtifact<impl petri_artifacts_common::tags::IsOpenhclIgvm>,),
+    igvm_file: ResolvedArtifact<impl petri_artifacts_common::tags::IsOpenhclIgvm>,
 ) -> Result<(), anyhow::Error> {
     let (mut vm, agent) = create_keepalive_test_config(config, fault_configuration).await?;
 

From c6accef26ed83cb649af27087383d21077e815b7 Mon Sep 17 00:00:00 2001
From: Guramrit Singh <gurasingh@microsoft.com>
Date: Thu, 16 Oct 2025 09:31:53 -0700
Subject: [PATCH 2/2] fmt fix

---
 .../tests/multiarch/openhcl_servicing.rs      | 24 +++----------------
 1 file changed, 3 insertions(+), 21 deletions(-)

diff --git a/vmm_tests/vmm_tests/tests/tests/multiarch/openhcl_servicing.rs b/vmm_tests/vmm_tests/tests/tests/multiarch/openhcl_servicing.rs
index ea782eddcc..9f72f46941 100644
--- a/vmm_tests/vmm_tests/tests/tests/multiarch/openhcl_servicing.rs
+++ b/vmm_tests/vmm_tests/tests/tests/multiarch/openhcl_servicing.rs
@@ -281,13 +281,7 @@ async fn servicing_keepalive_with_nvme_fault(
             ),
         );
 
-    apply_fault_with_keepalive(
-        config,
-        fault_configuration,
-        fault_start_updater,
-        igvm_file,
-    )
-    .await
+    apply_fault_with_keepalive(config, fault_configuration, fault_start_updater, igvm_file).await
 }
 
 /// Verifies that the driver awaits an existing AER instead of issuing a new one after servicing.
@@ -306,13 +300,7 @@ async fn servicing_keepalive_verify_no_duplicate_aers(
             ),
         );
 
-    apply_fault_with_keepalive(
-        config,
-        fault_configuration,
-        fault_start_updater,
-        igvm_file,
-    )
-    .await
+    apply_fault_with_keepalive(config, fault_configuration, fault_start_updater, igvm_file).await
 }
 
 /// Test servicing an OpenHCL VM from the current version to itself with NVMe keepalive support
@@ -346,13 +334,7 @@ async fn servicing_keepalive_with_nvme_identify_fault(
             ),
         );
 
-    apply_fault_with_keepalive(
-        config,
-        fault_configuration,
-        fault_start_updater,
-        igvm_file,
-    )
-    .await
+    apply_fault_with_keepalive(config, fault_configuration, fault_start_updater, igvm_file).await
 }
 
 async fn apply_fault_with_keepalive(