Merge #380

380: Upgrade to hermit-entry 0.8.0 r=mkroening a=mkroening



Co-authored-by: Martin Kröning <[email protected]>

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"

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;

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;

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;

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;