Merge branch 'main' into fix-4547

Author: tommady

src/vmm/src/builder.rs

@@ -557,7 +557,9 @@ pub fn build_microvm_for_boot(
     let request_ts = TimestampUs::default();
 
     let boot_config = vm_resources
-        .boot_source_builder()
+        .boot_source
+        .builder
+        .as_ref()
         .ok_or(MissingKernelConfig)?;
 
     let guest_memory = vm_resources
@@ -840,7 +842,7 @@ pub fn build_microvm_from_snapshot(
     vmm.vm.restore_state(&microvm_state.vm_state)?;
 
     // Restore the boot source config paths.
-    vm_resources.set_boot_source_config(microvm_state.vm_info.boot_source);
+    vm_resources.boot_source.config = microvm_state.vm_info.boot_source;
 
     // Restore devices states.
     let mmio_ctor_args = MMIODevManagerConstructorArgs {

src/vmm/src/devices/virtio/device.rs

@@ -156,7 +156,7 @@ pub trait VirtioDevice: AsAny + Send {
         let avail_features = self.avail_features();
         let unrequested_features = v & !avail_features;
         if unrequested_features != 0 {
-            warn!("Received acknowledge request for unknown feature: {:x}", v);
+            warn!("Received acknowledge request for unknown feature: {:#x}", v);
             // Don't count these features as acked.
             v &= !unrequested_features;
         }

src/vmm/src/devices/virtio/mmio.rs

@@ -138,7 +138,7 @@ impl MmioTransport {
             self.with_queue_mut(f);
         } else {
             warn!(
-                "update virtio queue in invalid state 0x{:x}",
+                "update virtio queue in invalid state {:#x}",
                 self.device_status
             );
         }
@@ -227,7 +227,7 @@ impl MmioTransport {
             }
             _ => {
                 warn!(
-                    "invalid virtio driver status transition: 0x{:x} -> 0x{:x}",
+                    "invalid virtio driver status transition: {:#x} -> {:#x}",
                     self.device_status, status
                 );
             }
@@ -282,19 +282,15 @@ impl MmioTransport {
                     0x70 => self.device_status,
                     0xfc => self.config_generation,
                     _ => {
-                        warn!("unknown virtio mmio register read: 0x{:x}", offset);
+                        warn!("unknown virtio mmio register read: {:#x}", offset);
                         return;
                     }
                 };
                 byte_order::write_le_u32(data, v);
             }
             0x100..=0xfff => self.locked_device().read_config(offset - 0x100, data),
             _ => {
-                warn!(
-                    "invalid virtio mmio read: 0x{:x}:0x{:x}",
-                    offset,
-                    data.len()
-                );
+                warn!("invalid virtio mmio read: {:#x}:{:#x}", offset, data.len());
             }
         };
     }
@@ -324,7 +320,7 @@ impl MmioTransport {
                                 .ack_features_by_page(self.acked_features_select, v);
                         } else {
                             warn!(
-                                "ack virtio features in invalid state 0x{:x}",
+                                "ack virtio features in invalid state {:#x}",
                                 self.device_status
                             );
                         }
@@ -346,7 +342,7 @@ impl MmioTransport {
                     0xa0 => self.update_queue_field(|q| lo(&mut q.used_ring_address, v)),
                     0xa4 => self.update_queue_field(|q| hi(&mut q.used_ring_address, v)),
                     _ => {
-                        warn!("unknown virtio mmio register write: 0x{:x}", offset);
+                        warn!("unknown virtio mmio register write: {:#x}", offset);
                     }
                 }
             }
@@ -361,11 +357,7 @@ impl MmioTransport {
                 }
             }
             _ => {
-                warn!(
-                    "invalid virtio mmio write: 0x{:x}:0x{:x}",
-                    offset,
-                    data.len()
-                );
+                warn!("invalid virtio mmio write: {:#x}:{:#x}", offset, data.len());
             }
         }
     }

src/vmm/src/devices/virtio/vsock/device.rs

