Merge branch 'release/1.7.2511' into cp-2512

Author: mattkur

flowey/flowey_lib_hvlite/src/_jobs/check_openvmm_hcl_size.rs

@@ -95,7 +95,7 @@ impl SimpleFlowNode for Node {
         let merge_commit = ctx.reqv(|v| git_merge_commit::Request {
             repo_path: openvmm_repo_path.clone(),
             merge_commit: v,
-            base_branch: "main".into(),
+            base_branch: "release/1.7.2511".into(),
         });
 
         let merge_run = ctx.reqv(|v| {

petri/src/vm/hyperv/mod.rs

@@ -785,11 +785,8 @@ impl PetriVmRuntime for HyperVPetriRuntime {
             // Extend the default timeout of 2 seconds, as tests are often run
             // in parallel on a host, causing very heavy load on the overall
             // system.
-            //
-            // TODO: Until #2470 is fixed, extend the timeout even longer to 10
-            // seconds to workaround a Windows vmbus bug.
             socket
-                .set_connect_timeout(Duration::from_secs(10))
+                .set_connect_timeout(Duration::from_secs(2))
                 .context("failed to set connect timeout")?;
             socket
                 .set_high_vtl(set_high_vtl)

petri/src/vm/mod.rs

@@ -924,6 +924,13 @@ impl<T: PetriVmmBackend> PetriVm<T> {
     /// Wait for a connection from a pipette agent running in the guest.
     /// Useful if you've rebooted the vm or are otherwise expecting a fresh connection.
     async fn wait_for_agent(&mut self) -> anyhow::Result<PipetteClient> {
+        // As a workaround for #2470 (where the guest crashes when the pipette
+        // connection timeout expires due to a vmbus bug), wait for the shutdown
+        // IC to come online first so that we probably won't time out when
+        // connecting to the agent.
+        // TODO: remove this once the bug is fixed, since it shouldn't be
+        // necessary and a guest could in theory support pipette and not the IC
+        self.runtime.wait_for_enlightened_shutdown_ready().await?;
         self.runtime.wait_for_agent(false).await
     }