aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Cargo.lock8+4 −4
-rw-r--r--Cargo.toml2+1 −1
-rw-r--r--crates/hule-hmi/Cargo.toml (renamed from crates/hule-image/Cargo.toml)2+1 −1
-rw-r--r--crates/hule-hmi/src/lib.rs (renamed from crates/hule-image/src/lib.rs)0+0 −0
-rw-r--r--crates/hule-oci/Cargo.toml2+1 −1
-rw-r--r--crates/hule-oci/src/lib.rs2+1 −1
-rw-r--r--crates/hule-vmm/Cargo.toml2+1 −1
-rw-r--r--crates/hule-vmm/src/backend/qemu/cli.rs2+1 −1
-rw-r--r--crates/hule-vmm/src/backend/qemu/mod.rs2+1 −1
-rw-r--r--crates/hule-vmm/src/hypervisor.rs2+1 −1
-rw-r--r--crates/hule-vmm/src/lib.rs2+1 −1
-rw-r--r--crates/hule-vmm/src/machine.rs2+1 −1
-rw-r--r--crates/hule-vmm/src/monitor.rs2+1 −1
-rw-r--r--crates/hule/Cargo.toml2+1 −1
-rw-r--r--crates/hule/src/main.rs4+2 −2
15 files changed, 18 insertions, 18 deletions
diff --git a/Cargo.lock b/Cargo.lock
index d33a8ad..38d3abe 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -570,7 +570,7 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
name = "hule"
version = "0.1.0"
dependencies = [
- "hule-image",
+ "hule-hmi",
"hule-oci",
"hule-vmm",
"tokio",
@@ -578,7 +578,7 @@ dependencies = [
]
[[package]]
-name = "hule-image"
+name = "hule-hmi"
version = "0.1.0"
dependencies = [
"serde",
@@ -589,7 +589,7 @@ dependencies = [
name = "hule-oci"
version = "0.1.0"
dependencies = [
- "hule-image",
+ "hule-hmi",
"oci-client",
"serde_json",
"sha2 0.10.9",
@@ -602,7 +602,7 @@ version = "0.1.0"
dependencies = [
"async-trait",
"base64",
- "hule-image",
+ "hule-hmi",
"serde",
"serde_json",
"tokio",
diff --git a/Cargo.toml b/Cargo.toml
index c21c088..7710d06 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,9 +15,9 @@ repository = "https://github.com/dimidiumlabs/hule"
[workspace.dependencies]
# local dependencies
+hule-hmi = { path = "crates/hule-hmi" }
hule-oci = { path = "crates/hule-oci" }
hule-vmm = { path = "crates/hule-vmm" }
-hule-image = { path = "crates/hule-image" }
# external dependencies
serde = { version = "1", features = ["derive"] }
diff --git a/crates/hule-image/Cargo.toml b/crates/hule-hmi/Cargo.toml
index 3c6c20c..d2b03e7 100644
--- a/crates/hule-image/Cargo.toml
+++ b/crates/hule-hmi/Cargo.toml
@@ -2,7 +2,7 @@
# SPDX-License-Identifier: Apache-2.0
[package]
-name = "hule-image"
+name = "hule-hmi"
description = "Types and validation for Hule machine images"
publish.workspace = true
diff --git a/crates/hule-image/src/lib.rs b/crates/hule-hmi/src/lib.rs
index 6165294..6165294 100644
--- a/crates/hule-image/src/lib.rs
+++ b/crates/hule-hmi/src/lib.rs
diff --git a/crates/hule-oci/Cargo.toml b/crates/hule-oci/Cargo.toml
index 76ba6ed..9fa92a9 100644
--- a/crates/hule-oci/Cargo.toml
+++ b/crates/hule-oci/Cargo.toml
@@ -13,7 +13,7 @@ authors.workspace = true
repository.workspace = true
[dependencies]
-hule-image.workspace = true
+hule-hmi.workspace = true
serde_json.workspace = true
oci-client = "0.17"
zstd = "0.13"
diff --git a/crates/hule-oci/src/lib.rs b/crates/hule-oci/src/lib.rs
index a63f448..e53615b 100644
--- a/crates/hule-oci/src/lib.rs
+++ b/crates/hule-oci/src/lib.rs
@@ -3,7 +3,7 @@
//! OCI image storage and registry operations for Hule machine images.
-use hule_image::MachineImage;
+use hule_hmi::MachineImage;
use oci_client::annotations::{ORG_OPENCONTAINERS_IMAGE_REF_NAME, ORG_OPENCONTAINERS_IMAGE_TITLE};
use oci_client::client::{ClientConfig, ClientProtocol, Config, ImageLayer};
use oci_client::manifest::{
diff --git a/crates/hule-vmm/Cargo.toml b/crates/hule-vmm/Cargo.toml
index 37d2085..fc56926 100644
--- a/crates/hule-vmm/Cargo.toml
+++ b/crates/hule-vmm/Cargo.toml
@@ -13,7 +13,7 @@ authors.workspace = true
repository.workspace = true
[dependencies]
-hule-image.workspace = true
+hule-hmi.workspace = true
uuid = { version = "1", features = ["v7"] }
tokio = { workspace = true, features = ["process", "fs", "io-util", "sync", "net", "time"] }
async-trait = "0.1"
diff --git a/crates/hule-vmm/src/backend/qemu/cli.rs b/crates/hule-vmm/src/backend/qemu/cli.rs
index 1612d13..5c3e7b9 100644
--- a/crates/hule-vmm/src/backend/qemu/cli.rs
+++ b/crates/hule-vmm/src/backend/qemu/cli.rs
@@ -7,7 +7,7 @@
use std::path::PathBuf;
/// One of the architectures qemu ships a `qemu-system-*` binary for.
-/// Distinct from `hule_image::Architecture`: this is qemu's own set of
+/// Distinct from `hule_hmi::Architecture`: this is qemu's own set of
/// per-arch conventions (binary name, machine type, TCG cpu model), not
/// Hule's.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
diff --git a/crates/hule-vmm/src/backend/qemu/mod.rs b/crates/hule-vmm/src/backend/qemu/mod.rs
index 0cd47cb..73ad36c 100644
--- a/crates/hule-vmm/src/backend/qemu/mod.rs
+++ b/crates/hule-vmm/src/backend/qemu/mod.rs
@@ -22,7 +22,7 @@ use std::process::{ExitStatus, Output};
use std::time::Duration;
use async_trait::async_trait;
-use hule_image::{Access, Architecture, Boot, BootLinux, Disk, MachineImage};
+use hule_hmi::{Access, Architecture, Boot, BootLinux, Disk, MachineImage};
use tokio::process::Child;
use tokio::sync::Mutex;
diff --git a/crates/hule-vmm/src/hypervisor.rs b/crates/hule-vmm/src/hypervisor.rs
index 149cd2a..31262b4 100644
--- a/crates/hule-vmm/src/hypervisor.rs
+++ b/crates/hule-vmm/src/hypervisor.rs
@@ -5,7 +5,7 @@ use std::fmt;
use std::path::Path;
use async_trait::async_trait;
-use hule_image::{Boot, MachineImage};
+use hule_hmi::{Boot, MachineImage};
use crate::{Machine, MachineId, R, Settings};
diff --git a/crates/hule-vmm/src/lib.rs b/crates/hule-vmm/src/lib.rs
index 924193f..6f1b67a 100644
--- a/crates/hule-vmm/src/lib.rs
+++ b/crates/hule-vmm/src/lib.rs
@@ -5,7 +5,7 @@
//! that tracks a fleet of them.
//!
//! No OCI, registry, or storage concerns -- callers hand in an
-//! already-resolved [`hule_image::MachineImage`] plus a directory of its
+//! already-resolved [`hule_hmi::MachineImage`] plus a directory of its
//! files.
//!
//! `Machine`/`Monitor` mirror Docker's container API term-for-term.
diff --git a/crates/hule-vmm/src/machine.rs b/crates/hule-vmm/src/machine.rs
index 26af2f1..3f826e6 100644
--- a/crates/hule-vmm/src/machine.rs
+++ b/crates/hule-vmm/src/machine.rs
@@ -38,7 +38,7 @@ pub trait Console: AsyncRead + AsyncWrite + Send + Unpin {}
impl<T: AsyncRead + AsyncWrite + Send + Unpin> Console for T {}
/// Deployment-time config of one instance -- distinct from
-/// [`hule_image::MachineImage`], which only declares a cpu/ram *range* and
+/// [`hule_hmi::MachineImage`], which only declares a cpu/ram *range* and
/// knows nothing about e.g. host ports. Always concrete: callers resolve
/// image defaults before constructing this.
#[derive(Debug, Clone, PartialEq)]
diff --git a/crates/hule-vmm/src/monitor.rs b/crates/hule-vmm/src/monitor.rs
index 8e9c829..038b219 100644
--- a/crates/hule-vmm/src/monitor.rs
+++ b/crates/hule-vmm/src/monitor.rs
@@ -3,7 +3,7 @@
use std::path::{Path, PathBuf};
-use hule_image::MachineImage;
+use hule_hmi::MachineImage;
use tokio::sync::mpsc::Receiver;
use uuid::Uuid;
diff --git a/crates/hule/Cargo.toml b/crates/hule/Cargo.toml
index a783fda..12f361d 100644
--- a/crates/hule/Cargo.toml
+++ b/crates/hule/Cargo.toml
@@ -13,8 +13,8 @@ authors.workspace = true
repository.workspace = true
[dependencies]
+hule-hmi.workspace = true
hule-oci.workspace = true
hule-vmm.workspace = true
-hule-image.workspace = true
tokio = { workspace = true, features = ["rt-multi-thread", "macros", "fs"] }
uuid = { version = "1", features = ["v7"] }
diff --git a/crates/hule/src/main.rs b/crates/hule/src/main.rs
index 6af3d54..3f316f5 100644
--- a/crates/hule/src/main.rs
+++ b/crates/hule/src/main.rs
@@ -4,7 +4,7 @@
use std::path::Path;
use std::process::exit;
-use hule_image::{Access, MachineImage};
+use hule_hmi::{Access, MachineImage};
use hule_vmm::backend::qemu::QemuHypervisor;
use hule_vmm::{Hypervisor, MachineId, Settings};
use uuid::Uuid;
@@ -31,7 +31,7 @@ async fn cmd_run(reference: &str, port: u16) -> R<()> {
.machine
.boot
.iter()
- .find(|b| matches!(b, hule_image::Boot::Linux(_)) && hv.supports(b))
+ .find(|b| matches!(b, hule_hmi::Boot::Linux(_)) && hv.supports(b))
.or_else(|| image.machine.boot.iter().find(|b| hv.supports(b)))
.ok_or("no boot protocol in manifest is supported by the qemu backend")?;
generated by Gilti