instance spec rework: flatten InstanceSpecV0

bin/propolis-server/Cargo.toml

@@ -80,4 +80,4 @@ default = []
 omicron-build = ["propolis/omicron-build"]
 
 # Falcon builds require corresponding bits turned on in the dependency libs
-falcon = ["propolis/falcon", "propolis_api_types/falcon"]
+falcon = ["propolis/falcon"]

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

@@ -1009,9 +1009,9 @@ impl<'a> MachineInitializer<'a> {
         info!(
             self.log,
             "Generating bootorder with order: {:?}",
-            self.spec.boot_order.as_ref()
+            self.spec.boot_settings.as_ref()
         );
-        let Some(boot_names) = self.spec.boot_order.as_ref() else {
+        let Some(boot_names) = self.spec.boot_settings.as_ref() else {
             return Ok(None);
         };
 
@@ -1033,7 +1033,7 @@ impl<'a> MachineInitializer<'a> {
                 bdf
             };
 
-        for boot_entry in boot_names.iter() {
+        for boot_entry in boot_names.order.iter() {
             // Theoretically we could support booting from network devices by
             // matching them here and adding their PCI paths, but exactly what
             // would happen is ill-understood. So, only check disks here.

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

@@ -2,7 +2,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-//! Checks for compatibility of two instance specs.
+//! Associated functions for the [`crate::spec::Spec`] type that determine
+//! whether two specs describe migration-compatible VMs.
 
 use std::collections::HashMap;
 

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

@@ -130,9 +130,11 @@ fn instance_spec_from_request(
     }
 
     if let Some(boot_settings) = request.boot_settings.as_ref() {
-        for item in boot_settings.order.iter() {
-            spec_builder.add_boot_option(item)?;
-        }
+        let order = boot_settings.order.clone();
+        spec_builder.add_boot_order(
+            "boot-settings".to_string(),
+            order.into_iter().map(Into::into),
+        )?;
     }
 
     if let Some(base64) = &request.cloud_init_bytes {