Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 4 additions & 22 deletions vmm_tests/vmm_tests/tests/tests/multiarch/openhcl_servicing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -346,20 +334,14 @@ 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(
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?;

Expand Down