Merge branch 'main' into adamperlin/panic-remove-allocations

Author: jsturtevant

.devcontainer/Dockerfile

@@ -24,16 +24,12 @@ RUN apt-get update \
         sudo \
         wget
 
-ARG LLVM_VERSION=17
+ARG LLVM_VERSION=18
 
 # Install llvm
 RUN wget https://apt.llvm.org/llvm.sh \
     && chmod +x ./llvm.sh         \
-    && sudo ./llvm.sh ${LLVM_VERSION} all      \
-    && sudo ln -s /usr/lib/llvm-${LLVM_VERSION}/bin/clang-cl /usr/bin/clang-cl \
-    && sudo ln -s /usr/lib/llvm-${LLVM_VERSION}/bin/llvm-lib /usr/bin/llvm-lib \
-    && sudo ln -s /usr/lib/llvm-${LLVM_VERSION}/bin/lld-link /usr/bin/lld-link \
-    && sudo ln -s /usr/lib/llvm-${LLVM_VERSION}/bin/llvm-ml /usr/bin/llvm-ml   \
+    && sudo ./llvm.sh ${LLVM_VERSION} clang clang-tools-extra      \
     && sudo ln -s /usr/lib/llvm-${LLVM_VERSION}/bin/ld.lld /usr/bin/ld.lld     \
     && sudo ln -s /usr/lib/llvm-${LLVM_VERSION}/bin/clang /usr/bin/clang
 

.github/dependabot.yml

@@ -21,16 +21,6 @@ updates:
       - dependency-name: "mshv-bindings"
         versions: [ ">=0.2.1" ]
     open-pull-requests-limit: 20
-  # Excluded workspace members - guests with custom linker flags
-  - package-ecosystem: "cargo"
-    directory: "/src/tests/rust_guests/callbackguest"
-    schedule:
-      interval: "daily"
-      time: "03:00"
-    labels:
-      - "kind/dependencies"
-      - "area/guest"
-    open-pull-requests-limit: 5
   - package-ecosystem: "cargo"
     directory: "/src/tests/rust_guests/dummyguest"
     schedule:

.github/workflows/Benchmarks.yml

@@ -14,15 +14,18 @@ jobs:
   # its execution. this dependency should be expressed in the dependent
   # workflow
   benchmark:
+    timeout-minutes: 60
     strategy:
       fail-fast: true
       matrix:
-        hypervisor: [hyperv, mshv, mshv3, kvm] # hyperv is windows, mshv and kvm are linux
+        hypervisor: [hyperv, 'hyperv-ws2025', mshv, mshv3, kvm] # hyperv,hyperv-ws2025 are windows, mshv, mshv3 and kvm are linux
         cpu: [amd, intel]
-        config: [release] # don't want to benchmark debug-builds
-
-    runs-on: ${{ fromJson(format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}"]', matrix.hypervisor == 'hyperv' && 'Windows' || 'Linux', matrix.hypervisor == 'hyperv' && 'win2022' || matrix.hypervisor == 'mshv3' && 'azlinux3-mshv' || matrix.hypervisor, matrix.cpu)) }} 
-    
+        config: [release]
+    runs-on: ${{ fromJson(
+      format('["self-hosted", "{0}", "X64", "1ES.Pool=hld-{1}-{2}"]', 
+      (matrix.hypervisor == 'hyperv' || matrix.hypervisor == 'hyperv-ws2025') && 'Windows' || 'Linux', 
+      matrix.hypervisor == 'hyperv' && 'win2022' || matrix.hypervisor == 'hyperv-ws2025' && 'win2025' || matrix.hypervisor == 'mshv3' && 'azlinux3-mshv' || matrix.hypervisor, 
+      matrix.cpu)) }} 
     steps:
       ### Setup ###
 
@@ -48,10 +51,8 @@ jobs:
 
       - name: Copy Guest Binaries
         run: |
-          cp ./downloaded-rust-guest-binaries-release/callbackguest ./src/tests/rust_guests/bin/release/callbackguest
           cp ./downloaded-rust-guest-binaries-release/simpleguest ./src/tests/rust_guests/bin/release/simpleguest
           cp ./downloaded-rust-guest-binaries-release/dummyguest ./src/tests/rust_guests/bin/release/dummyguest
-          cp ./downloaded-c-guest-binaries-release/callbackguest ./src/tests/c_guests/bin/release/callbackguest
           cp ./downloaded-c-guest-binaries-release/simpleguest ./src/tests/c_guests/bin/release/simpleguest
 
       ### Benchmarks ###

.github/workflows/ValidatePullRequest.yml

@@ -65,7 +65,7 @@ jobs:
     steps:
     - uses: actions/checkout@v5
     - name: Spell Check Repo
-      uses: crate-ci/typos@v1.35.6
+      uses: crate-ci/typos@v1.36.2
 
   license-headers:
     name: check license headers

.github/workflows/dep_build_guest_binaries.yml

@@ -45,7 +45,6 @@ jobs:
         with:
           name: rust-guest-binaries-${{ matrix.config }}
           path: |
-            src\tests\rust_guests\bin\${{ matrix.config }}\callbackguest
             src\tests\rust_guests\bin\${{ matrix.config }}\dummyguest
             src\tests\rust_guests\bin\${{ matrix.config }}\simpleguest
           if-no-files-found: error
@@ -55,6 +54,5 @@ jobs:
         with:
           name: c-guest-binaries-${{ matrix.config }}
           path: |
-            src\tests\c_guests\bin\${{ matrix.config }}\callbackguest
             src\tests\c_guests\bin\${{ matrix.config }}\simpleguest
           if-no-files-found: error

.vscode/settings.json

@@ -3,6 +3,5 @@
         "Cargo.toml", 
         // guest crates for testing, not part of the workspace
         "src/tests/rust_guests/simpleguest/Cargo.toml",
-        "src/tests/rust_guests/callbackguest/Cargo.toml"
     ]
 }