host: import retained types from their low-level owners (SL6.0b)

nvx-rs/src/host/artifacts/dir.rs

@@ -14,7 +14,7 @@ use super::{
     REPO_BUILD_DIR, REPO_OPENVMM_DIR, absolute, is_release_dir, openvmm_executable,
 };
 use crate::error::{Error, Result};
-use crate::host::store::{ArtifactIdentity, RuntimeIdentity};
+use crate::host::runtime::{ArtifactIdentity, RuntimeIdentity};
 
 /// The layout of a directory of NVX artifacts.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize)]

nvx-rs/src/host/artifacts/identity.rs

@@ -9,7 +9,7 @@ use serde_json::Value;
 
 use super::{MAX_METADATA_LEN, PROVENANCE_FORMAT};
 use crate::error::{Error, Result};
-use crate::host::store::ArtifactIdentity;
+use crate::host::runtime::ArtifactIdentity;
 
 /// Returns the identity of an artifact whose SHA-256 digest is `digest`, if it holds 64 lowercase
 /// hexadecimal digits, as `nvx.py` writes digests and requires them.

nvx-rs/src/host/artifacts/mod.rs

@@ -40,7 +40,7 @@ use serde_json::Value;
 use crate::contract;
 use crate::error::{Error, ErrorCode, Result};
 use crate::host::platform;
-use crate::host::store::RuntimeIdentity;
+use crate::host::runtime::RuntimeIdentity;
 
 pub use self::dir::{ArtifactDir, ArtifactPaths, GuestPaths, Layout};
 pub use self::guest::Guest;

nvx-rs/src/host/artifacts/tests.rs

@@ -5,7 +5,7 @@ use std::collections::HashMap;
 
 use super::*;
 use crate::ErrorKind;
-use crate::host::store::ArtifactIdentity;
+use crate::host::runtime::ArtifactIdentity;
 
 const COMPATIBLE_MANIFEST: &str = r#"{"openvmm":{"microvm_abi_version":1,
         "time_abi_version":1,"restore_packet_version":1,

nvx-rs/src/host/sandbox/prepared.rs

@@ -70,11 +70,11 @@ use crate::error::Error;
 use crate::error::Result;
 use crate::host::filesystem::ExportPlan;
 use crate::host::launch::{VmmLaunch, fit_process_command_line};
+use crate::host::platform::inherit::Inherited;
 use crate::host::process::Process;
 #[cfg(windows)]
 #[cfg(windows)]
 use crate::host::seal;
-use crate::host::supervisor::Inherited;
 #[cfg(target_os = "linux")]
 use crate::host::sys;
 

nvx-rs/src/host/snapshot/key.rs

@@ -21,9 +21,9 @@ use crate::error::{Error, Result};
 use crate::host::config::{DiskCapture, check_setting};
 use crate::host::platform::parse_hex32;
 use crate::host::process::BootId;
+use crate::host::runtime::{ArtifactIdentity, MAX_IDENTITY_LEN, RuntimeIdentity};
 use crate::host::sandbox::SandboxNetwork;
 use crate::host::sandbox::mount::MOUNT_TAG;
-use crate::host::store::{ArtifactIdentity, MAX_IDENTITY_LEN, RuntimeIdentity};
 use crate::hypervisor::Hypervisor;
 
 pub use crate::host::config::Invariants;

nvx-rs/src/host/snapshot/tests.rs

@@ -20,9 +20,8 @@ use crate::host::config::{
 };
 use crate::host::network::{Access, NetworkPolicy};
 use crate::host::process::BootId;
-use crate::host::runtime::{LaunchOptions, Runtime};
+use crate::host::runtime::{ArtifactIdentity, LaunchOptions, Runtime, RuntimeIdentity};
 use crate::host::sandbox::SandboxNetwork;
-use crate::host::store::{ArtifactIdentity, RuntimeIdentity};
 use crate::hypervisor::Hypervisor;
 use crate::net::Ipv4Cidr;
 use crate::protocol::root::RootImage;