Skip to content

Commit 7e01b04

Browse files
committed
Making mshv3 the default mshv hypervisor in hyperlight_host (instead of mshv2)
Signed-off-by: Mark Rossett <[email protected]>
1 parent ea6fa8f commit 7e01b04

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.github/workflows/Benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5858

5959
- name: Run Benchmarks
60-
run: just bench-ci main release ${{ matrix.hypervisor == 'mshv3' && 'mshv3' || ''}}
60+
run: just bench-ci main release ${{ matrix.hypervisor == 'mshv' && 'mshv2' || ''}}
6161

6262
- uses: actions/upload-artifact@v4
6363
with:

.github/workflows/dep_rust.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
CARGO_TERM_COLOR: always
102102
run: |
103103
# with default features
104-
just test ${{ matrix.config }} ${{ matrix.hypervisor == 'mshv3' && 'mshv3' || ''}}
104+
just test ${{ matrix.config }} ${{ matrix.hypervisor == 'mshv' && 'mshv2' || ''}}
105105
106106
# with only one driver enabled (driver mshv/kvm feature is ignored on windows) + seccomp
107107
just test ${{ matrix.config }} seccomp,${{ matrix.hypervisor == 'mshv' && 'mshv2' || matrix.hypervisor == 'mshv3' && 'mshv3' || 'kvm' }}
@@ -127,20 +127,20 @@ jobs:
127127
env:
128128
CARGO_TERM_COLOR: always
129129
RUST_LOG: debug
130-
run: just run-rust-examples-linux ${{ matrix.config }} ${{ matrix.hypervisor == 'mshv3' && 'mshv3' || ''}}
130+
run: just run-rust-examples-linux ${{ matrix.config }} ${{ matrix.hypervisor == 'mshv' && 'mshv2' || ''}}
131131

132132
- name: Run Rust Gdb tests - linux
133133
if: runner.os == 'Linux'
134134
env:
135135
CARGO_TERM_COLOR: always
136136
RUST_LOG: debug
137-
run: just test-rust-gdb-debugging ${{ matrix.config }} ${{ matrix.hypervisor == 'mshv3' && 'mshv3' || ''}}
137+
run: just test-rust-gdb-debugging ${{ matrix.config }} ${{ matrix.hypervisor == 'mshv' && 'mshv2' || ''}}
138138

139139
- name: Run Rust Crashdump tests
140140
env:
141141
CARGO_TERM_COLOR: always
142142
RUST_LOG: debug
143-
run: just test-rust-crashdump ${{ matrix.config }} ${{ matrix.hypervisor == 'mshv3' && 'mshv3' || ''}}
143+
run: just test-rust-crashdump ${{ matrix.config }} ${{ matrix.hypervisor == 'mshv' && 'mshv2' || ''}}
144144

145145
- name: Download benchmarks from "latest"
146146
run: just bench-download ${{ runner.os }} ${{ matrix.hypervisor }} ${{ matrix.cpu}} dev-latest # compare to prerelease
@@ -151,5 +151,5 @@ jobs:
151151

152152
- name: Run benchmarks
153153
run: |
154-
just bench-ci main ${{ matrix.config }} ${{ matrix.hypervisor == 'mshv3' && 'mshv3' || ''}}
154+
just bench-ci main ${{ matrix.config }} ${{ matrix.hypervisor == 'mshv' && 'mshv2' || ''}}
155155
if: ${{ matrix.config == 'release' }}

src/hyperlight_host/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ cfg_aliases = "0.2.1"
118118
built = { version = "0.8.0", optional = true, features = ["chrono", "git2"] }
119119

120120
[features]
121-
default = ["kvm", "mshv2", "seccomp", "build-metadata", "init-paging"]
121+
default = ["kvm", "mshv3", "seccomp", "build-metadata", "init-paging"]
122122
seccomp = ["dep:seccompiler"]
123123
function_call_metrics = []
124124
executable_heap = []
@@ -127,6 +127,7 @@ print_debug = []
127127
# Dumps the VM state to a file on unexpected errors or crashes. The path of the file will be printed on stdout and logged.
128128
crashdump = ["dep:chrono"]
129129
kvm = ["dep:kvm-bindings", "dep:kvm-ioctls"]
130+
# This feature is deprecated in favor of mshv3
130131
mshv2 = ["dep:mshv-bindings2", "dep:mshv-ioctls2"]
131132
mshv3 = ["dep:mshv-bindings3", "dep:mshv-ioctls3"]
132133
# This enables easy debug in the guest

0 commit comments

Comments
 (0)