From e6cd45b830055cac61c767058b81347c3da14b95 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Apr 2025 08:37:56 +0000
Subject: [PATCH 1/2] Bump vmm-sys-util from 0.12.1 to 0.13.0

Bumps [vmm-sys-util](https://github.com/rust-vmm/vmm-sys-util) from 0.12.1 to 0.13.0.
- [Release notes](https://github.com/rust-vmm/vmm-sys-util/releases)
- [Changelog](https://github.com/rust-vmm/vmm-sys-util/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rust-vmm/vmm-sys-util/compare/v0.12.1...v0.13.0)

---
updated-dependencies:
- dependency-name: vmm-sys-util
  dependency-version: 0.13.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Cargo.lock                     | 24 +++++++++++++++++-------
 src/hyperlight_host/Cargo.toml |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ba3889230..6b7c115b4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1180,7 +1180,7 @@ dependencies = [
  "tracing-serde",
  "tracing-subscriber",
  "uuid",
- "vmm-sys-util",
+ "vmm-sys-util 0.13.0",
  "windows",
  "windows-result",
  "windows-sys 0.59.0",
@@ -1499,7 +1499,7 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b13baf7bdfda2e10bcb109fcb099ef40cff82374eb6b7cdcf4695bdec4e522c"
 dependencies = [
- "vmm-sys-util",
+ "vmm-sys-util 0.12.1",
 ]
 
 [[package]]
@@ -1511,7 +1511,7 @@ dependencies = [
  "bitflags 2.9.0",
  "kvm-bindings",
  "libc",
- "vmm-sys-util",
+ "vmm-sys-util 0.12.1",
 ]
 
 [[package]]
@@ -1695,7 +1695,7 @@ checksum = "f416b4432174e5a3f956a7887f4c1a4acea9511d81def67fcb8473293630ab9e"
 dependencies = [
  "libc",
  "num_enum",
- "vmm-sys-util",
+ "vmm-sys-util 0.13.0",
  "zerocopy 0.7.35",
 ]
 
@@ -1707,7 +1707,7 @@ checksum = "1e0cb5031f3243a7459b7c13d960d25420980874eebda816db24ce6077e21d43"
 dependencies = [
  "libc",
  "num_enum",
- "vmm-sys-util",
+ "vmm-sys-util 0.13.0",
  "zerocopy 0.8.23",
 ]
 
@@ -1720,7 +1720,7 @@ dependencies = [
  "libc",
  "mshv-bindings 0.2.1",
  "thiserror 1.0.69",
- "vmm-sys-util",
+ "vmm-sys-util 0.13.0",
 ]
 
 [[package]]
@@ -1732,7 +1732,7 @@ dependencies = [
  "libc",
  "mshv-bindings 0.3.2",
  "thiserror 2.0.12",
- "vmm-sys-util",
+ "vmm-sys-util 0.13.0",
 ]
 
 [[package]]
@@ -3223,6 +3223,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "vmm-sys-util"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "945fecc32d9b44069437b7aacd2257556a91a2054ae10e9e7538fe498e442db9"
+dependencies = [
+ "bitflags 1.3.2",
+ "libc",
+]
+
 [[package]]
 name = "wait-timeout"
 version = "0.2.1"
diff --git a/src/hyperlight_host/Cargo.toml b/src/hyperlight_host/Cargo.toml
index 04bcda76b..cab5d108e 100644
--- a/src/hyperlight_host/Cargo.toml
+++ b/src/hyperlight_host/Cargo.toml
@@ -39,7 +39,7 @@ tracing = { version = "0.1.41", features = ["log"] }
 tracing-log = "0.2.0"
 tracing-core = "0.1.33"
 hyperlight-common = { workspace = true, default-features = true }
-vmm-sys-util = "0.12.1"
+vmm-sys-util = "0.13.0"
 crossbeam = "0.8.0"
 crossbeam-channel = "0.5.14"
 thiserror = "2.0.12"

From d7f481bc81e82b59298f78386ef8180aeb86eae7 Mon Sep 17 00:00:00 2001
From: Simon Davies <simongdavies@users.noreply.github.com>
Date: Tue, 8 Apr 2025 12:41:58 +0100
Subject: [PATCH 2/2] implement from kvm_ioctls::Error for HyperlightError

Signed-off-by: Simon Davies <simongdavies@users.noreply.github.com>
---
 src/hyperlight_host/src/error.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hyperlight_host/src/error.rs b/src/hyperlight_host/src/error.rs
index 76fdb8d05..f2cde8626 100644
--- a/src/hyperlight_host/src/error.rs
+++ b/src/hyperlight_host/src/error.rs
@@ -178,7 +178,7 @@ pub enum HyperlightError {
     /// Error occurred in KVM Operation
     #[error("KVM Error {0:?}")]
     #[cfg(kvm)]
-    KVMError(#[source] kvm_ioctls::Error),
+    KVMError(#[from] kvm_ioctls::Error),
 
     /// An attempt to get a lock from a Mutex failed.
     #[error("Unable to lock resource")]