Add SMBIOS bootrom version to config files

bin/propolis-server/src/lib/initializer.rs

@@ -115,6 +115,7 @@ pub struct MachineInitializer<'a> {
     pub(crate) crucible_backends: CrucibleBackendMap,
     pub(crate) spec: &'a InstanceSpecV0,
     pub(crate) properties: &'a InstanceProperties,
+    pub(crate) toml_config: &'a crate::server::VmTomlConfig,
     pub(crate) producer_registry: Option<ProducerRegistry>,
     pub(crate) state: MachineInitializerState,
 }
@@ -857,9 +858,16 @@ impl<'a> MachineInitializer<'a> {
 
         let rom_size =
             self.state.rom_size_bytes.expect("ROM is already populated");
+        let bios_version = self
+            .toml_config
+            .bootrom_version
+            .as_deref()
+            .unwrap_or("v0.8")
+            .try_into()
+            .expect("bootrom version string doesn't contain NUL bytes");
         let smb_type0 = smbios::table::Type0 {
             vendor: "Oxide".try_into().unwrap(),
-            bios_version: "v0.8".try_into().unwrap(),
+            bios_version,
             bios_release_date: "The Aftermath 30, 3185 YOLD"
                 .try_into()
                 .unwrap(),

bin/propolis-server/src/lib/server.rs

@@ -34,7 +34,7 @@ use propolis_api_types::instance_spec::{
     VersionedInstanceSpec,
 };
 
-use propolis_server_config::Config as VmTomlConfig;
+pub use propolis_server_config::Config as VmTomlConfig;
 use rfb::server::VncServer;
 use slog::{error, info, o, warn, Logger};
 use thiserror::Error;

bin/propolis-server/src/lib/vm/mod.rs

@@ -456,6 +456,7 @@ impl VmController {
             crucible_backends: CrucibleBackendMap::new(),
             spec: v0_spec,
             properties: &properties,
+            toml_config,
             producer_registry,
             state: MachineInitializerState::default(),
         };

bin/propolis-standalone/src/config.rs

@@ -47,6 +47,7 @@ pub struct Main {
     pub name: String,
     pub cpus: u8,
     pub bootrom: String,
+    pub bootrom_version: Option<String>,
     pub memory: usize,
     pub use_reservoir: Option<bool>,
     pub cpuid_profile: Option<String>,

bin/propolis-standalone/src/main.rs

@@ -807,16 +807,20 @@ fn populate_rom(
 struct SmbiosParams {
     memory_size: usize,
     rom_size: usize,
+    rom_version: String,
     num_cpus: u8,
     cpuid_ident: Option<cpuid::Entry>,
     cpuid_procname: Option<[cpuid::Entry; 3]>,
 }
 fn generate_smbios(params: SmbiosParams) -> anyhow::Result<smbios::TableBytes> {
     use smbios::table::{type0, type1, type16, type4};
-
+    let bios_version = params
+        .rom_version
+        .try_into()
+        .expect("bootrom version string doesn't contain NUL bytes");
     let smb_type0 = smbios::table::Type0 {
         vendor: "Oxide".try_into().unwrap(),
-        bios_version: "v0.0.1 alpha1".try_into().unwrap(),
+        bios_version,
         bios_release_date: "Bureaucracy 41, 3186 YOLD".try_into().unwrap(),
         bios_rom_size: ((params.rom_size / (64 * 1024)) - 1) as u8,
         bios_characteristics: type0::BiosCharacteristics::UNSUPPORTED,
@@ -1202,6 +1206,10 @@ fn setup_instance(
         generate_smbios(SmbiosParams {
             memory_size: memsize,
             rom_size: rom_len,
+            rom_version: config
+                .main
+                .bootrom_version
+                .unwrap_or_else(|| "v0.0.1-alpha 1".to_string()),
             num_cpus: cpus,
             cpuid_ident,
             cpuid_procname,

crates/propolis-server-config/src/lib.rs

@@ -18,6 +18,8 @@ pub use cpuid_profile_config::CpuidProfile;
 pub struct Config {
     pub bootrom: PathBuf,
 
+    pub bootrom_version: Option<String>,
+
     #[serde(default, rename = "pci_bridge")]
     pub pci_bridges: Vec<PciBridge>,
 
@@ -37,6 +39,7 @@ impl Default for Config {
     fn default() -> Self {
         Self {
             bootrom: PathBuf::new(),
+            bootrom_version: None,
             pci_bridges: Vec::new(),
             chipset: Chipset { options: BTreeMap::new() },
             devices: BTreeMap::new(),