Skip to content

Commit

Permalink
. (#20)
Browse files Browse the repository at this point in the history
  • Loading branch information
daprilik authored Oct 4, 2024
1 parent 51e1351 commit 5b397c5
Show file tree
Hide file tree
Showing 302 changed files with 52 additions and 54 deletions.
84 changes: 42 additions & 42 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@

[workspace]
resolver = "2"
default-members = ["hvlite/openvmm"]
default-members = ["openvmm/openvmm"]
members = [
# openvmm
"hvlite/openvmm",
"openvmm/openvmm",
# repo tooling
"flowey/flowey_hvlite",
"xtask",
# underhill
"underhill/ohcldiag-dev",
"underhill/openhcl_boot",
"underhill/openvmm_hcl",
"underhill/sidecar",
"underhill/vmfirmwareigvm_dll",
# openhcl
"openhcl/ohcldiag-dev",
"openhcl/openhcl_boot",
"openhcl/openvmm_hcl",
"openhcl/sidecar",
"openhcl/vmfirmwareigvm_dll",
# VMM tests
"vmm_tests/vmm_tests",
# hyper-v
Expand Down Expand Up @@ -52,14 +52,14 @@ flowey_lib_common = { path = "flowey/flowey_lib_common" }
flowey_lib_hvlite = { path = "flowey/flowey_lib_hvlite" }
schema_ado_yaml = { path = "flowey/schema_ado_yaml" }

hvlite_core = { path = "hvlite/hvlite_core" }
hvlite_defs = { path = "hvlite/hvlite_defs" }
hvlite_entry = { path = "hvlite/hvlite_entry" }
hvlite_helpers = { path = "hvlite/hvlite_helpers" }
hvlite_pcat_locator = { path = "hvlite/hvlite_pcat_locator" }
openvmm_resources = { path = "hvlite/openvmm_resources" }
hvlite_ttrpc_vmservice = { path = "hvlite/hvlite_ttrpc_vmservice" }
membacking = { path = "hvlite/membacking" }
hvlite_core = { path = "openvmm/hvlite_core" }
hvlite_defs = { path = "openvmm/hvlite_defs" }
hvlite_entry = { path = "openvmm/hvlite_entry" }
hvlite_helpers = { path = "openvmm/hvlite_helpers" }
hvlite_pcat_locator = { path = "openvmm/hvlite_pcat_locator" }
openvmm_resources = { path = "openvmm/openvmm_resources" }
hvlite_ttrpc_vmservice = { path = "openvmm/hvlite_ttrpc_vmservice" }
membacking = { path = "openvmm/membacking" }

petri_artifact_resolver_openvmm_known_paths = { path = "vmm_tests/petri_artifact_resolver_openvmm_known_paths" }
petri_artifacts_vmm_test = { path = "vmm_tests/petri_artifacts_vmm_test" }
Expand Down Expand Up @@ -134,31 +134,31 @@ win_import_lib = { path = "support/win_import_lib" }
win1_support = { path = "support/win1_support" }
zerocopy_helpers = { path = "support/zerocopy_helpers" }

azure_profiler_proto = { path = "underhill/azure_profiler_proto" }
bootloader_fdt_parser = { path = "underhill/bootloader_fdt_parser" }
build_info = { path = "underhill/build_info" }
diag_client = { path = "underhill/diag_client" }
diag_proto = { path = "underhill/diag_proto" }
diag_server = { path = "underhill/diag_server" }
hcl = { path = "underhill/hcl" }
host_fdt_parser = { path = "underhill/host_fdt_parser" }
kmsg_defs = { path = "underhill/kmsg_defs" }
minimal_rt = { path = "underhill/minimal_rt" }
minimal_rt_build = { path = "underhill/minimal_rt_build" }
sidecar_client = { path = "underhill/sidecar_client" }
sidecar_defs = { path = "underhill/sidecar_defs" }
shared_pool_alloc = { path = "underhill/shared_pool_alloc" }
underhill_attestation = { path = "underhill/underhill_attestation" }
underhill_confidentiality = { path = "underhill/underhill_confidentiality" }
underhill_core = { path = "underhill/underhill_core" }
underhill_crash = { path = "underhill/underhill_crash" }
underhill_dump = { path = "underhill/underhill_dump" }
underhill_entry = { path = "underhill/underhill_entry" }
underhill_init = { path = "underhill/underhill_init" }
underhill_mem = { path = "underhill/underhill_mem" }
openvmm_hcl_resources = { path = "underhill/openvmm_hcl_resources" }
underhill_threadpool = { path = "underhill/underhill_threadpool" }
virt_underhill = { path = "underhill/virt_underhill" }
azure_profiler_proto = { path = "openhcl/azure_profiler_proto" }
bootloader_fdt_parser = { path = "openhcl/bootloader_fdt_parser" }
build_info = { path = "openhcl/build_info" }
diag_client = { path = "openhcl/diag_client" }
diag_proto = { path = "openhcl/diag_proto" }
diag_server = { path = "openhcl/diag_server" }
hcl = { path = "openhcl/hcl" }
host_fdt_parser = { path = "openhcl/host_fdt_parser" }
kmsg_defs = { path = "openhcl/kmsg_defs" }
minimal_rt = { path = "openhcl/minimal_rt" }
minimal_rt_build = { path = "openhcl/minimal_rt_build" }
sidecar_client = { path = "openhcl/sidecar_client" }
sidecar_defs = { path = "openhcl/sidecar_defs" }
shared_pool_alloc = { path = "openhcl/shared_pool_alloc" }
underhill_attestation = { path = "openhcl/underhill_attestation" }
underhill_confidentiality = { path = "openhcl/underhill_confidentiality" }
underhill_core = { path = "openhcl/underhill_core" }
underhill_crash = { path = "openhcl/underhill_crash" }
underhill_dump = { path = "openhcl/underhill_dump" }
underhill_entry = { path = "openhcl/underhill_entry" }
underhill_init = { path = "openhcl/underhill_init" }
underhill_mem = { path = "openhcl/underhill_mem" }
openvmm_hcl_resources = { path = "openhcl/openvmm_hcl_resources" }
underhill_threadpool = { path = "openhcl/underhill_threadpool" }
virt_underhill = { path = "openhcl/virt_underhill" }

aarch64defs = { path = "vm/aarch64/aarch64defs" }
aarch64emu = { path = "vm/aarch64/aarch64emu" }
Expand Down Expand Up @@ -348,7 +348,7 @@ debug_worker_defs = { path = "workers/debug_worker_defs" }
vnc_worker = { path = "workers/vnc_worker" }
vnc_worker_defs = { path = "workers/vnc_worker_defs" }
vnc = { path = "workers/vnc_worker/vnc" }
profiler_worker = { path = "underhill/profiler_worker" }
profiler_worker = { path = "openhcl/profiler_worker" }

# crates.io
anyhow = "1.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ impl SimpleFlowNode for Node {
};

let initrd = {
let rootfs_config = openvmm_repo_path.map(ctx, |p| p.join("underhill/rootfs.config"));
let rootfs_config = openvmm_repo_path.map(ctx, |p| p.join("openhcl/rootfs.config"));
let openvmm_hcl_bin = openvmm_hcl_bin.map(ctx, |o| o.bin);

ctx.reqv(|v| crate::build_openhcl_initrd::Request {
Expand Down
2 changes: 1 addition & 1 deletion flowey/flowey_lib_hvlite/src/build_openhcl_initrd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ impl FlowNode for Node {

xshell::cmd!(
sh,
"python3 underhill/update-rootfs.py
"python3 openhcl/update-rootfs.py
{bin_openhcl}
{initrd_path}
--arch {rootfs_py_arch}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion vm/chipset_arc_mutex_device/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//! [`ChipsetDevice`](chipset_device::ChipsetDevice) instances using
//! `Arc<CloseableMutex<dyn ChipsetDevice>>` to communicate with the backing chipset.
//!
//! NOTE: this crate is no longer used by HvLite/Underhill, and only remains
//! NOTE: this crate is no longer used by OpenVMM/OpenHCL, and only remains
//! in-tree to support testing devices.
#![warn(missing_docs)]
Expand Down
6 changes: 2 additions & 4 deletions vm/chipset_device/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@
/// (insofar as it exists on one or more system busses).
//
// DEVNOTE: In the past, `ChipsetDevice` included explicit bounds for things
// like `Inspect` and `SaveRestore`, traits that all HvLite/Underhill devices
// are expected to implement. While this works, it comes with a few drawbacks:
// like `Inspect` and `SaveRestore`, traits that all OpenVMM devices are
// expected to implement. While this works, it comes with a few drawbacks:
// - It adds some heavy dependencies to an otherwise lightweight crate
// - It adds substantial boilerplate when implementing "test" devices, as those
// traits need to be implemented + stubbed-out with `todo!()`s
// - It makes it harder to reuse "core" device implementations outside
// HvLite/Underhill
pub trait ChipsetDevice: 'static + Send /* see DEVNOTE before adding bounds */ {
/// Optionally returns a trait object to send IO port intercepts to.
#[inline(always)]
Expand Down
Loading

1 comment on commit 5b397c5

@daprilik
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pardon the commit message - we're still ironing out some of our GitHub PR policies, and didn't set the "default title to PR title" setting. This should be fixed moving forwards.

Please sign in to comment.