[guest,guest-bin,third-party] move third_party code to guest_bin lib

guest lib should only contain basic functions to interact with the host. Whatever we decide to bring in as
third_party deps belong in the guest_bin crate.

Signed-off-by: danbugs <[email protected]>

Author: danbugs

Cargo.lock

@@ -175,8 +175,7 @@ run-rust-examples-linux target=default-target features="": (run-rust-examples ta
 #########################
 
 tar-headers: (build-rust-capi) # build-rust-capi is a dependency because we need the hyperlight_guest.h to be built
-    # TODO(danbugs): update this when I'm done w/ the move
-    tar -zcvf include.tar.gz -C {{root}}/src/hyperlight_guest/third_party/ musl/include musl/arch/x86_64 printf/printf.h -C {{root}}/src/hyperlight_guest_capi include
+    tar -zcvf include.tar.gz -C {{root}}/src/hyperlight_guest_bin/third_party/ musl/include musl/arch/x86_64 printf/printf.h -C {{root}}/src/hyperlight_guest_capi include
 
 tar-static-lib: (build-rust-capi "release") (build-rust-capi "debug")
     tar -zcvf hyperlight-guest-c-api-linux.tar.gz -C {{root}}/target/x86_64-unknown-none/ release/libhyperlight_guest_capi.a -C {{root}}/target/x86_64-unknown-none/ debug/libhyperlight_guest_capi.a

Justfile

@@ -3,8 +3,7 @@ mkdir := if os() == "windows" { "mkdir -f -p" } else { "mkdir -p"}
 # Elf options
 # We don't support stack protectors at the moment, but Arch Linux clang auto-enables them for -linux platforms, so explicitly disable them.
 c-compile-options-elf := '-nobuiltininc -H --target=x86_64-unknown-linux-none -fno-stack-protector -fstack-clash-protection -mstack-probe-size=4096 -fPIC'
-# TODO(danbugs): update this when I'm done w/ the move
-c-include-flags-elf := "-I " + root / "src/hyperlight_guest_capi/include/"  + " -I " + root / "src/hyperlight_guest/third_party/musl/include/" + " -I " + root / "src/hyperlight_guest/third_party/musl/arch/x86_64" + " -I " + root / "src/hyperlight_guest/third_party/printf"
+c-include-flags-elf := "-I " + root / "src/hyperlight_guest_capi/include/"  + " -I " + root / "src/hyperlight_guest_bin/third_party/musl/include/" + " -I " + root / "src/hyperlight_guest_bin/third_party/musl/arch/x86_64" + " -I " + root / "src/hyperlight_guest_bin/third_party/printf"
 c-linker-options-elf := '--entry "entrypoint" --nostdlib -pie'
 c-flags-debug-elf := '-O0'
 c-flags-release-elf := '-O3'

c.just

@@ -1,6 +1,5 @@
 [package]
 name = "hyperlight-guest"
-links = "c"
 version.workspace = true
 edition.workspace = true
 rust-version.workspace = true
@@ -12,17 +11,7 @@ description = """
 Library to build guest applications for hyperlight.
 """
 
-[features]
-default = ["libc", "printf"]
-libc = [] # compile musl libc
-printf = [] # compile printf
-
 [dependencies]
 anyhow = { version = "1.0.98", default-features = false }
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 hyperlight-common = { workspace = true }
-
-[build-dependencies]
-cc = "1.2"
-cfg-if = "1.0"
-glob = "0.3.2"

src/hyperlight_guest/Cargo.toml

@@ -1,5 +1,6 @@
 [package]
 name = "hyperlight-guest-bin"
+links = "c"
 version.workspace = true
 edition.workspace = true
 rust-version.workspace = true
@@ -8,6 +9,11 @@ homepage.workspace = true
 repository.workspace = true
 readme.workspace = true
 
+[features]
+default = ["libc", "printf"]
+libc = [] # compile musl libc
+printf = [] # compile printf
+
 [dependencies]
 hyperlight-guest = { workspace = true, default-features = false }
 hyperlight-common = { workspace = true, default-features = false }
@@ -17,3 +23,8 @@ spin = "0.10.0"
 
 [lints]
 workspace = true
+
+[build-dependencies]
+cc = "1.2"
+cfg-if = "1.0"
+glob = "0.3.2"

src/hyperlight_guest_bin/Cargo.toml

@@ -109,8 +109,7 @@ fn cargo_main() {
             unsafe { env::set_var("AR_x86_64_pc_windows_msvc", "llvm-lib") };
         }
 
-        // TODO(danbugs): update this when I'm done w/ the move.
-        cfg.compile("hyperlight_guest");
+        cfg.compile("hyperlight_guest_bin");
     }
 
     let out_dir = env::var("OUT_DIR").expect("cargo OUT_DIR not set");

src/hyperlight_guest/build.rs renamed to src/hyperlight_guest_bin/build.rs

@@ -21,7 +21,6 @@ use hyperlight_guest::exit::halt;
 
 use crate::GUEST_HANDLE;
 
-// TODO(danbugs): move this to `hyperlight_guest_bin`
 /// Exposes a C API to allow the guest to set an error
 ///
 /// # Safety