Skip to content

Take guestbinary by ref instead of value #560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Take guestbinary by ref instead of value #560

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/hyperlight_host/src/sandbox/uninitialized.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,10 @@ impl UninitializedSandbox {
skip(guest_binary),
parent = Span::current()
)]
pub fn new(guest_binary: GuestBinary, cfg: Option<SandboxConfiguration>) -> Result<Self> {
pub fn new<'a>(
guest_binary: impl std::borrow::Borrow<GuestBinary<'a>>,
cfg: Option<SandboxConfiguration>,
) -> Result<Self> {
#[cfg(feature = "build-metadata")]
log_build_details();

Expand All @@ -141,12 +144,12 @@ impl UninitializedSandbox {
check_windows_version()?;

// If the guest binary is a file make sure it exists
let guest_binary = match guest_binary {
let guest_binary: &GuestBinary = match guest_binary.borrow() {
GuestBinary::FilePath(binary_path) => {
let path = Path::new(&binary_path)
.canonicalize()
.map_err(|e| new_error!("GuestBinary not found: '{}': {}", binary_path, e))?;
GuestBinary::FilePath(
&GuestBinary::FilePath(
path.into_os_string()
.into_string()
.map_err(|e| new_error!("Error converting OsString to String: {:?}", e))?,
Expand All @@ -158,7 +161,7 @@ impl UninitializedSandbox {
let sandbox_cfg = cfg.unwrap_or_default();

let mut mem_mgr_wrapper = {
let mut mgr = UninitializedSandbox::load_guest_binary(sandbox_cfg, &guest_binary)?;
let mut mgr = UninitializedSandbox::load_guest_binary(sandbox_cfg, guest_binary)?;
let stack_guard = Self::create_stack_guard();
mgr.set_stack_guard(&stack_guard)?;
MemMgrWrapper::new(mgr, stack_guard)
Expand Down
Loading