diff --git a/Cargo.lock b/Cargo.lock index b0764598..5fa608e8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -409,9 +409,9 @@ dependencies = [ [[package]] name = "hermit-entry" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "227d6ab4b17cd3577f27dd731503121dddde495cc077cf66263a4c273115a766" +checksum = "b04dc95225c81ad081b68abe2590496848ee378a17ebc5d4419492e36cdf0f31" dependencies = [ "goblin", "log", diff --git a/Cargo.toml b/Cargo.toml index 7ade4467..8ae0589b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,7 +45,7 @@ either = "1.6" env_logger = "0.9" gdbstub = "0.6" gdbstub_arch = "0.2" -hermit-entry = { version = "0.7", features = ["loader"] } +hermit-entry = { version = "0.8", features = ["loader"] } lazy_static = "1.4" libc = "0.2" log = "0.4" diff --git a/src/linux/uhyve.rs b/src/linux/uhyve.rs index 488b988b..884265e3 100755 --- a/src/linux/uhyve.rs +++ b/src/linux/uhyve.rs @@ -10,7 +10,7 @@ use crate::shared_queue::*; use crate::vm::HypervisorResult; use crate::vm::Vm; use crate::x86_64::create_gdt_entry; -use hermit_entry::RawBootInfo; +use hermit_entry::boot_info::RawBootInfo; use kvm_bindings::*; use kvm_ioctls::VmFd; use log::debug; diff --git a/src/macos/aarch64/uhyve.rs b/src/macos/aarch64/uhyve.rs index e1c04345..f78e459f 100644 --- a/src/macos/aarch64/uhyve.rs +++ b/src/macos/aarch64/uhyve.rs @@ -5,7 +5,7 @@ use crate::macos::aarch64::HYPERVISOR_PAGE_SIZE; use crate::params::Params; use crate::vm::HypervisorResult; use crate::vm::Vm; -use hermit_entry::RawBootInfo; +use hermit_entry::boot_info::RawBootInfo; use libc; use libc::c_void; use log::debug; diff --git a/src/macos/x86_64/uhyve.rs b/src/macos/x86_64/uhyve.rs index f58484e0..a72a9e3e 100644 --- a/src/macos/x86_64/uhyve.rs +++ b/src/macos/x86_64/uhyve.rs @@ -5,7 +5,7 @@ use crate::params::Params; use crate::vm::HypervisorResult; use crate::vm::Vm; use crate::x86_64::create_gdt_entry; -use hermit_entry::RawBootInfo; +use hermit_entry::boot_info::RawBootInfo; use libc; use libc::c_void; use log::debug; diff --git a/src/vm.rs b/src/vm.rs index 2631eec1..394c5c30 100644 --- a/src/vm.rs +++ b/src/vm.rs @@ -1,6 +1,6 @@ use hermit_entry::{ - BootInfo, HardwareInfo, KernelObject, LoadedKernel, ParseKernelError, PlatformInfo, - RawBootInfo, SerialPortBase, + boot_info::{BootInfo, HardwareInfo, PlatformInfo, RawBootInfo, SerialPortBase}, + elf::{KernelObject, LoadedKernel, ParseKernelError}, }; use log::{error, warn}; use std::ffi::OsString;