Skip to content

Commit 7403dbd

Browse files
committed
fixup! Rename MutiUseSandbox -> Sandbox
Signed-off-by: Jorge Prendes <jorge.prendes@gmail.com>
1 parent ba35bf6 commit 7403dbd

File tree

7 files changed

+10
-12
lines changed

7 files changed

+10
-12
lines changed

src/hyperlight_host/benches/benchmarks.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ limitations under the License.
1616

1717
use criterion::{Criterion, criterion_group, criterion_main};
1818
use hyperlight_host::GuestBinary;
19-
use hyperlight_host::sandbox::{
20-
Callable, Sandbox, SandboxConfiguration, UninitializedSandbox,
21-
};
19+
use hyperlight_host::sandbox::{Callable, Sandbox, SandboxConfiguration, UninitializedSandbox};
2220
use hyperlight_testing::simple_guest_as_string;
2321

2422
fn create_uninit_sandbox() -> UninitializedSandbox {

src/hyperlight_host/src/sandbox/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ pub mod config;
2020
pub(crate) mod host_funcs;
2121
/// Functionality for dealing with `Sandbox`es that contain Hypervisors
2222
pub(crate) mod hypervisor;
23-
/// Functionality for dealing with initialized sandboxes that can
24-
/// call 0 or more guest functions
25-
pub mod sandbox;
2623
/// Functionality for dealing with memory access from the VM guest
2724
/// executable
2825
pub(crate) mod mem_access;
2926
/// Functionality for interacting with a sandbox's internally-stored
3027
/// `SandboxMemoryManager`
3128
pub(crate) mod mem_mgr;
3229
pub(crate) mod outb;
30+
/// Functionality for dealing with initialized sandboxes that can
31+
/// call 0 or more guest functions
32+
pub mod sandbox;
3333
/// Functionality for creating uninitialized sandboxes, manipulating them,
3434
/// and converting them to initialized sandboxes.
3535
pub mod uninitialized;

src/hyperlight_host/src/sandbox/sandbox.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ mod tests {
327327
#[cfg(target_os = "linux")]
328328
use crate::mem::shared_mem::{ExclusiveSharedMemory, GuestSharedMemory, SharedMemory as _};
329329
use crate::sandbox::{Callable, SandboxConfiguration};
330-
use crate::{GuestBinary, HyperlightError, Sandbox, Result, UninitializedSandbox};
330+
use crate::{GuestBinary, HyperlightError, Result, Sandbox, UninitializedSandbox};
331331

332332
// Tests to ensure that many (1000) function calls can be made in a call context with a small stack (1K) and heap(14K).
333333
// This test effectively ensures that the stack is being properly reset after each call and we are not leaking memory in the Guest.

src/hyperlight_host/src/sandbox/uninitialized.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use crate::mem::memory_region::{DEFAULT_GUEST_BLOB_MEM_FLAGS, MemoryRegionFlags}
3434
use crate::mem::mgr::{STACK_COOKIE_LEN, SandboxMemoryManager};
3535
use crate::mem::shared_mem::ExclusiveSharedMemory;
3636
use crate::sandbox::SandboxConfiguration;
37-
use crate::{Sandbox, Result, new_error};
37+
use crate::{Result, Sandbox, new_error};
3838

3939
#[cfg(all(target_os = "linux", feature = "seccomp"))]
4040
const EXTRA_ALLOWED_SYSCALLS_FOR_WRITER_FUNC: &[super::ExtraAllowedSyscall] = &[
@@ -410,7 +410,7 @@ mod tests {
410410

411411
use crate::sandbox::SandboxConfiguration;
412412
use crate::sandbox::uninitialized::{GuestBinary, GuestEnvironment};
413-
use crate::{Sandbox, Result, UninitializedSandbox, new_error};
413+
use crate::{Result, Sandbox, UninitializedSandbox, new_error};
414414

415415
#[test]
416416
fn test_load_extra_blob() {

src/hyperlight_host/src/sandbox/uninitialized_evolve.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ use crate::sandbox::host_funcs::FunctionRegistry;
4343
use crate::sandbox::{HostSharedMemory, MemMgrWrapper};
4444
#[cfg(target_os = "linux")]
4545
use crate::signal_handlers::setup_signal_handlers;
46-
use crate::{Sandbox, Result, UninitializedSandbox, log_then_return, new_error};
46+
use crate::{Result, Sandbox, UninitializedSandbox, log_then_return, new_error};
4747

4848
/// The implementation for evolving `UninitializedSandbox`es to
4949
/// `Sandbox`es.

src/hyperlight_host/tests/common/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616
use hyperlight_host::func::HostFunction;
17-
use hyperlight_host::{GuestBinary, Sandbox, Result, UninitializedSandbox};
17+
use hyperlight_host::{GuestBinary, Result, Sandbox, UninitializedSandbox};
1818
use hyperlight_testing::{
1919
c_callback_guest_as_string, c_simple_guest_as_string, callback_guest_as_string,
2020
simple_guest_as_string,

src/hyperlight_host/tests/sandbox_host_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use std::sync::{Arc, Mutex};
2121
use common::new_uninit;
2222
use hyperlight_host::sandbox::{Callable, SandboxConfiguration};
2323
use hyperlight_host::{
24-
GuestBinary, HyperlightError, Sandbox, Result, UninitializedSandbox, new_error,
24+
GuestBinary, HyperlightError, Result, Sandbox, UninitializedSandbox, new_error,
2525
};
2626
use hyperlight_testing::simple_guest_as_string;
2727
#[cfg(target_os = "windows")]

0 commit comments

Comments
 (0)