Skip to content

Commit 2700f47

Browse files
Bump kvm-bindings from 0.13.0 to 0.14.0 (#801)
* Bump kvm-bindings from 0.13.0 to 0.14.0 Bumps [kvm-bindings](https://github.com/rust-vmm/kvm) from 0.13.0 to 0.14.0. - [Release notes](https://github.com/rust-vmm/kvm/releases) - [Commits](rust-vmm/kvm@kvm-bindings-v0.13.0...kvm-bindings-v0.14.0) --- updated-dependencies: - dependency-name: kvm-bindings dependency-version: 0.14.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Upgrade KVM bindings and map error type directly Signed-off-by: James Sturtevant <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: James Sturtevant <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: James Sturtevant <[email protected]>
1 parent 45c43b0 commit 2700f47

File tree

4 files changed

+18
-26
lines changed

4 files changed

+18
-26
lines changed

Cargo.lock

Lines changed: 11 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/hyperlight_host/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ lazy_static = "1.4.0"
7474

7575
[target.'cfg(unix)'.dependencies]
7676
seccompiler = { version = "0.5.0", optional = true }
77-
kvm-bindings = { version = "0.13", features = ["fam-wrappers"], optional = true }
78-
kvm-ioctls = { version = "0.23", optional = true }
77+
kvm-bindings = { version = "0.14", features = ["fam-wrappers"], optional = true }
78+
kvm-ioctls = { version = "0.24", optional = true }
7979
mshv-bindings2 = { package="mshv-bindings", version = "=0.2.1", optional = true }
8080
mshv-ioctls2 = { package="mshv-ioctls", version = "=0.2.1", optional = true}
8181
mshv-bindings3 = { package="mshv-bindings", version = "=0.3.2", optional = true }

src/hyperlight_host/src/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ pub enum HyperlightError {
268268
/// vmm sys Error Occurred
269269
#[error("vmm sys Error {0:?}")]
270270
#[cfg(target_os = "linux")]
271-
VmmSysError(#[from] vmm_sys_util::errno::Error),
271+
VmmSysError(vmm_sys_util::errno::Error),
272272

273273
/// Windows Error
274274
#[cfg(target_os = "windows")]

src/hyperlight_host/src/signal_handlers/mod.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ pub(crate) fn setup_signal_handlers(config: &SandboxConfiguration) -> crate::Res
3232
vmm_sys_util::signal::register_signal_handler(
3333
libc::SIGSYS,
3434
sigsys_signal_handler::handle_sigsys,
35-
)?;
35+
)
36+
.map_err(crate::HyperlightError::VmmSysError)?;
3637

3738
let original_hook = std::panic::take_hook();
3839
// Set a custom panic hook that checks for "DisallowedSyscall"
@@ -52,7 +53,8 @@ pub(crate) fn setup_signal_handlers(config: &SandboxConfiguration) -> crate::Res
5253
vmm_sys_util::signal::register_signal_handler(
5354
libc::SIGRTMIN() + config.get_interrupt_vcpu_sigrtmin_offset() as c_int,
5455
vm_kill_signal,
55-
)?;
56+
)
57+
.map_err(crate::HyperlightError::VmmSysError)?;
5658

5759
// Note: For libraries registering signal handlers, it's important to keep in mind that
5860
// the user of the library could have their own signal handlers that we don't want to

0 commit comments

Comments
 (0)