Fix compile errors

Author: ValentaTomas

src/cpu-template-helper/src/utils/mod.rs

@@ -125,6 +125,7 @@ pub fn build_microvm_from_config(
         state: VmState::NotStarted,
         vmm_version: CPU_TEMPLATE_HELPER_VERSION.to_string(),
         app_name: "cpu-template-helper".to_string(),
+        memory_regions: None,
     };
     let mut vm_resources =
         VmResources::from_json(&config, &instance_info, HTTP_MAX_PAYLOAD_SIZE, None)

src/firecracker/src/main.rs

@@ -342,6 +342,7 @@ fn main_exec() -> Result<(), MainError> {
         state: VmState::NotStarted,
         vmm_version: FIRECRACKER_VERSION.to_string(),
         app_name: "Firecracker".to_string(),
+        memory_regions: None,
     };
 
     if let Some(metrics_path) = arguments.single_value("metrics-path") {

src/vmm/src/rpc_interface.rs

@@ -652,9 +652,11 @@ impl RuntimeApiController {
 
                 let mut instance_info = locked_vmm.instance_info();
 
-                instance_info.memory_regions = locked_vmm
-                    .vm
-                    .guest_memory_mappings(&VmInfo::from(&self.vm_resources));
+                instance_info.memory_regions = Some(
+                    locked_vmm
+                        .vm
+                        .guest_memory_mappings(&VmInfo::from(&self.vm_resources)),
+                );
 
                 Ok(VmmData::InstanceInformation(instance_info))
             }

src/vmm/src/vmm_config/instance_info.rs

@@ -3,7 +3,7 @@
 use std::fmt::{self, Display, Formatter};
 
 use crate::vstate::vm::GuestMemoryRegionMapping;
-use serde::{Serialize, ser};
+use serde::{ser, Serialize};
 
 /// Enumerates microVM runtime states.
 #[derive(Clone, Debug, Default, PartialEq, Eq)]
@@ -48,5 +48,5 @@ pub struct InstanceInfo {
     /// The name of the application that runs the microVM.
     pub app_name: String,
     /// The regions of the guest memory.
-    pub memory_regions: Vec<GuestMemoryRegionMapping>,
+    pub memory_regions: Option<Vec<GuestMemoryRegionMapping>>,
 }