From 2a83d42d55e23cb31f362fd6ceeac4fb9a8a5d85 Mon Sep 17 00:00:00 2001 From: Simon Davies Date: Tue, 27 May 2025 16:31:06 +0100 Subject: [PATCH 1/2] Add JsonConversionFailure back as it used by hyperlight-js Signed-off-by: Simon Davies --- src/hyperlight_host/Cargo.toml | 1 + src/hyperlight_host/src/error.rs | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/hyperlight_host/Cargo.toml b/src/hyperlight_host/Cargo.toml index e0b075a82..02d8b75f3 100644 --- a/src/hyperlight_host/Cargo.toml +++ b/src/hyperlight_host/Cargo.toml @@ -41,6 +41,7 @@ thiserror = "2.0.12" tempfile = { version = "3.20", optional = true } anyhow = "1.0" metrics = "0.24.2" +serde_json = "1.0" [target.'cfg(windows)'.dependencies] windows = { version = "0.61", features = [ diff --git a/src/hyperlight_host/src/error.rs b/src/hyperlight_host/src/error.rs index 64697bb4b..b666d146f 100644 --- a/src/hyperlight_host/src/error.rs +++ b/src/hyperlight_host/src/error.rs @@ -155,6 +155,10 @@ pub enum HyperlightError { #[cfg(kvm)] KVMError(#[from] kvm_ioctls::Error), + /// Conversion of str to Json failed + #[error("Conversion of str data to json failed")] + JsonConversionFailure(#[from] serde_json::Error), + /// An attempt to get a lock from a Mutex failed. #[error("Unable to lock resource")] LockAttemptFailed(String), From c22c7d3564c6f86c9c91b9571df3c5568798ecc9 Mon Sep 17 00:00:00 2001 From: Simon Davies Date: Tue, 27 May 2025 16:31:59 +0100 Subject: [PATCH 2/2] Add missing musl arch specific setjmp.h file Signed-off-by: Simon Davies --- src/hyperlight_guest/third_party/musl/arch/x86_64/bits/setjmp.h | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/hyperlight_guest/third_party/musl/arch/x86_64/bits/setjmp.h diff --git a/src/hyperlight_guest/third_party/musl/arch/x86_64/bits/setjmp.h b/src/hyperlight_guest/third_party/musl/arch/x86_64/bits/setjmp.h new file mode 100644 index 000000000..63973a800 --- /dev/null +++ b/src/hyperlight_guest/third_party/musl/arch/x86_64/bits/setjmp.h @@ -0,0 +1 @@ +typedef unsigned long __jmp_buf[8];