propolis-standalone-config needn't be a crate

Since config extraction is not part of `savex` in propolis-utils
anymore, the configuration definitions for propolis-standalone do not
need to be exposed outside of the binary crate itself.

Author: pfmooney

Cargo.lock

@@ -46,7 +46,6 @@ bhyve_api_sys = { path = "crates/bhyve-api/sys" }
 cpuid_profile_config = { path = "crates/cpuid-profile-config" }
 dladm = { path = "crates/dladm" }
 propolis-server-config = { path = "crates/propolis-server-config" }
-propolis-standalone-config = { path = "crates/propolis-standalone-config" }
 propolis_api_types = { path = "crates/propolis-api-types" }
 propolis_types = { path = "crates/propolis-types" }
 viona_api = { path = "crates/viona-api" }

Cargo.toml

@@ -37,7 +37,6 @@ implementation details, consumed by Propolis components.
 - bhyve-api: API (ioctls & structs) for the illumos bhyve kernel VMM
 - dladm: Some thin wrappers around `dladm` queries
 - propolis-server-config: Type definitions for `propolis-server` config file
-- propolis-standalone-config: Type definitions for `propolis-standalone` config file
 - propolis-types: Publically exposed (via `propolis-server`) types, intergral
   to the `propolis` library
 - viona-api: API (ioctls & structs) for the illumos viona driver

README.md

@@ -25,7 +25,7 @@ tokio = { workspace = true, features = ["io-util", "rt-multi-thread"] }
 serde = { workspace = true, features = ["derive"] }
 propolis.workspace = true
 crucible-client-types = { workspace = true, optional = true }
-propolis-standalone-config = { workspace = true }
+cpuid_profile_config.workspace = true
 erased-serde.workspace = true
 serde_json.workspace = true
 slog.workspace = true

bin/propolis-standalone/Cargo.toml

@@ -7,9 +7,9 @@ use std::sync::Arc;
 
 use anyhow::{bail, Context};
 use fatfs::{FileSystem, FormatVolumeOptions, FsOptions};
-
 use propolis::block;
-use propolis_standalone_config::Config;
+
+use crate::config::Config;
 
 const SECTOR_SZ: usize = 512;
 const VOLUME_LABEL: [u8; 11] = *b"cidata     ";

bin/propolis-standalone/src/cidata.rs

@@ -9,16 +9,101 @@ use std::str::FromStr;
 use std::sync::Arc;
 
 use anyhow::Context;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
+use cpuid_profile_config::*;
 use propolis::block;
 use propolis::cpuid;
 use propolis::hw::pci::Bdf;
 use propolis::inventory::ChildRegister;
 
 use crate::cidata::build_cidata_be;
-pub use propolis_standalone_config::Config;
-use propolis_standalone_config::{CpuVendor, CpuidEntry, Device};
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct Config {
+    pub main: Main,
+
+    #[serde(default, rename = "dev")]
+    pub devices: BTreeMap<String, Device>,
+
+    #[serde(default, rename = "block_dev")]
+    pub block_devs: BTreeMap<String, BlockDevice>,
+
+    #[serde(default, rename = "cpuid")]
+    pub cpuid_profiles: BTreeMap<String, CpuidProfile>,
+
+    pub cloudinit: Option<CloudInit>,
+}
+impl Config {
+    pub fn cpuid_profile(&self) -> Option<&CpuidProfile> {
+        match self.main.cpuid_profile.as_ref() {
+            Some(name) => self.cpuid_profiles.get(name),
+            None => None,
+        }
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct Main {
+    pub name: String,
+    pub cpus: u8,
+    pub bootrom: String,
+    pub memory: usize,
+    pub use_reservoir: Option<bool>,
+    pub cpuid_profile: Option<String>,
+    /// Process exitcode to emit if/when instance halts
+    ///
+    /// Default: 0
+    #[serde(default)]
+    pub exit_on_halt: u8,
+    /// Process exitcode to emit if/when instance reboots
+    ///
+    /// Default: None, does not exit on reboot
+    #[serde(default)]
+    pub exit_on_reboot: Option<u8>,
+}
+
+/// A hard-coded device, either enabled by default or accessible locally
+/// on a machine.
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct Device {
+    pub driver: String,
+
+    #[serde(flatten, default)]
+    pub options: BTreeMap<String, toml::Value>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct BlockOpts {
+    pub block_size: Option<u32>,
+    pub read_only: Option<bool>,
+    pub skip_flush: Option<bool>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct BlockDevice {
+    #[serde(default, rename = "type")]
+    pub bdtype: String,
+
+    #[serde(flatten)]
+    pub block_opts: BlockOpts,
+
+    #[serde(flatten, default)]
+    pub options: BTreeMap<String, toml::Value>,
+}
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+#[serde(rename_all = "kebab-case")]
+pub struct CloudInit {
+    pub user_data: Option<String>,
+    pub meta_data: Option<String>,
+    pub network_config: Option<String>,
+
+    // allow path-style contents as well
+    pub user_data_path: Option<String>,
+    pub meta_data_path: Option<String>,
+    pub network_config_path: Option<String>,
+}
 
 #[derive(Deserialize)]
 struct FileConfig {
@@ -165,7 +250,7 @@ pub fn parse_cpuid(config: &Config) -> anyhow::Result<Option<cpuid::Set>> {
 
 #[cfg(feature = "crucible")]
 fn create_crucible_backend(
-    be: &propolis_standalone_config::BlockDevice,
+    be: &BlockDevice,
     opts: block::BackendOpts,
     log: &slog::Logger,
 ) -> (Arc<dyn block::Backend>, ChildRegister) {
@@ -259,7 +344,7 @@ fn create_crucible_backend(
 
 #[cfg(feature = "crucible")]
 fn create_crucible_mem_backend(
-    be: &propolis_standalone_config::BlockDevice,
+    be: &BlockDevice,
     opts: block::BackendOpts,
     log: &slog::Logger,
 ) -> (Arc<dyn block::Backend>, ChildRegister) {
@@ -278,7 +363,7 @@ fn create_crucible_mem_backend(
 
 #[cfg(not(feature = "crucible"))]
 fn create_crucible_backend(
-    _be: &propolis_standalone_config::BlockDevice,
+    _be: &BlockDevice,
     _opts: block::BackendOpts,
     _log: &slog::Logger,
 ) -> (Arc<dyn block::Backend>, ChildRegister) {
@@ -290,7 +375,7 @@ fn create_crucible_backend(
 
 #[cfg(not(feature = "crucible"))]
 fn create_crucible_mem_backend(
-    _be: &propolis_standalone_config::BlockDevice,
+    _be: &BlockDevice,
     _opts: block::BackendOpts,
     _log: &slog::Logger,
 ) -> (Arc<dyn block::Backend>, ChildRegister) {

bin/propolis-standalone/src/config.rs

@@ -22,4 +22,3 @@ propolis = { workspace = true, default-features = false }
 bhyve_api = { workspace = true }
 libc = { workspace = true }
 serde_json.workspace = true
-propolis-standalone-config = { workspace = true }