Upgrade KVM bindings and map error type directly

Signed-off-by: James Sturtevant <[email protected]>

Author: jsturtevant

Cargo.lock

@@ -75,7 +75,7 @@ lazy_static = "1.4.0"
 [target.'cfg(unix)'.dependencies]
 seccompiler = { version = "0.5.0", optional = true }
 kvm-bindings = { version = "0.14", features = ["fam-wrappers"], optional = true }
-kvm-ioctls = { version = "0.23", optional = true }
+kvm-ioctls = { version = "0.24", optional = true }
 mshv-bindings2 = { package="mshv-bindings", version = "=0.2.1", optional = true }
 mshv-ioctls2 = { package="mshv-ioctls",  version = "=0.2.1", optional = true}
 mshv-bindings3 = { package="mshv-bindings", version = "=0.3.2", optional = true }

src/hyperlight_host/Cargo.toml

@@ -268,7 +268,7 @@ pub enum HyperlightError {
     /// vmm sys Error Occurred
     #[error("vmm sys Error {0:?}")]
     #[cfg(target_os = "linux")]
-    VmmSysError(#[from] vmm_sys_util::errno::Error),
+    VmmSysError(vmm_sys_util::errno::Error),
 
     /// Windows Error
     #[cfg(target_os = "windows")]

src/hyperlight_host/src/error.rs

@@ -32,7 +32,8 @@ pub(crate) fn setup_signal_handlers(config: &SandboxConfiguration) -> crate::Res
         vmm_sys_util::signal::register_signal_handler(
             libc::SIGSYS,
             sigsys_signal_handler::handle_sigsys,
-        )?;
+        )
+        .map_err(crate::HyperlightError::VmmSysError)?;
 
         let original_hook = std::panic::take_hook();
         // Set a custom panic hook that checks for "DisallowedSyscall"
@@ -52,7 +53,8 @@ pub(crate) fn setup_signal_handlers(config: &SandboxConfiguration) -> crate::Res
     vmm_sys_util::signal::register_signal_handler(
         libc::SIGRTMIN() + config.get_interrupt_vcpu_sigrtmin_offset() as c_int,
         vm_kill_signal,
-    )?;
+    )
+    .map_err(crate::HyperlightError::VmmSysError)?;
 
     // Note: For libraries registering signal handlers, it's important to keep in mind that
     // the user of the library could have their own signal handlers that we don't want to