merge gjcolombo/refactor-server-request-queue

Author: gjcolombo

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

@@ -63,9 +63,9 @@ impl ActiveVm {
 
         self.state_driver_queue
             .queue_external_request(match requested {
-                InstanceStateRequested::Run => ExternalRequest::Start,
-                InstanceStateRequested::Stop => ExternalRequest::Stop,
-                InstanceStateRequested::Reboot => ExternalRequest::Reboot,
+                InstanceStateRequested::Run => ExternalRequest::start(),
+                InstanceStateRequested::Stop => ExternalRequest::stop(),
+                InstanceStateRequested::Reboot => ExternalRequest::reboot(),
             })
             .map_err(Into::into)
     }
@@ -79,10 +79,7 @@ impl ActiveVm {
         websock: dropshot::WebsocketConnection,
     ) -> Result<(), VmError> {
         Ok(self.state_driver_queue.queue_external_request(
-            ExternalRequest::MigrateAsSource {
-                migration_id,
-                websock: websock.into(),
-            },
+            ExternalRequest::migrate_as_source(migration_id, websock),
         )?)
     }
 
@@ -107,11 +104,11 @@ impl ActiveVm {
     ) -> Result<(), VmError> {
         self.state_driver_queue
             .queue_external_request(
-                ExternalRequest::ReconfigureCrucibleVolume {
+                ExternalRequest::reconfigure_crucible_volume(
                     backend_id,
                     new_vcr_json,
                     result_tx,
-                },
+                ),
             )
             .map_err(Into::into)
     }