Skip to content

Commit cc9a350

Browse files
marossetludfjig
authored andcommitted
Updating hyperlight-wasm crate features so mshv3 is the default (instead of mshv2)
Signed-off-by: Mark Rossett <marosset@microsoft.com>
1 parent 3aed4cc commit cc9a350

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

.github/workflows/Benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
# the component model benchmark depends on the wasm wit component
7272
just ensure-tools
7373
just compile-wit
74-
just bench-ci dev release ${{ matrix.hypervisor == 'mshv3' && 'mshv3' || ''}}
74+
just bench-ci dev release ${{ matrix.hypervisor == 'mshv' && 'mshv2' || ''}}
7575
working-directory: ./src/hyperlight_wasm
7676

7777
- name: Upload Benchmarks

.github/workflows/dep_rust.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,15 @@ jobs:
9292
run: just clippy ${{ matrix.config }}
9393

9494
- name: Build
95-
run: just build ${{ matrix.config }} ${{ matrix.hypervisor == 'mshv3' && 'mshv3' || ''}}
95+
run: just build ${{ matrix.config }} ${{ matrix.hypervisor == 'mshv' && 'mshv2' || ''}}
9696
working-directory: ./src/hyperlight_wasm
9797

9898
- name: Build Rust Wasm examples
9999
run: just build-rust-wasm-examples ${{ matrix.config }}
100100
working-directory: ./src/hyperlight_wasm
101101

102102
- name: Test
103-
run: just test ${{ matrix.config }} ${{ matrix.hypervisor == 'mshv3' && 'mshv3' || ''}}
103+
run: just test ${{ matrix.config }} ${{ matrix.hypervisor == 'mshv' && 'mshv2' || ''}}
104104
working-directory: ./src/hyperlight_wasm
105105

106106
- name: Install github-cli (Windows)
@@ -118,14 +118,14 @@ jobs:
118118
shell: pwsh
119119

120120
- name: Test Examples
121-
run: just examples-ci ${{ matrix.config }} ${{ matrix.hypervisor == 'mshv3' && 'mshv3' || ''}}
121+
run: just examples-ci ${{ matrix.config }} ${{ matrix.hypervisor == 'mshv' && 'mshv2' || ''}}
122122
working-directory: ./src/hyperlight_wasm
123123
env:
124124
# required for gh cli when downloading
125125
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
126126

127127
- name: Test Component Model Examples
128-
run: just examples-components ${{ matrix.config }} ${{ matrix.hypervisor == 'mshv3' && 'mshv3' || ''}}
128+
run: just examples-components ${{ matrix.config }} ${{ matrix.hypervisor == 'mshv' && 'mshv2' || ''}}
129129
working-directory: ./src/hyperlight_wasm
130130

131131
### Benchmarks ###
@@ -141,6 +141,6 @@ jobs:
141141

142142
- name: Run benchmarks
143143
run: |
144-
just bench-ci dev ${{ matrix.config }} ${{ matrix.hypervisor == 'mshv3' && 'mshv3' || ''}}
144+
just bench-ci dev ${{ matrix.config }} ${{ matrix.hypervisor == 'mshv' && 'mshv2' || ''}}
145145
working-directory: ./src/hyperlight_wasm
146146
if: ${{ matrix.config == 'release' }}

Justfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,16 +89,16 @@ test target=default-target features="": (test-seccomp target features)
8989
cargo test test_metrics {{ if features =="" {''} else if features=="no-default-features" {"--no-default-features" } else {"--no-default-features -F " + features } }} --profile={{ if target == "debug" {"dev"} else { target } }} -- --ignored
9090

9191
test-seccomp target=default-target features="":
92-
cargo test {{ if features =="" {'--no-default-features -F "kvm,mshv2,seccomp"'} else {"--no-default-features -F seccomp," + features } }} --profile={{ if target == "debug" {"dev"} else { target } }} -- --test-threads=1
93-
cargo test {{ if features =="" {'--no-default-features -F "kvm,mshv2,seccomp"'} else {"--no-default-features -F seccomp," + features } }} test_metrics --profile={{ if target == "debug" {"dev"} else { target } }} -- --ignored --test-threads=1
94-
cargo test {{ if features =="" {'--no-default-features -F "kvm,mshv2,seccomp"'} else {"--no-default-features -F seccomp," + features } }} test_gather_metrics --profile={{ if target == "debug" {"dev"} else { target } }} -- --ignored --test-threads=1
92+
cargo test {{ if features =="" {'--no-default-features -F "kvm,mshv3,seccomp"'} else {"--no-default-features -F seccomp," + features } }} --profile={{ if target == "debug" {"dev"} else { target } }} -- --test-threads=1
93+
cargo test {{ if features =="" {'--no-default-features -F "kvm,mshv3,seccomp"'} else {"--no-default-features -F seccomp," + features } }} test_metrics --profile={{ if target == "debug" {"dev"} else { target } }} -- --ignored --test-threads=1
94+
cargo test {{ if features =="" {'--no-default-features -F "kvm,mshv3,seccomp"'} else {"--no-default-features -F seccomp," + features } }} test_gather_metrics --profile={{ if target == "debug" {"dev"} else { target } }} -- --ignored --test-threads=1
9595

9696
examples-ci target=default-target features="": (build-rust-wasm-examples target)
9797
cargo run {{ if features =="" {''} else {"--no-default-features -F " + features } }} --profile={{ if target == "debug" {"dev"} else { target } }} --example helloworld
9898
cargo run {{ if features =="" {''} else {"--no-default-features -F " + features } }} --profile={{ if target == "debug" {"dev"} else { target } }} --example hostfuncs
9999
cargo run {{ if features =="" {''} else {"--no-default-features -F " + features } }} --profile={{ if target == "debug" {"dev"} else { target } }} --example rust_wasm_examples
100100
cargo run {{ if features =="" {''} else {"--no-default-features -F function_call_metrics," + features } }} --profile={{ if target == "debug" {"dev"} else { target } }} --example metrics
101-
cargo run {{ if features =="" {"--no-default-features --features kvm,mshv2"} else {"--no-default-features -F function_call_metrics," + features } }} --profile={{ if target == "debug" {"dev"} else { target } }} --example metrics
101+
cargo run {{ if features =="" {"--no-default-features --features kvm,mshv3"} else {"--no-default-features -F function_call_metrics," + features } }} --profile={{ if target == "debug" {"dev"} else { target } }} --example metrics
102102

103103
examples-components target=default-target features="": (build-rust-component-examples target)
104104
{{ wit-world }} cargo run {{ if features =="" {''} else {"--no-default-features -F " + features } }} --profile={{ if target == "debug" {"dev"} else { target } }} --example component_example

src/hyperlight_wasm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ goblin = "0.10.0"
7676
tar = "0.4.44"
7777

7878
[features]
79-
default = ["function_call_metrics", "kvm", "mshv2"]
79+
default = ["function_call_metrics", "kvm", "mshv3"]
8080
function_call_metrics = ["hyperlight-host/function_call_metrics"]
8181
seccomp = ["hyperlight-host/seccomp"]
8282
print_debug = ["hyperlight-host/print_debug"]

0 commit comments

Comments
 (0)