Merge branch 'main' into fix/retry_serial_tests

Author: Manciukic

CHANGELOG.md

@@ -90,6 +90,10 @@ and this project adheres to
 - [#5818](https://github.com/firecracker-microvm/firecracker/pull/5818): Reject
   device status writes that clear previously set bits in the MMIO transport,
   except for reset.
+- [#5884](https://github.com/firecracker-microvm/firecracker/pull/5884):
+  Corrected the OpenAPI spec for `PATCH /balloon/hinting/start` and
+  `PATCH /balloon/hinting/stop` to declare `204 No Content` instead of `200`,
+  matching the actual runtime response.
 
 ## [1.15.0]
 

src/firecracker/swagger/firecracker.yaml

@@ -181,7 +181,7 @@ paths:
           schema:
             $ref: "#/definitions/BalloonStartCmd"
       responses:
-        200:
+        204:
           description: Free page hinting run started.
         400:
           description: The balloon free hinting was not enabled when the device was configured.
@@ -215,7 +215,7 @@ paths:
       summary: Stops a free page hinting run only if enabled pre-boot.
       operationId: stopBalloonHinting
       responses:
-        200:
+        204:
           description: Free page hinting run stopped.
         400:
           description: The balloon free hinting was not enabled when the device was configured.

src/snapshot-editor/src/edit_memory.rs

@@ -246,7 +246,7 @@ mod tests {
             // expected:  [d] [b] [d] [d] [b]
             let base_block = rand::rand_bytes(block_size);
             // Adding to the base file 2 times because
-            // it is 1 block smaller then diff right now.
+            // it is 1 block smaller than diff right now.
             base_file.write_all(&base_block).unwrap();
             base_file.write_all(&base_block).unwrap();
             expected_result.extend(base_block);

src/vmm/src/arch/aarch64/regs.rs

@@ -127,7 +127,7 @@ pub const KVM_REG_ARM64_SVE_VLS: u64 =
     KVM_REG_ARM64 | KVM_REG_ARM64_SVE as u64 | KVM_REG_SIZE_U512 | 0xffff;
 
 /// Program Counter
-/// The offset value (0x100 = 32 * 8) is calcuated as follows:
+/// The offset value (0x100 = 32 * 8) is calculated as follows:
 /// - `kvm_regs` includes `regs` field of type `user_pt_regs` at the beginning (i.e., at offset 0).
 /// - `pc` follows `regs[31]` and `sp` within `user_pt_regs` and they are 8 bytes each (i.e. the
 ///   offset is (31 + 1) * 8 = 256).
@@ -196,7 +196,7 @@ impl From<usize> for RegSize {
             RegSize::U512_SIZE => RegSize::U512,
             RegSize::U1024_SIZE => RegSize::U1024,
             RegSize::U2048_SIZE => RegSize::U2048,
-            _ => unreachable!("Registers bigger then 2048 bits are not supported"),
+            _ => unreachable!("Registers bigger than 2048 bits are not supported"),
         }
     }
 }

src/vmm/src/cpu_config/x86_64/cpuid/amd/normalize.rs

@@ -214,7 +214,7 @@ impl super::AmdCpuid {
         /// This value allows at most 64 logical threads within a package.
         const THREAD_ID_MAX_SIZE: u32 = 7;
 
-        // We don't support more then 128 threads right now.
+        // We don't support more than 128 threads right now.
         // It's safe to put them all on the same processor.
         let leaf_80000008 = self
             .get_mut(&CpuidKey::leaf(0x80000008))

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

@@ -92,7 +92,7 @@ fn default_ack_on_stop() -> bool {
     true
 }
 
-/// Command recieved from the API to start a hinting run
+/// Command received from the API to start a hinting run
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Deserialize)]
 pub struct StartHintingCmd {
     /// If we should automatically acknowledge end of the run after stop.

src/vmm/src/devices/virtio/net/metrics.rs

@@ -126,7 +126,7 @@ static METRICS: RwLock<NetMetricsPerDevice> = RwLock::new(NetMetricsPerDevice {
 pub fn flush_metrics<S: Serializer>(serializer: S) -> Result<S::Ok, S::Error> {
     let net_metrics = METRICS.read().unwrap();
     let metrics_len = net_metrics.metrics.len();
-    // +1 to accomodate aggregate net metrics
+    // +1 to accommodate aggregate net metrics
     let mut seq = serializer.serialize_map(Some(1 + metrics_len))?;
 
     let mut net_aggregated: NetDeviceMetrics = NetDeviceMetrics::default();

src/vmm/src/devices/virtio/vsock/unix/muxer.rs

@@ -282,7 +282,7 @@ impl VsockEpollListener for VsockMuxer {
         EventSet::IN
     }
 
-    /// Notify the muxer about a pending event having occured under its nested epoll FD.
+    /// Notify the muxer about a pending event having occurred under its nested epoll FD.
     fn notify(&mut self, _: EventSet) {
         let mut epoll_events = vec![EpollEvent::new(EventSet::empty(), 0); 32];
         match self.epoll.wait(0, epoll_events.as_mut_slice()) {

src/vmm/src/mmds/ns.rs

@@ -140,7 +140,7 @@ impl MmdsNetworkStack {
     ///
     /// # Returns
     ///
-    /// `true` if the frame was consumed by `mmds` or `false` if an error occured
+    /// `true` if the frame was consumed by `mmds` or `false` if an error occurred
     pub fn detour_frame(&mut self, src: &[u8]) -> bool {
         if let Ok(eth) = EthernetFrame::from_bytes(src) {
             match eth.ethertype() {

src/vmm/src/snapshot/mod.rs

@@ -57,7 +57,7 @@ pub enum SnapshotError {
     InvalidFormatVersion(Version),
     /// Magic value does not match arch: {0}
     InvalidMagic(u64),
-    /// An error occured during bitcode serialization: {0}
+    /// An error occurred during bitcode serialization: {0}
     Bitcode(#[from] bitcode::Error),
     /// IO Error: {0}
     Io(#[from] std::io::Error),
@@ -206,7 +206,7 @@ impl<Data: DeserializeOwned> Snapshot<Data> {
         let computed_checksum = crc64(0, buf.as_slice());
         // When we read the entire file, we also read the checksum into the buffer. The CRC has the
         // property that crc(0, buf.as_slice()) == 0 iff the last 8 bytes of buf are the checksum
-        // of all the preceeding bytes, and this is the property we are using here.
+        // of all the preceding bytes, and this is the property we are using here.
         if computed_checksum != 0 {
             return Err(SnapshotError::Crc64);
         }
@@ -251,9 +251,6 @@ mod tests {
         let mut snapshot_data = Vec::new();
         snapshot.save(&mut snapshot_data).unwrap();
 
-        // Debug: print the length to understand what's happening
-        println!("Snapshot data length: {}", snapshot_data.len());
-
         assert_eq!(
             get_format_version(&mut std::io::Cursor::new(&snapshot_data)).unwrap(),
             SNAPSHOT_VERSION