@@ -322,7 +322,7 @@ where
     fn write_config(&mut self, offset: u64, data: &[u8]) {
         METRICS.cfg_fails.inc();
         warn!(
-            "vsock: guest driver attempted to write device config (offset={:x}, len={:x})",
+            "vsock: guest driver attempted to write device config (offset={:#x}, len={:#x})",
             offset,
             data.len()
         );

src/vmm/src/gdb/target.rs

@@ -390,7 +390,7 @@ impl MultiThreadBase for FirecrackerTarget {
 
         while !data.is_empty() {
             let gpa = arch::translate_gva(&vcpu_state.vcpu_fd, gva, &vmm).map_err(|e| {
-                error!("Error {e:?} translating gva on read address: {gva:X}");
+                error!("Error {e:?} translating gva on read address: {gva:#X}");
             })?;
 
             // Compute the amount space left in the page after the gpa
@@ -424,7 +424,7 @@ impl MultiThreadBase for FirecrackerTarget {
 
         while !data.is_empty() {
             let gpa = arch::translate_gva(&vcpu_state.vcpu_fd, gva, &vmm).map_err(|e| {
-                error!("Error {e:?} translating gva on read address: {gva:X}");
+                error!("Error {e:?} translating gva on read address: {gva:#X}");
             })?;
 
             // Compute the amount space left in the page after the gpa
@@ -436,7 +436,7 @@ impl MultiThreadBase for FirecrackerTarget {
             vmm.guest_memory()
                 .write(&data[..write_len], GuestAddress(gpa))
                 .map_err(|e| {
-                    error!("Error {e:?} writing memory at {gpa:X}");
+                    error!("Error {e:?} writing memory at {gpa:#X}");
                 })?;
 
             data = &data[write_len..];

src/vmm/src/persist.rs

@@ -64,7 +64,7 @@ impl From<&VmResources> for VmInfo {
             mem_size_mib: value.vm_config.mem_size_mib as u64,
             smt: value.vm_config.smt,
             cpu_template: StaticCpuTemplate::from(&value.vm_config.cpu_template),
-            boot_source: value.boot_source_config().clone(),
+            boot_source: value.boot_source.config.clone(),
             huge_pages: value.vm_config.huge_pages,
         }
     }

src/vmm/src/resources.rs

@@ -315,16 +315,6 @@ impl VmResources {
         mmds_config
     }
 
-    /// Gets a reference to the boot source configuration.
-    pub fn boot_source_config(&self) -> &BootSourceConfig {
-        &self.boot_source.config
-    }
-
-    /// Gets a reference to the boot source builder.
-    pub fn boot_source_builder(&self) -> Option<&BootConfig> {
-        self.boot_source.builder.as_ref()
-    }
-
     /// Sets a balloon device to be attached when the VM starts.
     pub fn set_balloon_device(
         &mut self,
@@ -354,14 +344,12 @@ impl VmResources {
             return Err(BootSourceConfigError::HugePagesAndInitRd);
         }
 
-        self.set_boot_source_config(boot_source_cfg);
-        self.boot_source.builder = Some(BootConfig::new(self.boot_source_config())?);
-        Ok(())
-    }
+        self.boot_source = BootSource {
+            builder: Some(BootConfig::new(&boot_source_cfg)?),
+            config: boot_source_cfg,
+        };
 
-    /// Set the boot source configuration (contains raw kernel config details).
-    pub fn set_boot_source_config(&mut self, boot_source_cfg: BootSourceConfig) {
-        self.boot_source.config = boot_source_cfg;
+        Ok(())
     }
 
     /// Inserts a block to be attached when the VM starts.
@@ -512,7 +500,7 @@ impl From<&VmResources> for VmmConfig {
         VmmConfig {
             balloon_device: resources.balloon.get_config().ok(),
             block_devices: resources.block.configs(),
-            boot_source: resources.boot_source_config().clone(),
+            boot_source: resources.boot_source.config.clone(),
             cpu_config: None,
             logger: None,
             machine_config: Some(MachineConfig::from(&resources.vm_config)),
@@ -1521,15 +1509,6 @@ mod tests {
         assert_eq!(actual_entropy_cfg, entropy_device_cfg);
     }
 
-    #[test]
-    fn test_boot_config() {
-        let vm_resources = default_vm_resources();
-        let expected_boot_cfg = vm_resources.boot_source.builder.as_ref().unwrap();
-        let actual_boot_cfg = vm_resources.boot_source_builder().unwrap();
-
-        assert!(actual_boot_cfg == expected_boot_cfg);
-    }
-
     #[test]
     fn test_set_boot_source() {
         let tmp_file = TempFile::new().unwrap();
@@ -1541,7 +1520,7 @@ mod tests {
         };
 
         let mut vm_resources = default_vm_resources();
-        let boot_builder = vm_resources.boot_source_builder().unwrap();
+        let boot_builder = vm_resources.boot_source.builder.as_ref().unwrap();
         let tmp_ino = tmp_file.as_file().metadata().unwrap().st_ino();
 
         assert_ne!(
@@ -1568,7 +1547,7 @@ mod tests {
         );
 
         vm_resources.build_boot_source(expected_boot_cfg).unwrap();
-        let boot_source_builder = vm_resources.boot_source_builder().unwrap();
+        let boot_source_builder = vm_resources.boot_source.builder.unwrap();
         assert_eq!(
             boot_source_builder
                 .cmdline

src/vmm/src/vstate/vcpu/x86_64.rs

@@ -61,7 +61,7 @@ pub enum KvmVcpuError {
     VcpuGetLapic(kvm_ioctls::Error),
     /// Failed to get KVM vcpu mp state: {0}
     VcpuGetMpState(kvm_ioctls::Error),
-    /// Failed to get KVM vcpu msr: 0x{0:x}
+    /// Failed to get KVM vcpu msr: {0:#x}
     VcpuGetMsr(u32),
     /// Failed to get KVM vcpu msrs: {0}
     VcpuGetMsrs(kvm_ioctls::Error),
@@ -321,7 +321,7 @@ impl KvmVcpu {
                 .filter(|msr| msr.index == MSR_IA32_TSC_DEADLINE && msr.data == 0)
                 .for_each(|msr| {
                     warn!(
-                        "MSR_IA32_TSC_DEADLINE is 0, replacing with {:x}.",
+                        "MSR_IA32_TSC_DEADLINE is 0, replacing with {:#x}.",
                         tsc_value
                     );
                     msr.data = tsc_value;

src/vmm/src/vstate/vm.rs

@@ -34,7 +34,7 @@ use crate::vstate::memory::{Address, GuestMemory, GuestMemoryMmap, GuestMemoryRe
 pub enum VmError {
     /// The host kernel reports an invalid KVM API version: {0}
     ApiVersion(i32),
-    /// Missing KVM capabilities: {0:x?}
+    /// Missing KVM capabilities: {0:#x?}
     Capabilities(u32),
     /**  Error creating KVM object: {0} Make sure the user launching the firecracker process is \
     configured on the /dev/kvm file's ACL. */

tests/data/static_cpu_templates/aarch64_with_sve_and_pac.json

@@ -1,4 +1,4 @@
 {
   "kvm_capabilities": ["170", "171", "172"],
-  "vcpu_features": [{ "index": 0, "bitmap": "0b1110000" }]
+  "vcpu_features": [{ "index": 0, "bitmap": "0b111xxxx" }]
 }