build: Release v36.1 (bug fix release)

Signed-off-by: Bo Chen <chen.bo@intel.com>

.github/workflows/audit.yaml

@@ -9,7 +9,7 @@ jobs:
     name: Audit
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v1
       - uses: actions-rs/audit-check@v1
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build.yaml

@@ -13,13 +13,13 @@ jobs:
           - stable
           - beta
           - nightly
-          - "1.70"
+          - "1.66"
         target:
           - x86_64-unknown-linux-gnu
           - x86_64-unknown-linux-musl
     steps:
       - name: Code checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0
 
@@ -54,9 +54,6 @@ jobs:
       - name: Build (sev_snp)
         run: cargo rustc --locked --bin cloud-hypervisor --no-default-features --features "sev_snp"  -- -D warnings -D clippy::undocumented_unsafe_blocks
 
-      - name: Build (igvm)
-        run: cargo rustc --locked --bin cloud-hypervisor --no-default-features --features "igvm"  -- -D warnings -D clippy::undocumented_unsafe_blocks
-
       - name: Build (mshv + kvm)
         run: cargo rustc --locked --bin cloud-hypervisor --no-default-features --features "mshv,kvm"  -- -D warnings -D clippy::undocumented_unsafe_blocks
 

.github/workflows/dco.yaml

@@ -5,7 +5,7 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
     - name: Set up Python 3.x
       uses: actions/setup-python@v1
       with:

.github/workflows/docker-image.yaml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Code checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1

.github/workflows/fuzz-build.yaml

@@ -12,11 +12,9 @@ jobs:
           - nightly
         target:
           - x86_64-unknown-linux-gnu
-    env:
-      RUSTFLAGS: -D warnings
     steps:
       - name: Code checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       - name: Install Rust toolchain (${{ matrix.rust }})
         uses: actions-rs/toolchain@v1
         with:
@@ -24,8 +22,8 @@ jobs:
             target: ${{ matrix.target }}
             override: true
       - name: Install Cargo fuzz
-        run: cargo install cargo-fuzz
+        # Temporary fix for cargo-fuzz on latest nightly: https://github.com/rust-fuzz/cargo-fuzz/issues/276
-      - name: Fuzz Build
+        #run: cargo install cargo-fuzz
+        run: cargo install --git https://github.com/rust-fuzz/cargo-fuzz --rev b4df3e58f767b5cad8d1aa6753961003f56f3609
+      - name: Cargo Fuzz Build
         run: cargo fuzz build
-      - name: Fuzz Check
-        run: cargo fuzz check

.github/workflows/gitlint.yaml

@@ -1,26 +0,0 @@
-name: Commit messages check
-
-on:
-  pull_request:
-
-jobs:
-  gitlint:
-    name: Check commit messages
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-        fetch-depth: 0
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v3
-      with:
-        python-version: "3.10"
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install --upgrade gitlint
-    - name: Lint git commit messages
-      run: |
-        gitlint --commits origin/$GITHUB_BASE_REF..

.github/workflows/hadolint.yaml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
 
       - name: Lint Dockerfile
         uses: hadolint/hadolint-action@master

.github/workflows/openapi.yaml

@@ -1,16 +0,0 @@
-name: Cloud Hypervisor OpenAPI Validation
-
-on:
-  pull_request:
-
-jobs:
-  Validate:
-    runs-on: ubuntu-latest
-    container: openapitools/openapi-generator-cli
-    steps:
-    - uses: actions/checkout@v4
-    - name: Validate OpenAPI
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        /usr/local/bin/docker-entrypoint.sh validate -i vmm/src/api/openapi/cloud-hypervisor.yaml

.github/workflows/quality.yaml

@@ -34,7 +34,7 @@ jobs:
             experimental: true
     steps:
       - name: Code checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -109,14 +109,6 @@ jobs:
           command: clippy
           args: --target=${{ matrix.target }} --locked --all --all-targets --no-default-features --tests --examples --features "sev_snp" -- -D warnings -D clippy::undocumented_unsafe_blocks
 
-      - name: Clippy (igvm)
-        if: ${{ matrix.target == 'x86_64-unknown-linux-gnu' }}
-        uses: actions-rs/cargo@v1
-        with:
-          use-cross: ${{ matrix.target != 'x86_64-unknown-linux-gnu' }}
-          command: clippy
-          args: --target=${{ matrix.target }} --locked --all --all-targets --no-default-features --tests --examples --features "igvm" -- -D warnings -D clippy::undocumented_unsafe_blocks
-
       - name: Clippy (kvm + tdx)
         if: ${{ matrix.target == 'x86_64-unknown-linux-gnu' }}
         uses: actions-rs/cargo@v1
@@ -133,6 +125,6 @@ jobs:
     name: Typos / Spellcheck
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       # Executes "typos ."
       - uses: crate-ci/typos@v1.16.11

.github/workflows/release.yaml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Code checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
       - name: Install musl-gcc
         run: sudo apt install -y musl-tools
       - name: Create release directory
@@ -16,29 +16,29 @@ jobs:
       - name: Install Rust toolchain (x86_64-unknown-linux-gnu)
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: "1.70"
+          toolchain: "1.67.1"
           target: x86_64-unknown-linux-gnu
       - name: Install Rust toolchain (x86_64-unknown-linux-musl)
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: "1.70"
+          toolchain: "1.67.1"
           target: x86_64-unknown-linux-musl
       - name: Build
         uses: actions-rs/cargo@v1
         with:
-          toolchain: "1.70"
+          toolchain: "1.67.1"
           command: build
           args: --all --release --features mshv --target=x86_64-unknown-linux-gnu
       - name: Static Build
         uses: actions-rs/cargo@v1
         with:
-          toolchain: "1.70"
+          toolchain: "1.67.1"
           command: build
           args: --all --release --features mshv --target=x86_64-unknown-linux-musl
       - name: Install Rust toolchain (aarch64-unknown-linux-musl)
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: "1.70"
+          toolchain: "1.67.1"
           target: aarch64-unknown-linux-musl
           override: true
       - name: Create Release

.github/workflows/shlint.yaml

@@ -1,20 +0,0 @@
-name: Shell scripts check
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-
-jobs:
-  sh-checker:
-    name: Check shell scripts
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-    - name: Run the shell script checkers
-      uses: luizm/action-sh-checker@master
-      env:
-        SHFMT_OPTS: -i 4 -d
-        SHELLCHECK_OPTS: -x --source-path scripts

.gitignore

@@ -6,4 +6,3 @@
 **/rusty-tags.vi
 /rpm/SOURCES
 /.vscode
-/vendor

.gitlint

@@ -1,15 +0,0 @@
-[general]
-extra-path=scripts/gitlint/rules.py
-regex-style-search=true
-
-[ignore-by-author-name]
-regex=dependabot
-ignore=all
-
-# default 72
-[title-max-length]
-line-length=72
-
-# default 80
-[body-max-line-length]
-line-length=72

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cloud-hypervisor"
-version = "38.0.0"
+version = "36.1.0"
 authors = ["The Cloud Hypervisor Authors"]
 edition = "2021"
 default-run = "cloud-hypervisor"
@@ -15,7 +15,7 @@ homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor"
 # a.) A dependency requires it,
 # b.) If we want to use a new feature and that MSRV is at least 6 months old,
 # c.) There is a security issue that is addressed by the toolchain update.
-rust-version = "1.70"
+rust-version = "1.66"
 
 [profile.release]
 lto = true
@@ -29,37 +29,38 @@ strip = false
 debug = true
 
 [dependencies]
-anyhow = "1.0.79"
+anyhow = "1.0.75"
 api_client = { path = "api_client" }
-clap = { version = "4.4.7", features = ["string"] }
+clap = { version = "4.3.11", features = ["string"] }
-dhat = { version = "0.3.3", optional = true }
+dhat = { version = "0.3.2", optional = true }
 epoll = "4.3.3"
 event_monitor = { path = "event_monitor" }
 hypervisor = { path = "hypervisor" }
-libc = "0.2.153"
+libc = "0.2.147"
-log = { version = "0.4.20", features = ["std"] }
+log = { version = "0.4.17", features = ["std"] }
 option_parser = { path = "option_parser" }
 seccompiler = "0.4.0"
-serde_json = "1.0.109"
+serde_json = "1.0.107"
 signal-hook = "0.3.17"
-thiserror = "1.0.52"
+thiserror = "1.0.40"
 tpm = { path = "tpm"}
 tracer = { path = "tracer" }
 vmm = { path = "vmm" }
-vmm-sys-util = "0.12.1"
+vmm-sys-util = "0.11.0"
-vm-memory = "0.14.0"
+vm-memory = "0.12.2"
 zbus = { version = "3.11.1", optional = true }
 
 # List of patched crates
 [patch.crates-io]
-kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.7.0" }
+kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.6.0-tdx" }
-versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch-0.1.6" }
+kvm-ioctls = { git = "https://github.com/rust-vmm/kvm-ioctls", branch = "main" }
+versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch" }
 
 [dev-dependencies]
 dirs = "5.0.0"
 net_util = { path = "net_util" }
-once_cell = "1.19.0"
+once_cell = "1.18.0"
-serde_json = "1.0.109"
+serde_json = "1.0.107"
 test_infra = { path = "test_infra" }
 wait-timeout = "0.2.0"
 
@@ -70,11 +71,10 @@ default = ["kvm", "io_uring"]
 dbus_api = ["zbus", "vmm/dbus_api"]
 dhat-heap = ["dhat"] # For heap profiling
 guest_debug = ["vmm/guest_debug"]
-igvm = ["vmm/igvm", "mshv"]
 io_uring = ["vmm/io_uring"]
 kvm = ["vmm/kvm"]
 mshv = ["vmm/mshv"]
-sev_snp = ["igvm", "vmm/sev_snp", "mshv"]
+sev_snp = ["vmm/sev_snp", "mshv"]
 tdx = ["vmm/tdx"]
 tracing = ["vmm/tracing", "tracer/tracing"]
 

Jenkinsfile

@@ -53,9 +53,6 @@ pipeline {
                             return runWorkers
                         }
                     }
-                    environment {
-                        AUTH_DOWNLOAD_TOKEN = credentials('8a26fd74-d40e-414c-9132-ff3f867806ef')
-                    }
                     stages {
                         stage('Checkout') {
                             steps {
@@ -67,6 +64,11 @@ pipeline {
                                 sh 'scripts/prepare_vdpa.sh'
                             }
                         }
+                        stage('Run OpenAPI tests') {
+                            steps {
+                                sh 'scripts/run_openapi_tests.sh'
+                            }
+                        }
                         stage('Run unit tests') {
                             steps {
                                 sh 'scripts/dev_cli.sh tests --unit'
@@ -123,9 +125,6 @@ pipeline {
                             return runWorkers
                         }
                     }
-                    environment {
-                        AUTH_DOWNLOAD_TOKEN = credentials('8a26fd74-d40e-414c-9132-ff3f867806ef')
-                    }
                     stages {
                         stage('Checkout') {
                             steps {
@@ -143,7 +142,7 @@ pipeline {
                             }
                             steps {
                                 sh 'sudo modprobe openvswitch'
-                                sh 'scripts/dev_cli.sh tests --integration'
+                                sh 'scripts/dev_cli.sh tests --integration -- -- --skip common_parallel::test_vfio'
                             }
                         }
                         stage('Run live-migration integration tests') {
@@ -161,7 +160,7 @@ pipeline {
                             }
                             steps {
                                 sh 'sudo modprobe openvswitch'
-                                sh 'scripts/dev_cli.sh tests --integration --libc musl'
+                                sh 'scripts/dev_cli.sh tests --integration --libc musl -- -- --skip common_parallel::test_vfio'
                             }
                         }
                         stage('Run live-migration integration tests for musl') {
@@ -365,9 +364,6 @@ pipeline {
                             }
                         }
                     }
-                    environment {
-                        AUTH_DOWNLOAD_TOKEN = credentials('8a26fd74-d40e-414c-9132-ff3f867806ef')
-                    }
                     stages {
                         stage('Checkout') {
                             steps {
@@ -409,9 +405,6 @@ pipeline {
                             }
                         }
                     }
-                    environment {
-                        AUTH_DOWNLOAD_TOKEN = credentials('8a26fd74-d40e-414c-9132-ff3f867806ef')
-                    }
                     stages {
                         stage('Checkout') {
                             steps {
@@ -512,19 +505,5 @@ def boolean skipWorkerBuild() {
         return true
     }
 
-    if (sh(
-        returnStatus: true,
-        script: "git diff --name-only origin/${env.CHANGE_TARGET}... | grep -v '^\\.'"
-    ) != 0) {
-        return true
-    }
-
-    if (sh(
-        returnStatus: true,
-        script: "git diff --name-only origin/${env.CHANGE_TARGET}... | grep -v 'gitlint'"
-    ) != 0) {
-        return true
-    }
-
     return false
 }

api_client/Cargo.toml

@@ -5,4 +5,4 @@ authors = ["The Cloud Hypervisor Authors"]
 edition = "2021"
 
 [dependencies]
-vmm-sys-util = "0.12.1"
+vmm-sys-util = "0.11.0"

arch/Cargo.toml

@@ -10,20 +10,20 @@ sev_snp = []
 tdx = []
 
 [dependencies]
-anyhow = "1.0.79"
+anyhow = "1.0.75"
 byteorder = "1.4.3"
 hypervisor = { path = "../hypervisor" }
-libc = "0.2.153"
+libc = "0.2.147"
-linux-loader = { version = "0.11.0", features = ["elf", "bzimage", "pe"] }
+linux-loader = { version = "0.9.1", features = ["elf", "bzimage", "pe"] }
-log = "0.4.20"
+log = "0.4.17"
-serde = { version = "1.0.196", features = ["rc", "derive"] }
+serde = { version = "1.0.168", features = ["rc", "derive"] }
-thiserror = "1.0.52"
+thiserror = "1.0.40"
 uuid = "1.3.4"
-versionize = "0.2.0"
+versionize = "0.1.10"
-versionize_derive = "0.1.6"
+versionize_derive = "0.1.4"
-vm-memory = { version = "0.14.0", features = ["backend-mmap", "backend-bitmap"] }
+vm-memory = { version = "0.12.2", features = ["backend-mmap", "backend-bitmap"] }
 vm-migration = { path = "../vm-migration" }
-vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
+vmm-sys-util = { version = "0.11.0", features = ["with-serde"] }
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
 fdt_parser = { version = "0.1.4", package = "fdt" }

arch/src/aarch64/layout.rs

@@ -111,9 +111,8 @@ pub const RAM_64BIT_START: GuestAddress = GuestAddress(0x1_0000_0000);
 pub const CMDLINE_MAX_SIZE: usize = 2048;
 
 /// FDT is at the beginning of RAM.
+/// Maximum size of the device tree blob as specified in https://www.kernel.org/doc/Documentation/arm64/booting.txt.
 pub const FDT_START: GuestAddress = RAM_START;
-/// Maximum size of the device tree blob as specified in [the kernel
-/// documentation](https://www.kernel.org/doc/Documentation/arm64/booting.txt).
 pub const FDT_MAX_SIZE: u64 = 0x20_0000;
 
 /// Put ACPI table above dtb

arch/src/aarch64/uefi.rs

@@ -1,9 +1,8 @@
 // Copyright 2020 Arm Limited (or its affiliates). All rights reserved.
 
 use std::io::{Read, Seek, SeekFrom};
-use std::os::fd::AsFd;
 use std::result;
-use vm_memory::{GuestAddress, GuestMemory};
+use vm_memory::{Bytes, GuestAddress, GuestMemory};
 
 /// Errors thrown while loading UEFI binary
 #[derive(Debug)]
@@ -25,7 +24,7 @@ pub fn load_uefi<F, M: GuestMemory>(
     uefi_image: &mut F,
 ) -> Result<()>
 where
-    F: Read + Seek + AsFd,
+    F: Read + Seek,
 {
     let uefi_size = uefi_image
         .seek(SeekFrom::End(0))
@@ -37,6 +36,6 @@ where
     }
     uefi_image.rewind().map_err(|_| Error::SeekUefiStart)?;
     guest_mem
-        .read_exact_volatile_from(guest_addr, &mut uefi_image.as_fd(), uefi_size)
+        .read_exact_from(guest_addr, uefi_image, uefi_size)
         .map_err(|_| Error::ReadUefiImage)
 }

arch/src/lib.rs

@@ -91,9 +91,8 @@ pub mod x86_64;
 #[cfg(target_arch = "x86_64")]
 pub use x86_64::{
     arch_memory_regions, configure_system, configure_vcpu, generate_common_cpuid,
-    generate_ram_ranges, get_host_cpu_phys_bits, initramfs_load_addr, layout,
+    get_host_cpu_phys_bits, initramfs_load_addr, layout, layout::CMDLINE_MAX_SIZE,
-    layout::CMDLINE_MAX_SIZE, layout::CMDLINE_START, regs, CpuidConfig, CpuidFeatureEntry,
+    layout::CMDLINE_START, regs, CpuidConfig, CpuidFeatureEntry, EntryPoint, _NSIG,
-    EntryPoint, _NSIG,
 };
 
 /// Safe wrapper for `sysconf(_SC_PAGESIZE)`.

arch/src/x86_64/mod.rs

@@ -17,13 +17,14 @@ use crate::InitramfsConfig;
 use crate::RegionType;
 use hypervisor::arch::x86::{CpuIdEntry, CPUID_FLAG_VALID_INDEX};
 use hypervisor::{CpuVendor, HypervisorCpuError, HypervisorError};
+use linux_loader::loader::bootparam::boot_params;
 use linux_loader::loader::elf::start_info::{
     hvm_memmap_table_entry, hvm_modlist_entry, hvm_start_info,
 };
 use std::collections::BTreeMap;
 use std::mem;
 use vm_memory::{
-    Address, Bytes, GuestAddress, GuestAddressSpace, GuestMemory, GuestMemoryAtomic,
+    Address, ByteValued, Bytes, GuestAddress, GuestAddressSpace, GuestMemory, GuestMemoryAtomic,
     GuestMemoryRegion, GuestUsize,
 };
 mod smbios;
@@ -115,6 +116,38 @@ impl SgxEpcRegion {
     }
 }
 
+// This is a workaround to the Rust enforcement specifying that any implementation of a foreign
+// trait (in this case `DataInit`) where:
+// *    the type that is implementing the trait is foreign or
+// *    all of the parameters being passed to the trait (if there are any) are also foreign
+// is prohibited.
+#[derive(Copy, Clone, Default)]
+struct StartInfoWrapper(hvm_start_info);
+
+#[derive(Copy, Clone, Default)]
+struct MemmapTableEntryWrapper(hvm_memmap_table_entry);
+
+#[derive(Copy, Clone, Default)]
+struct ModlistEntryWrapper(hvm_modlist_entry);
+
+// SAFETY: data structure only contain a series of integers
+unsafe impl ByteValued for StartInfoWrapper {}
+// SAFETY: data structure only contain a series of integers
+unsafe impl ByteValued for MemmapTableEntryWrapper {}
+// SAFETY: data structure only contain a series of integers
+unsafe impl ByteValued for ModlistEntryWrapper {}
+
+// This is a workaround to the Rust enforcement specifying that any implementation of a foreign
+// trait (in this case `DataInit`) where:
+// *    the type that is implementing the trait is foreign or
+// *    all of the parameters being passed to the trait (if there are any) are also foreign
+// is prohibited.
+#[derive(Copy, Clone, Default)]
+struct BootParamsWrapper(boot_params);
+
+// SAFETY: BootParamsWrap is a wrapper over `boot_params` (a series of ints).
+unsafe impl ByteValued for BootParamsWrapper {}
+
 pub struct CpuidConfig {
     pub sgx_epc_sections: Option<Vec<SgxEpcSection>>,
     pub phys_bits: u8,
@@ -188,26 +221,6 @@ impl From<Error> for super::Error {
     }
 }
 
-pub fn get_x2apic_id(cpu_id: u32, topology: Option<(u8, u8, u8)>) -> u32 {
-    if let Some(t) = topology {
-        let thread_mask_width = u8::BITS - (t.0 - 1).leading_zeros();
-        let core_mask_width = u8::BITS - (t.1 - 1).leading_zeros();
-        let die_mask_width = u8::BITS - (t.2 - 1).leading_zeros();
-
-        let thread_id = cpu_id % (t.0 as u32);
-        let core_id = cpu_id / (t.0 as u32) % (t.1 as u32);
-        let die_id = cpu_id / ((t.0 * t.1) as u32) % (t.2 as u32);
-        let socket_id = cpu_id / ((t.0 * t.1 * t.2) as u32);
-
-        return thread_id
-            | (core_id << thread_mask_width)
-            | (die_id << (thread_mask_width + core_mask_width))
-            | (socket_id << (thread_mask_width + core_mask_width + die_mask_width));
-    }
-
-    cpu_id
-}
-
 #[derive(Copy, Clone, Debug)]
 pub enum CpuidReg {
     EAX,
@@ -227,26 +240,6 @@ pub struct CpuidPatch {
 }
 
 impl CpuidPatch {
-    pub fn get_cpuid_reg(
-        cpuid: &[CpuIdEntry],
-        function: u32,
-        index: Option<u32>,
-        reg: CpuidReg,
-    ) -> Option<u32> {
-        for entry in cpuid.iter() {
-            if entry.function == function && (index.is_none() || index.unwrap() == entry.index) {
-                return match reg {
-                    CpuidReg::EAX => Some(entry.eax),
-                    CpuidReg::EBX => Some(entry.ebx),
-                    CpuidReg::ECX => Some(entry.ecx),
-                    CpuidReg::EDX => Some(entry.edx),
-                };
-            }
-        }
-
-        None
-    }
-
     pub fn set_cpuid_reg(
         cpuid: &mut Vec<CpuIdEntry>,
         function: u32,
@@ -784,27 +777,31 @@ pub fn configure_vcpu(
     cpu_vendor: CpuVendor,
     topology: Option<(u8, u8, u8)>,
 ) -> super::Result<()> {
-    let x2apic_id = get_x2apic_id(id as u32, topology);
-
     // Per vCPU CPUID changes; common are handled via generate_common_cpuid()
     let mut cpuid = cpuid;
-    CpuidPatch::set_cpuid_reg(&mut cpuid, 0xb, None, CpuidReg::EDX, x2apic_id);
+    CpuidPatch::set_cpuid_reg(&mut cpuid, 0xb, None, CpuidReg::EDX, u32::from(id));
-    CpuidPatch::set_cpuid_reg(&mut cpuid, 0x1f, None, CpuidReg::EDX, x2apic_id);
+    CpuidPatch::set_cpuid_reg(&mut cpuid, 0x1f, None, CpuidReg::EDX, u32::from(id));
     if matches!(cpu_vendor, CpuVendor::AMD) {
-        CpuidPatch::set_cpuid_reg(&mut cpuid, 0x8000_001e, Some(0), CpuidReg::EAX, x2apic_id);
+        CpuidPatch::set_cpuid_reg(
+            &mut cpuid,
+            0x8000_001e,
+            Some(0),
+            CpuidReg::EAX,
+            u32::from(id),
+        );
+    }
+
+    if let Some(t) = topology {
+        update_cpuid_topology(&mut cpuid, t.0, t.1, t.2, cpu_vendor, id);
     }
 
     // Set ApicId in cpuid for each vcpu
     // SAFETY: get host cpuid when eax=1
     let mut cpu_ebx = unsafe { core::arch::x86_64::__cpuid(1) }.ebx;
     cpu_ebx &= 0xffffff;
-    cpu_ebx |= x2apic_id << 24;
+    cpu_ebx |= (id as u32) << 24;
     CpuidPatch::set_cpuid_reg(&mut cpuid, 0x1, None, CpuidReg::EBX, cpu_ebx);
 
-    if let Some(t) = topology {
-        update_cpuid_topology(&mut cpuid, t.0, t.1, t.2, cpu_vendor, id);
-    }
-
     // The TSC frequency CPUID leaf should not be included when running with HyperV emulation
     if !kvm_hyperv {
         if let Some(tsc_khz) = vcpu.tsc_khz().map_err(Error::GetTscFrequency)? {
@@ -899,7 +896,6 @@ pub fn configure_system(
     serial_number: Option<&str>,
     uuid: Option<&str>,
     oem_strings: Option<&[&str]>,
-    topology: Option<(u8, u8, u8)>,
 ) -> super::Result<()> {
     // Write EBDA address to location where ACPICA expects to find it
     guest_mem
@@ -912,7 +908,7 @@ pub fn configure_system(
     // Place the MP table after the SMIOS table aligned to 16 bytes
     let offset = GuestAddress(layout::SMBIOS_START).unchecked_add(size);
     let offset = GuestAddress((offset.0 + 16) & !0xf);
-    mptable::setup_mptable(offset, guest_mem, _num_cpus, topology).map_err(Error::MpTableSetup)?;
+    mptable::setup_mptable(offset, guest_mem, _num_cpus).map_err(Error::MpTableSetup)?;
 
     // Check that the RAM is not smaller than the RSDP start address
     if let Some(rsdp_addr) = rsdp_addr {
@@ -930,11 +926,52 @@ pub fn configure_system(
     )
 }
 
-type RamRange = (u64, u64);
+fn configure_pvh(
+    guest_mem: &GuestMemoryMmap,
+    cmdline_addr: GuestAddress,
+    initramfs: &Option<InitramfsConfig>,
+    rsdp_addr: Option<GuestAddress>,
+    sgx_epc_region: Option<SgxEpcRegion>,
+) -> super::Result<()> {
+    const XEN_HVM_START_MAGIC_VALUE: u32 = 0x336ec578;
+
+    let mut start_info: StartInfoWrapper = StartInfoWrapper(hvm_start_info::default());
+
+    start_info.0.magic = XEN_HVM_START_MAGIC_VALUE;
+    start_info.0.version = 1; // pvh has version 1
+    start_info.0.nr_modules = 0;
+    start_info.0.cmdline_paddr = cmdline_addr.raw_value();
+    start_info.0.memmap_paddr = layout::MEMMAP_START.raw_value();
+
+    if let Some(rsdp_addr) = rsdp_addr {
+        start_info.0.rsdp_paddr = rsdp_addr.0;
+    }
+
+    if let Some(initramfs_config) = initramfs {
+        // The initramfs has been written to guest memory already, here we just need to
+        // create the module structure that describes it.
+        let ramdisk_mod: ModlistEntryWrapper = ModlistEntryWrapper(hvm_modlist_entry {
+            paddr: initramfs_config.address.raw_value(),
+            size: initramfs_config.size as u64,
+            ..Default::default()
+        });
+
+        start_info.0.nr_modules += 1;
+        start_info.0.modlist_paddr = layout::MODLIST_START.raw_value();
+
+        // Write the modlist struct to guest memory.
+        guest_mem
+            .write_obj(ramdisk_mod, layout::MODLIST_START)
+            .map_err(super::Error::ModlistSetup)?;
+    }
+
+    // Vector to hold the memory maps which needs to be written to guest memory
+    // at MEMMAP_START after all of the mappings are recorded.
+    let mut memmap: Vec<hvm_memmap_table_entry> = Vec::new();
+
+    // Create the memory map entries.
+    add_memmap_entry(&mut memmap, 0, layout::EBDA_START.raw_value(), E820_RAM);
 
-/// Returns usable physical memory ranges for the guest
-/// These should be used to create e820_RAM memory maps
-pub fn generate_ram_ranges(guest_mem: &GuestMemoryMmap) -> super::Result<Vec<RamRange>> {
     // Merge continuous memory regions into one region.
     // Note: memory regions from "GuestMemory" are sorted and non-zero sized.
     let ram_regions = {
@@ -967,12 +1004,16 @@ pub fn generate_ram_ranges(guest_mem: &GuestMemoryMmap) -> super::Result<Vec<Ram
         ram_regions
     };
 
-    // Create the memory map entry for memory region before the gap
+    if ram_regions.len() > 2 {
-    let mut ram_ranges = vec![];
+        error!(
+            "There should be up to two non-continuous regions, devidided by the
+            gap at the end of 32bit address space (e.g. between 3G and 4G)."
+        );
+        return Err(super::Error::MemmapTableSetup);
+    }
 
-    // Generate the first usable physical memory range before the gap. The e820 map
+    // Create the memory map entry for memory region before the gap
-    // should only report memory above 1MiB.
+    {
-    let first_ram_range = {
         let (first_region_start, first_region_end) =
             ram_regions.first().ok_or(super::Error::MemmapTableSetup)?;
         let high_ram_start = layout::HIGH_RAM_START.raw_value();
@@ -992,87 +1033,39 @@ pub fn generate_ram_ranges(guest_mem: &GuestMemoryMmap) -> super::Result<Vec<Ram
         }
 
         info!(
-            "first usable physical memory range, start: 0x{:08x}, end: 0x{:08x}",
+            "create_memmap_entry, start: 0x{:08x}, end: 0x{:08x}",
             high_ram_start, first_region_end
         );
 
-        (high_ram_start, *first_region_end)
+        add_memmap_entry(
-    };
+            &mut memmap,
-    ram_ranges.push(first_ram_range);
+            high_ram_start,
-
+            first_region_end - high_ram_start,
-    // Generate additional usable physical memory range after the gap if any.
+            E820_RAM,
-    for ram_region in ram_regions.iter().skip(1) {
-        info!(
-            "found usable physical memory range, start: 0x{:08x}, end: 0x{:08x}",
-            ram_region.0, ram_region.1
         );
-
-        ram_ranges.push(*ram_region);
     }
 
-    Ok(ram_ranges)
+    // Create the memory map entry for memory region after the gap if any
-}
+    if let Some((second_region_start, second_region_end)) = ram_regions.get(1) {
+        let ram_64bit_start = layout::RAM_64BIT_START.raw_value();
 
-fn configure_pvh(
+        if second_region_start != &ram_64bit_start {
-    guest_mem: &GuestMemoryMmap,
+            error!(
-    cmdline_addr: GuestAddress,
+                "Unexpected second memory region layout: start: 0x{:08x}, ram_64bit_start: 0x{:08x}",
-    initramfs: &Option<InitramfsConfig>,
+                second_region_start, ram_64bit_start
-    rsdp_addr: Option<GuestAddress>,
+            );
-    sgx_epc_region: Option<SgxEpcRegion>,
-) -> super::Result<()> {
-    const XEN_HVM_START_MAGIC_VALUE: u32 = 0x336ec578;
 
-    let mut start_info = hvm_start_info {
+            return Err(super::Error::MemmapTableSetup);
-        magic: XEN_HVM_START_MAGIC_VALUE,
+        }
-        version: 1, // pvh has version 1
-        nr_modules: 0,
-        cmdline_paddr: cmdline_addr.raw_value(),
-        memmap_paddr: layout::MEMMAP_START.raw_value(),
-        ..Default::default()
-    };
 
-    if let Some(rsdp_addr) = rsdp_addr {
-        start_info.rsdp_paddr = rsdp_addr.0;
-    }
-
-    if let Some(initramfs_config) = initramfs {
-        // The initramfs has been written to guest memory already, here we just need to
-        // create the module structure that describes it.
-        let ramdisk_mod = hvm_modlist_entry {
-            paddr: initramfs_config.address.raw_value(),
-            size: initramfs_config.size as u64,
-            ..Default::default()
-        };
-
-        start_info.nr_modules += 1;
-        start_info.modlist_paddr = layout::MODLIST_START.raw_value();
-
-        // Write the modlist struct to guest memory.
-        guest_mem
-            .write_obj(ramdisk_mod, layout::MODLIST_START)
-            .map_err(super::Error::ModlistSetup)?;
-    }
-
-    // Vector to hold the memory maps which needs to be written to guest memory
-    // at MEMMAP_START after all of the mappings are recorded.
-    let mut memmap: Vec<hvm_memmap_table_entry> = Vec::new();
-
-    // Create the memory map entries.
-    add_memmap_entry(&mut memmap, 0, layout::EBDA_START.raw_value(), E820_RAM);
-
-    // Get usable physical memory ranges
-    let ram_ranges = generate_ram_ranges(guest_mem)?;
-
-    // Create e820 memory map entries
-    for ram_range in ram_ranges {
         info!(
             "create_memmap_entry, start: 0x{:08x}, end: 0x{:08x}",
-            ram_range.0, ram_range.1
+            ram_64bit_start, second_region_end
         );
         add_memmap_entry(
             &mut memmap,
-            ram_range.0,
+            ram_64bit_start,
-            ram_range.1 - ram_range.0,
+            second_region_end - ram_64bit_start,
             E820_RAM,
         );
     }
@@ -1093,7 +1086,7 @@ fn configure_pvh(
         );
     }
 
-    start_info.memmap_entries = memmap.len() as u32;
+    start_info.0.memmap_entries = memmap.len() as u32;
 
     // Copy the vector with the memmap table to the MEMMAP_START address
     // which is already saved in the memmap_paddr field of hvm_start_info struct.
@@ -1102,14 +1095,17 @@ fn configure_pvh(
     guest_mem
         .checked_offset(
             memmap_start_addr,
-            mem::size_of::<hvm_memmap_table_entry>() * start_info.memmap_entries as usize,
+            mem::size_of::<hvm_memmap_table_entry>() * start_info.0.memmap_entries as usize,
         )
         .ok_or(super::Error::MemmapTablePastRamEnd)?;
 
-    // For every entry in the memmap vector, write it to guest memory.
+    // For every entry in the memmap vector, create a MemmapTableEntryWrapper
+    // and write it to guest memory.
     for memmap_entry in memmap {
+        let map_entry_wrapper: MemmapTableEntryWrapper = MemmapTableEntryWrapper(memmap_entry);
+
         guest_mem
-            .write_obj(memmap_entry, memmap_start_addr)
+            .write_obj(map_entry_wrapper, memmap_start_addr)
             .map_err(|_| super::Error::MemmapTableSetup)?;
         memmap_start_addr =
             memmap_start_addr.unchecked_add(mem::size_of::<hvm_memmap_table_entry>() as u64);
@@ -1195,24 +1191,10 @@ fn update_cpuid_topology(
     cpu_vendor: CpuVendor,
     id: u8,
 ) {
-    let x2apic_id = get_x2apic_id(
-        id as u32,
-        Some((threads_per_core, cores_per_die, dies_per_package)),
-    );
-
     let thread_width = 8 - (threads_per_core - 1).leading_zeros();
     let core_width = (8 - (cores_per_die - 1).leading_zeros()) + thread_width;
     let die_width = (8 - (dies_per_package - 1).leading_zeros()) + core_width;
 
-    let mut cpu_ebx = CpuidPatch::get_cpuid_reg(cpuid, 0x1, None, CpuidReg::EBX).unwrap_or(0);
-    cpu_ebx |= ((dies_per_package as u32) * (cores_per_die as u32) * (threads_per_core as u32))
-        & 0xff << 16;
-    CpuidPatch::set_cpuid_reg(cpuid, 0x1, None, CpuidReg::EBX, cpu_ebx);
-
-    let mut cpu_edx = CpuidPatch::get_cpuid_reg(cpuid, 0x1, None, CpuidReg::EDX).unwrap_or(0);
-    cpu_edx |= 1 << 28;
-    CpuidPatch::set_cpuid_reg(cpuid, 0x1, None, CpuidReg::EDX, cpu_edx);
-
     // CPU Topology leaf 0xb
     CpuidPatch::set_cpuid_reg(cpuid, 0xb, Some(0), CpuidReg::EAX, thread_width);
     CpuidPatch::set_cpuid_reg(
@@ -1271,7 +1253,7 @@ fn update_cpuid_topology(
             0x8000_001e,
             Some(0),
             CpuidReg::EBX,
-            ((threads_per_core as u32 - 1) << 8) | (x2apic_id & 0xff),
+            ((threads_per_core as u32 - 1) << 8) | (id as u32 & 0xff),
         );
         CpuidPatch::set_cpuid_reg(
             cpuid,
@@ -1282,21 +1264,21 @@ fn update_cpuid_topology(
         );
         CpuidPatch::set_cpuid_reg(cpuid, 0x8000_001e, Some(0), CpuidReg::EDX, 0);
         if cores_per_die * threads_per_core > 1 {
-            let ecx =
-                CpuidPatch::get_cpuid_reg(cpuid, 0x8000_0001, Some(0), CpuidReg::ECX).unwrap_or(0);
             CpuidPatch::set_cpuid_reg(
                 cpuid,
                 0x8000_0001,
                 Some(0),
                 CpuidReg::ECX,
-                ecx | (1u32 << 1) | (1u32 << 22),
+                (1u32 << 1) | (1u32 << 22),
             );
             CpuidPatch::set_cpuid_reg(
                 cpuid,
                 0x0000_0001,
                 Some(0),
                 CpuidReg::EBX,
-                (x2apic_id << 24) | (8 << 8) | (((cores_per_die * threads_per_core) as u32) << 16),
+                ((id as u32) << 24)
+                    | (8 << 8)
+                    | (((cores_per_die * threads_per_core) as u32) << 16),
             );
             let cpuid_patches = vec![
                 // Patch tsc deadline timer bit
@@ -1401,7 +1383,6 @@ mod tests {
             None,
             None,
             None,
-            None,
         );
         assert!(config_err.is_err());
 
@@ -1424,7 +1405,6 @@ mod tests {
             None,
             None,
             None,
-            None,
         )
         .unwrap();
 
@@ -1452,7 +1432,6 @@ mod tests {
             None,
             None,
             None,
-            None,
         )
         .unwrap();
 
@@ -1466,7 +1445,6 @@ mod tests {
             None,
             None,
             None,
-            None,
         )
         .unwrap();
     }
@@ -1495,25 +1473,4 @@ mod tests {
 
         assert_eq!(format!("{memmap:?}"), format!("{expected_memmap:?}"));
     }
-
-    #[test]
-    fn test_get_x2apic_id() {
-        let x2apic_id = get_x2apic_id(0, Some((2, 3, 1)));
-        assert_eq!(x2apic_id, 0);
-
-        let x2apic_id = get_x2apic_id(1, Some((2, 3, 1)));
-        assert_eq!(x2apic_id, 1);
-
-        let x2apic_id = get_x2apic_id(2, Some((2, 3, 1)));
-        assert_eq!(x2apic_id, 2);
-
-        let x2apic_id = get_x2apic_id(6, Some((2, 3, 1)));
-        assert_eq!(x2apic_id, 8);
-
-        let x2apic_id = get_x2apic_id(7, Some((2, 3, 1)));
-        assert_eq!(x2apic_id, 9);
-
-        let x2apic_id = get_x2apic_id(8, Some((2, 3, 1)));
-        assert_eq!(x2apic_id, 10);
-    }
 }

arch/src/x86_64/mptable.rs

@@ -6,9 +6,10 @@
 // found in the LICENSE-BSD-3-Clause file.
 
 use crate::layout::{APIC_START, HIGH_RAM_START, IOAPIC_START};
-use crate::x86_64::{get_x2apic_id, mpspec};
+use crate::x86_64::mpspec;
 use crate::GuestMemoryMmap;
 use libc::c_char;
+use std::io;
 use std::mem;
 use std::result;
 use std::slice;
@@ -125,18 +126,9 @@ fn compute_mp_size(num_cpus: u8) -> usize {
 }
 
 /// Performs setup of the MP table for the given `num_cpus`.
-pub fn setup_mptable(
+pub fn setup_mptable(offset: GuestAddress, mem: &GuestMemoryMmap, num_cpus: u8) -> Result<()> {
-    offset: GuestAddress,
+    if num_cpus as u32 > MAX_SUPPORTED_CPUS {
-    mem: &GuestMemoryMmap,
+        return Err(Error::TooManyCpus);
-    num_cpus: u8,
-    topology: Option<(u8, u8, u8)>,
-) -> Result<()> {
-    if num_cpus > 0 {
-        let cpu_id_max = num_cpus - 1;
-        let x2apic_id_max = get_x2apic_id(cpu_id_max.into(), topology);
-        if x2apic_id_max >= MAX_SUPPORTED_CPUS {
-            return Err(Error::TooManyCpus);
-        }
     }
 
     // Used to keep track of the next base pointer into the MP table.
@@ -150,7 +142,7 @@ pub fn setup_mptable(
     }
 
     let mut checksum: u8 = 0;
-    let ioapicid: u8 = MAX_SUPPORTED_CPUS as u8 + 1;
+    let ioapicid: u8 = num_cpus + 1;
 
     // The checked_add here ensures the all of the following base_mp.unchecked_add's will be without
     // overflow.
@@ -162,7 +154,7 @@ pub fn setup_mptable(
         return Err(Error::AddressOverflow);
     }
 
-    mem.read_exact_volatile_from(base_mp, &mut vec![0; mp_size].as_slice(), mp_size)
+    mem.read_exact_from(base_mp, &mut io::repeat(0), mp_size)
         .map_err(Error::Clear)?;
 
     {
@@ -188,7 +180,7 @@ pub fn setup_mptable(
         for cpu_id in 0..num_cpus {
             let mut mpc_cpu = MpcCpuWrapper(mpspec::mpc_cpu::default());
             mpc_cpu.0.type_ = mpspec::MP_PROCESSOR as u8;
-            mpc_cpu.0.apicid = get_x2apic_id(cpu_id as u32, topology) as u8;
+            mpc_cpu.0.apicid = cpu_id;
             mpc_cpu.0.apicver = APIC_VERSION;
             mpc_cpu.0.cpuflag = mpspec::CPU_ENABLED as u8
                 | if cpu_id == 0 {
@@ -299,10 +291,7 @@ pub fn setup_mptable(
 mod tests {
     use super::*;
     use crate::layout::MPTABLE_START;
-    use vm_memory::{
+    use vm_memory::{GuestAddress, GuestUsize};
-        bitmap::BitmapSlice, GuestAddress, GuestUsize, VolatileMemoryError, VolatileSlice,
-        WriteVolatile,
-    };
 
     fn table_entry_size(type_: u8) -> usize {
         match type_ as u32 {
@@ -321,7 +310,7 @@ mod tests {
         let mem =
             GuestMemoryMmap::from_ranges(&[(MPTABLE_START, compute_mp_size(num_cpus))]).unwrap();
 
-        setup_mptable(MPTABLE_START, &mem, num_cpus, None).unwrap();
+        setup_mptable(MPTABLE_START, &mem, num_cpus).unwrap();
     }
 
     #[test]
@@ -330,7 +319,7 @@ mod tests {
         let mem = GuestMemoryMmap::from_ranges(&[(MPTABLE_START, compute_mp_size(num_cpus) - 1)])
             .unwrap();
 
-        assert!(setup_mptable(MPTABLE_START, &mem, num_cpus, None).is_err());
+        assert!(setup_mptable(MPTABLE_START, &mem, num_cpus).is_err());
     }
 
     #[test]
@@ -339,7 +328,7 @@ mod tests {
         let mem =
             GuestMemoryMmap::from_ranges(&[(MPTABLE_START, compute_mp_size(num_cpus))]).unwrap();
 
-        setup_mptable(MPTABLE_START, &mem, num_cpus, None).unwrap();
+        setup_mptable(MPTABLE_START, &mem, num_cpus).unwrap();
 
         let mpf_intel: MpfIntelWrapper = mem.read_obj(MPTABLE_START).unwrap();
 
@@ -355,31 +344,27 @@ mod tests {
         let mem =
             GuestMemoryMmap::from_ranges(&[(MPTABLE_START, compute_mp_size(num_cpus))]).unwrap();
 
-        setup_mptable(MPTABLE_START, &mem, num_cpus, None).unwrap();
+        setup_mptable(MPTABLE_START, &mem, num_cpus).unwrap();
 
         let mpf_intel: MpfIntelWrapper = mem.read_obj(MPTABLE_START).unwrap();
         let mpc_offset = GuestAddress(mpf_intel.0.physptr as GuestUsize);
         let mpc_table: MpcTableWrapper = mem.read_obj(mpc_offset).unwrap();
 
         struct Sum(u8);
-        impl WriteVolatile for Sum {
+        impl io::Write for Sum {
-            fn write_volatile<B: BitmapSlice>(
+            fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-                &mut self,
+                for v in buf.iter() {
-                buf: &VolatileSlice<B>,
-            ) -> result::Result<usize, VolatileMemoryError> {
-                let mut tmp = vec![0u8; buf.len()];
-                tmp.write_all_volatile(buf)?;
-
-                for v in tmp.iter() {
                     self.0 = self.0.wrapping_add(*v);
                 }
-
                 Ok(buf.len())
             }
+            fn flush(&mut self) -> io::Result<()> {
+                Ok(())
+            }
         }
 
         let mut sum = Sum(0);
-        mem.write_volatile_to(mpc_offset, &mut sum, mpc_table.0.length as usize)
+        mem.write_to(mpc_offset, &mut sum, mpc_table.0.length as usize)
             .unwrap();
         assert_eq!(sum.0, 0);
     }
@@ -393,7 +378,7 @@ mod tests {
         .unwrap();
 
         for i in 0..MAX_SUPPORTED_CPUS as u8 {
-            setup_mptable(MPTABLE_START, &mem, i, None).unwrap();
+            setup_mptable(MPTABLE_START, &mem, i).unwrap();
 
             let mpf_intel: MpfIntelWrapper = mem.read_obj(MPTABLE_START).unwrap();
             let mpc_offset = GuestAddress(mpf_intel.0.physptr as GuestUsize);
@@ -426,7 +411,7 @@ mod tests {
         let mem =
             GuestMemoryMmap::from_ranges(&[(MPTABLE_START, compute_mp_size(cpus as u8))]).unwrap();
 
-        let result = setup_mptable(MPTABLE_START, &mem, cpus as u8, None);
+        let result = setup_mptable(MPTABLE_START, &mem, cpus as u8);
         assert!(result.is_err());
     }
 }

block/Cargo.toml

@@ -10,18 +10,18 @@ io_uring = ["dep:io-uring"]
 
 [dependencies]
 byteorder = "1.4.3"
-crc-any = "2.4.4"
+crc32c = "0.6.4"
-io-uring = { version = "0.6.2", optional = true }
+io-uring = { version = "0.6.1", optional = true }
-libc = "0.2.153"
+libc = "0.2.147"
-log = "0.4.20"
+log = "0.4.17"
 remain = "0.2.11"
-smallvec = "1.13.1"
+smallvec = "1.11.0"
-thiserror = "1.0.52"
+thiserror = "1.0.40"
 uuid = { version = "1.3.4", features = ["v4"] }
-versionize = "0.2.0"
+versionize = "0.1.10"
-versionize_derive = "0.1.6"
+versionize_derive = "0.1.4"
 virtio-bindings = { version = "0.2.0", features = ["virtio-v5_0_0"] }
-virtio-queue = "0.11.0"
+virtio-queue = "0.9.0"
-vm-memory = { version = "0.14.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
+vm-memory = { version = "0.12.2", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
 vm-virtio = { path = "../vm-virtio" }
-vmm-sys-util = "0.12.1"
+vmm-sys-util = "0.11.0"

block/src/lib.rs

@@ -143,14 +143,10 @@ pub enum ExecuteError {
     Flush(io::Error),
     #[error("Failed to read: {0}")]
     Read(GuestMemoryError),
-    #[error("Failed to read_exact: {0}")]
-    ReadExact(io::Error),
     #[error("Failed to seek: {0}")]
     Seek(io::Error),
     #[error("Failed to write: {0}")]
     Write(GuestMemoryError),
-    #[error("Failed to write_all: {0}")]
-    WriteAll(io::Error),
     #[error("Unsupported request: {0}")]
     Unsupported(u32),
     #[error("Failed to submit io uring: {0}")]
@@ -173,10 +169,8 @@ impl ExecuteError {
             ExecuteError::BadRequest(_) => VIRTIO_BLK_S_IOERR,
             ExecuteError::Flush(_) => VIRTIO_BLK_S_IOERR,
             ExecuteError::Read(_) => VIRTIO_BLK_S_IOERR,
-            ExecuteError::ReadExact(_) => VIRTIO_BLK_S_IOERR,
             ExecuteError::Seek(_) => VIRTIO_BLK_S_IOERR,
             ExecuteError::Write(_) => VIRTIO_BLK_S_IOERR,
-            ExecuteError::WriteAll(_) => VIRTIO_BLK_S_IOERR,
             ExecuteError::Unsupported(_) => VIRTIO_BLK_S_UNSUPP,
             ExecuteError::SubmitIoUring(_) => VIRTIO_BLK_S_IOERR,
             ExecuteError::GetHostAddress(_) => VIRTIO_BLK_S_IOERR,
@@ -357,21 +351,13 @@ impl Request {
 
             match self.request_type {
                 RequestType::In => {
-                    let mut buf = vec![0u8; *data_len as usize];
+                    mem.read_exact_from(*data_addr, disk, *data_len as usize)
-                    disk.read_exact(&mut buf).map_err(ExecuteError::ReadExact)?;
+                        .map_err(ExecuteError::Read)?;
-                    mem.read_exact_volatile_from(
-                        *data_addr,
-                        &mut buf.as_slice(),
-                        *data_len as usize,
-                    )
-                    .map_err(ExecuteError::Read)?;
                     len += data_len;
                 }
                 RequestType::Out => {
-                    let mut buf: Vec<u8> = Vec::new();
+                    mem.write_all_to(*data_addr, disk, *data_len as usize)
-                    mem.write_all_volatile_to(*data_addr, &mut buf, *data_len as usize)
                         .map_err(ExecuteError::Write)?;
-                    disk.write_all(&buf).map_err(ExecuteError::WriteAll)?;
                     if !self.writeback {
                         disk.flush().map_err(ExecuteError::Flush)?;
                     }

block/src/qcow/vec_cache.rs

@@ -136,7 +136,7 @@ impl<T: Cacheable> CacheMap<T> {
 mod tests {
     use super::*;
 
-    struct NumCache(());
+    struct NumCache(pub u64);
     impl Cacheable for NumCache {
         fn dirty(&self) -> bool {
             true
@@ -148,28 +148,28 @@ mod tests {
         let mut cache = CacheMap::<NumCache>::new(3);
         let mut evicted = None;
         cache
-            .insert(0, NumCache(()), |index, _| {
+            .insert(0, NumCache(5), |index, _| {
                 evicted = Some(index);
                 Ok(())
             })
             .unwrap();
         assert_eq!(evicted, None);
         cache
-            .insert(1, NumCache(()), |index, _| {
+            .insert(1, NumCache(6), |index, _| {
                 evicted = Some(index);
                 Ok(())
             })
             .unwrap();
         assert_eq!(evicted, None);
         cache
-            .insert(2, NumCache(()), |index, _| {
+            .insert(2, NumCache(7), |index, _| {
                 evicted = Some(index);
                 Ok(())
             })
             .unwrap();
         assert_eq!(evicted, None);
         cache
-            .insert(3, NumCache(()), |index, _| {
+            .insert(3, NumCache(8), |index, _| {
                 evicted = Some(index);
                 Ok(())
             })

block/src/vhdx/vhdx_header.rs

@@ -192,9 +192,7 @@ impl Header {
         };
 
         new_header.get_header_as_buffer(&mut buffer);
-        let mut crc = crc_any::CRC::crc32c();
+        new_header.checksum = crc32c::crc32c(&buffer);
-        crc.digest(&buffer);
-        new_header.checksum = crc.get_crc() as u32;
         new_header.get_header_as_buffer(&mut buffer);
 
         f.seek(SeekFrom::Start(start))
@@ -353,6 +351,12 @@ impl RegionTableEntry {
     }
 }
 
+#[derive(Clone, Debug)]
+struct RegionEntry {
+    _start: u64,
+    _end: u64,
+}
+
 enum HeaderNo {
     First,
     Second,
@@ -476,10 +480,7 @@ pub fn calculate_checksum(buffer: &mut [u8], csum_offset: usize) -> Result<u32>
     // Zero the checksum in the buffer
     LittleEndian::write_u32(csum_buf, 0);
     // Calculate the checksum on the resulting buffer
-    let mut crc = crc_any::CRC::crc32c();
+    let new_csum = crc32c::crc32c(buffer);
-    crc.digest(&buffer);
-    let new_csum = crc.get_crc() as u32;
-
     // Put back the original checksum in the buffer
     LittleEndian::write_u32(&mut buffer[csum_offset..csum_offset + 4], orig_csum);
 

devices/Cargo.toml

@@ -6,24 +6,24 @@ edition = "2021"
 
 [dependencies]
 acpi_tables = { git = "https://github.com/rust-vmm/acpi_tables", branch = "main"  }
-anyhow = "1.0.79"
+anyhow = "1.0.75"
 arch = { path = "../arch" }
 bitflags = "2.4.1"
 byteorder = "1.4.3"
 event_monitor = { path = "../event_monitor" }
 hypervisor = { path = "../hypervisor" }
-libc = "0.2.153"
+libc = "0.2.147"
-log = "0.4.20"
+log = "0.4.17"
 pci = { path = "../pci" }
-thiserror = "1.0.52"
+thiserror = "1.0.40"
 tpm = { path = "../tpm" }
-versionize = "0.2.0"
+versionize = "0.1.10"
-versionize_derive = "0.1.6"
+versionize_derive = "0.1.4"
 vm-allocator = { path = "../vm-allocator" }
 vm-device = { path = "../vm-device" }
-vm-memory = "0.14.0"
+vm-memory = "0.12.2"
 vm-migration = { path = "../vm-migration" }
-vmm-sys-util = "0.12.1"
+vmm-sys-util = "0.11.0"
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
 arch = { path = "../arch" }

devices/src/debug_console.rs

@@ -1,64 +0,0 @@
-// Copyright © 2023 Cyberus Technology
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-//! Module for [`DebugconState`].
-
-use std::io;
-use std::io::Write;
-use std::sync::{Arc, Barrier};
-use vm_device::BusDevice;
-use vm_migration::{Migratable, MigratableError, Pausable, Snapshot, Snapshottable, Transportable};
-
-/// I/O-port.
-pub const DEFAULT_PORT: u64 = 0xe9;
-
-#[derive(Default)]
-pub struct DebugconState {}
-
-/// Emulates a debug console similar to the QEMU debugcon device. This device
-/// is stateless and only prints the bytes (usually text) that are written to
-/// it.
-///
-/// This device is only available on x86.
-///
-/// Reference:
-/// - https://github.com/qemu/qemu/blob/master/hw/char/debugcon.c
-/// - https://phip1611.de/blog/how-to-use-qemus-debugcon-feature-and-write-to-a-file/
-pub struct DebugConsole {
-    id: String,
-    out: Box<dyn io::Write + Send>,
-}
-
-impl DebugConsole {
-    pub fn new(id: String, out: Box<dyn io::Write + Send>) -> Self {
-        Self { id, out }
-    }
-}
-
-impl BusDevice for DebugConsole {
-    fn read(&mut self, _base: u64, _offset: u64, _data: &mut [u8]) {}
-
-    fn write(&mut self, _base: u64, _offset: u64, data: &[u8]) -> Option<Arc<Barrier>> {
-        if let Err(e) = self.out.write_all(data) {
-            // unlikely
-            error!("debug-console: failed writing data: {e:?}");
-        }
-        None
-    }
-}
-
-impl Snapshottable for DebugConsole {
-    fn id(&self) -> String {
-        self.id.clone()
-    }
-
-    fn snapshot(&mut self) -> Result<Snapshot, MigratableError> {
-        Snapshot::new_from_state(&())
-    }
-}
-
-impl Pausable for DebugConsole {}
-impl Transportable for DebugConsole {}
-impl Migratable for DebugConsole {}

devices/src/lib.rs

@@ -15,8 +15,6 @@ extern crate event_monitor;
 extern crate log;
 
 pub mod acpi;
-#[cfg(target_arch = "x86_64")]
-pub mod debug_console;
 #[cfg(target_arch = "aarch64")]
 pub mod gic;
 pub mod interrupt_controller;

devices/src/pvpanic.rs

@@ -181,9 +181,8 @@ impl PciDevice for PvPanicDevice {
 
     fn allocate_bars(
         &mut self,
-        _allocator: &Arc<Mutex<SystemAllocator>>,
+        allocator: &Arc<Mutex<SystemAllocator>>,
-        mmio32_allocator: &mut AddressAllocator,
+        _mmio_allocator: &mut AddressAllocator,
-        _mmio64_allocator: &mut AddressAllocator,
         resources: Option<Vec<Resource>>,
     ) -> std::result::Result<Vec<PciBarConfiguration>, PciDeviceError> {
         let mut bars = Vec::new();
@@ -191,8 +190,10 @@ impl PciDevice for PvPanicDevice {
         let bar_id = 0;
         let region_size = PVPANIC_DEVICE_MMIO_SIZE;
         let restoring = resources.is_some();
-        let bar_addr = mmio32_allocator
+        let bar_addr = allocator
-            .allocate(None, region_size, Some(PVPANIC_DEVICE_MMIO_ALIGNMENT))
+            .lock()
+            .unwrap()
+            .allocate_mmio_hole_addresses(None, region_size, Some(PVPANIC_DEVICE_MMIO_ALIGNMENT))
             .ok_or(PciDeviceError::IoAllocationFailed(region_size))?;
 
         let bar = PciBarConfiguration::default()
@@ -217,12 +218,11 @@ impl PciDevice for PvPanicDevice {
 
     fn free_bars(
         &mut self,
-        _allocator: &mut SystemAllocator,
+        allocator: &mut SystemAllocator,
-        mmio32_allocator: &mut AddressAllocator,
+        _mmio_allocator: &mut AddressAllocator,
-        _mmio64_allocator: &mut AddressAllocator,
     ) -> std::result::Result<(), PciDeviceError> {
         for bar in self.bar_regions.drain(..) {
-            mmio32_allocator.free(GuestAddress(bar.addr()), bar.size());
+            allocator.free_mmio_hole_addresses(GuestAddress(bar.addr()), bar.size());
         }
 
         Ok(())

docs/amd_sev_snp.md

@@ -36,5 +36,3 @@ You can run a SEV-SNP VM using the following command:
      --memory size=1G \
      --disk path=ubuntu.img
 ```
-
-For more information related to Microsoft Hypervisor please see [mshv.md](mshv.md)

docs/api.md

@@ -147,7 +147,7 @@ We want to create a virtual machine with the following characteristics:
   `/opt/clh/images/focal-server-cloudimg-amd64.raw`
 
 ```shell
-#!/usr/bin/env bash
+#!/bin/bash
 
 curl --unix-socket /tmp/cloud-hypervisor.sock -i \
      -X PUT 'http://localhost/api/v1/vm.create'  \
@@ -167,7 +167,7 @@ curl --unix-socket /tmp/cloud-hypervisor.sock -i \
 Once the VM is created, we can boot it:
 
 ```shell
-#!/usr/bin/env bash
+#!/bin/bash
 
 curl --unix-socket /tmp/cloud-hypervisor.sock -i -X PUT 'http://localhost/api/v1/vm.boot'
 ```
@@ -177,7 +177,7 @@ curl --unix-socket /tmp/cloud-hypervisor.sock -i -X PUT 'http://localhost/api/v1
 We can fetch information about any VM, as soon as it's created:
 
 ```shell
-#!/usr/bin/env bash
+#!/bin/bash
 
 curl --unix-socket /tmp/cloud-hypervisor.sock -i \
      -X GET 'http://localhost/api/v1/vm.info' \
@@ -189,7 +189,7 @@ curl --unix-socket /tmp/cloud-hypervisor.sock -i \
 We can reboot a VM that's already booted:
 
 ```shell
-#!/usr/bin/env bash
+#!/bin/bash
 
 curl --unix-socket /tmp/cloud-hypervisor.sock -i -X PUT 'http://localhost/api/v1/vm.reboot'
 ```
@@ -199,7 +199,7 @@ curl --unix-socket /tmp/cloud-hypervisor.sock -i -X PUT 'http://localhost/api/v1
 Once booted, we can shut a VM down from the REST API:
 
 ```shell
-#!/usr/bin/env bash
+#!/bin/bash
 
 curl --unix-socket /tmp/cloud-hypervisor.sock -i -X PUT 'http://localhost/api/v1/vm.shutdown'
 ```
@@ -385,7 +385,7 @@ APIs work together, let's look at a complete VM creation flow, from the
    [REST API](#rest-api) in order to creates a virtual machine:
    ```
    shell
-   #!/usr/bin/env bash
+   #!/bin/bash
 
 	curl --unix-socket /tmp/cloud-hypervisor.sock -i \
 		-X PUT 'http://localhost/api/v1/vm.create'  \

docs/debug-port.md

@@ -1,16 +1,7 @@
-# `cloud-hypervisor` debug IO ports
+# `cloud-hypervisor` debug IO port
 
-When running x86 guests, `cloud-hypervisor` provides different kinds of debug ports:
+`cloud-hypervisor` uses the [`0x80`](https://www.intel.com/content/www/us/en/support/articles/000005500/boards-and-kits.html)
-- [`0x80` debug port](https://www.intel.com/content/www/us/en/support/articles/000005500/boards-and-kits.html) 
+I/O port to trace user defined guest events.
-- Debug console (by default at `0xe9`). 
-- Firmware debug port at `0x402`.
-
-All of them can be used to trace user-defined guest events and all of them can
-be used simultaneously.
-
-## Debug Ports Overview
-
-### `0x80` I/O port
 
 Whenever the guest write one byte between `0x0` and `0xF` on this particular
 I/O port, `cloud-hypervisor` will log and timestamp that event at the `debug`
@@ -39,7 +30,7 @@ guest will have `cloud-hypervisor` generate timestamped logs of all those steps.
 That provides a basic but convenient way of measuring not only the overall guest
 boot time but all intermediate steps as well.
 
-#### Logging
+## Logging
 
 Assuming parts of the guest software stack have been instrumented to use the
 `cloud-hypervisor` debug I/O port, we may want to gather the related logs.
@@ -68,29 +59,3 @@ $ grep "Debug I/O port" /tmp/ch-fw.log
 cloud-hypervisor: 19.762449ms: DEBUG:vmm/src/vm.rs:510 -- [Debug I/O port: Firmware code 0x0] 0.019004 seconds
 cloud-hypervisor: 403.499628ms: DEBUG:vmm/src/vm.rs:510 -- [Debug I/O port: Firmware code 0x1] 0.402744 seconds
 ```
-
-### Debug console port
-
-The debug console is inspired by QEMU and Bochs, which have a similar feature. 
-By default, the I/O port `0xe9` is used. This port can be configured like a 
-console. Thus, it can print to a tty, a file, or a pty, for example.
-
-### Firmware debug port
-
-The firmware debug port is also a simple port that prints all bytes written to
-it. The firmware debug port only prints to stdout.
-
-## When do I need these ports?
-
-The ports are on the one hand interesting for firmware or kernel developers, as
-they provide an easy way to print debug information from within a guest. 
-Furthermore, you can patch "normal" software to measure certain events, such as
-the boot time of a guest.
-
-## Which port should I choose?
-
-The `0x80` debug port and the port of the firmware debug device are always
-available. The debug console must be activated via the command line, but
-provides more configuration options. 
-
-You can use different ports for different aspect of your logging messages. 

docs/intel_tdx.md

@@ -103,7 +103,7 @@ firmware:
 ### TDShim
 
 > **Note**
-> The latest version of TDShim being tested is [_v0.8.0_](https://github.com/confidential-containers/td-shim/releases/tag/v0.8.0).
+> The latest version of TDShim being tested is [_66bb334_](https://github.com/confidential-containers/td-shim/tree/66bb33451befbf1291abe3cfea7ee9e99d922b0d).
 
 This is a lightweight version of the TDVF, written in Rust and designed for
 direct kernel boot, which is useful for containers use cases.
@@ -113,7 +113,7 @@ and `LLVM` first. The TDshim can be build as follows:
 ```bash
 git clone https://github.com/confidential-containers/td-shim
 cd td-shim
-git checkout v0.8.0
+git checkout 66bb33451befbf1291abe3cfea7ee9e99d922b0d
 cargo install cargo-xbuild
 export CC=clang
 export AR=llvm-ar
@@ -121,13 +121,15 @@ export CC_x86_64_unknown_none=clang
 export AR_x86_64_unknown_none=llvm-ar
 git submodule update --init --recursive
 ./sh_script/preparation.sh
-cargo image --release
+cargo xbuild -p td-shim --target x86_64-unknown-none --release --features=main,tdx
+cargo run -p td-shim-tools --bin td-shim-ld --features=linker -- target/x86_64-unknown-none/release/ResetVector.bin target/x86_64-unknown-none/release/td-shim -o target/release/final.bin
 ```
 
 If debug logs from the TDShim is needed, here are the alternative
 commands:
 ```bash
-cargo image
+cargo xbuild -p td-shim --target x86_64-unknown-none --features=main,tdx
+cargo run -p td-shim-tools --bin td-shim-ld --features=linker -- target/x86_64-unknown-none/debug/ResetVector.bin target/x86_64-unknown-none/debug/td-shim -o target/debug/final.bin
 ```
 
 And run a TDX VM by providing the firmware previously built, along with a guest

docs/io_throttling.md

@@ -42,14 +42,3 @@ actual rate limit users get can be as low as
 generally advisable to keep `bw/ops_refill_time` larger than `100 ms`
 (`cool_down_time`) to make sure the actual rate limit is close to users'
 expectation ("refill-rate").
-
-## Rate Limit Groups
-It is possible to throttle the aggregate bandwidth or operations
-of multiple virtio-blk devices using a `rate_limit_group`. virtio-blk devices may be
-dynamically added and removed from a `rate_limit_group`. The following example
-demonstrates how to throttle the aggregate bandwidth of two disks to 10 MiB/s.
-```
---disk path=disk0.raw,rate_limit_group=group0 \
-       path=disk1.raw,rate_limit_group=group0 \
---rate-limit-group bw_size=1048576,bw_refill_time,bw_refill_time=100
-```

docs/iommu.md

@@ -60,7 +60,10 @@ implement a full emulation of a physical IOMMU.
 
 ### Kernel
 
-As of Kernel 5.14, virtio-iommu is available for both X86-64 and Aarch64.
+Since virtio-iommu has landed partially into the version 5.3 of the Linux
+kernel, a special branch is needed to get things working with Cloud Hypervisor.
+By partially, we are talking about x86 specifically, as it is already fully
+functional for ARM architectures.
 
 ## Usage
 

docs/mshv.md

@@ -1,48 +0,0 @@
-# Microsoft Hypervisor
-
-The Microsoft Hypervisor is a Type 1 hypervisor which runs on x64 and ARM64 architectures. As the foundation of the Hyper-V virtualization stack, it runs millions of Linux and Windows guests in Azure and on-premises deployments. It supports nested virtualization, and security features like AMD's SEV-SNP. It also supports various features in Windows such as [Device guard and confidential guard](https://techcommunity.microsoft.com/t5/iis-support-blog/windows-10-device-guard-and-credential-guard-demystified/ba-p/376419), and [WSL2](https://docs.microsoft.com/en-us/windows/wsl/wsl2-faq)
-
-Since 2020, Microsoft has been releasing open-source components to support Linux running as root partition on the Microsoft Hypervisor.
-
-    1. Kernel patches to support Linux booting as root partition
-    2. A Linux kernel driver exposing an IOCTL interface for managing guest partitions, via a device node - /dev/mshv
-    3. Rust bindings and IOCTL wrappers
-    4. IGVM related crates
-
-## Components
-
-The following components are related to MSHV support with Cloud-Hypervisor:
-
-* [igvm-crates](https://github.com/microsoft/igvm) : Parsing IGVM file
-
-* [mshv-crates](https://github.com/rust-vmm/mshv) : Rust crates to interact with kernel module (/dev/mshv)
-
-* [igvm-tooling](https://github.com/microsoft/igvm-tooling) : Tool to generate IGVM file
-
-## IGVM
-
-Independent Guest Virtual Machine (IGVM) file format.The format specification can be found in the igvm_defs crate, with a Rust implementation of the binary format in the igvm crate.
-
-The IGVM file format is designed to encapsulate all information required to launch a virtual machine on any given virtualization stack, with support for different isolation technologies such as AMD SEV-SNP and Intel TDX.
-
-At a conceptual level, this file format is a set of commands created by the tool that generated the file, used by the loader to construct the initial guest state. The file format also contains measurement information that the underlying platform will use to confirm that the file was loaded correctly and signed by the appropriate authorities.
-
-Cloud Hypervisor can be built using igvm feature flag along with mshv and/or sev-snp. IGVM only works with MSHV.
-
-## SEV-SNP
-
-AMD's [Secure Encrypted Virtualization (SEV)](https://www.amd.com/en/developer/sev.html) and extensions such as Secure Nested Paging (SEV-SNP) encrypt memory and restrict access to a guest VM's memory and registers, securing it against a compromised hypervisor or VMM. They utilize the Platform Security Processor (PSP) to store keys and encrypt/decrypt the data. Microsoft has been continuously adding/improving support for SEV-SNP on Microsoft Hyper-V. Cloud-Hypervisor can be built with the sev_snp feature including mshv and igvm feature.
-
-## Use Cases
-
-Cloud Hypervisor can be built to run on an MSHV root partition by enabling the mshv feature, e.g.:
-
-```cargo build --locked --all --all-targets --no-default-features --tests --examples --features mshv```
-
-Cloud Hypervisor on MSHV can boot Linux guests using an IGVM file. IGVM feature depends on mshv for running legacy VMs.e.g.:
-
-```cargo build --locked --all --all-targets --no-default-features --tests --examples --features igvm```
-
-For running confidential VMs on mshv, you will only need to enable sev_snp, it requires and enables mshv and igvm automatically, eg.:
-
-```cargo build --locked --all --all-targets --no-default-features --tests --examples --features sev_snp```

docs/vhost-user-net-testing.md

@@ -2,8 +2,8 @@
 
 The purpose of this document is to illustrate how to test vhost-user-net
 in cloud-hypervisor with OVS/DPDK as the backend. This document was
-tested with Open vSwitch v2.17.8, DPDK v21.11.4, and Cloud Hypervisor
+tested with Open vSwitch v2.13.1, DPDK v19.11.3, and Cloud Hypervisor
-v37.0 on Ubuntu 22.04.3 (host kernel v5.15.0).
+v15.0 on Ubuntu 20.04.1 (host kernel v5.4.0).
 
 ## Framework
 
@@ -74,8 +74,8 @@ Here is an example how to create a bridge and add two DPDK ports to it
 # create a bridge
 ovs-vsctl add-br ovsbr0 -- set bridge ovsbr0 datapath_type=netdev
 # create two DPDK ports and add them to the bridge
-ovs-vsctl add-port ovsbr0 vhost-user1 -- set Interface vhost-user1 type=dpdkvhostuserclient options:vhost-server-path=/tmp/vhost-user1
+ovs-vsctl add-port ovsbr0 vhost-user1 -- set Interface vhost-user1 type=dpdkvhostuser
-ovs-vsctl add-port ovsbr0 vhost-user2 -- set Interface vhost-user2 type=dpdkvhostuserclient options:vhost-server-path=/tmp/vhost-user2
+ovs-vsctl add-port ovsbr0 vhost-user2 -- set Interface vhost-user2 type=dpdkvhostuser
 # set the number of rx queues
 ovs-vsctl set Interface vhost-user1 options:n_rxq=2
 ovs-vsctl set Interface vhost-user2 options:n_rxq=2
@@ -92,7 +92,7 @@ VMs run in client mode. They connect to the socket created by the `dpdkvhostuser
         --kernel vmlinux \
         --cmdline "console=ttyS0 console=hvc0 root=/dev/vda1 rw" \
         --disk path=focal-server-cloudimg-amd64.raw   \
-        --net mac=52:54:00:02:d9:01,vhost_user=true,socket=/tmp/vhost-user1,num_queues=4,vhost_mode=server
+        --net mac=52:54:00:02:d9:01,vhost_user=true,socket=/var/run/openvswitch/vhost-user1,num_queues=4
 
 # From another terminal. We need to give the cloud-hypervisor binary the NET_ADMIN capabilities for it to set TAP interfaces up on the host.
 ./cloud-hypervisor \
@@ -101,21 +101,21 @@ VMs run in client mode. They connect to the socket created by the `dpdkvhostuser
         --kernel vmlinux \
         --cmdline "console=ttyS0 console=hvc0 root=/dev/vda1 rw" \
         --disk path=focal-server-cloudimg-amd64.raw   \
-        --net mac=52:54:20:11:C5:02,vhost_user=true,socket=/tmp/vhost-user2,num_queues=4,vhost_mode=server
+        --net mac=52:54:20:11:C5:02,vhost_user=true,socket=/var/run/openvswitch/vhost-user2,num_queues=4
 ```
 
 _Setup VM1_
 ```bash
 # From inside the guest
-sudo ip addr add 172.100.0.1/24 dev ens3
+sudo ip addr add 172.100.0.1/24 dev ens2
-sudo ip link set up dev ens3
+sudo ip link set up dev ens2
 ```
 
 _Setup VM2_
 ```bash
 # From inside the guest
-sudo ip addr add 172.100.0.2/24 dev ens3
+sudo ip addr add 172.100.0.2/24 dev ens2
-sudo ip link set up dev ens3
+sudo ip link set up dev ens2
 ```
 
 _Ping VM1 from VM2_

docs/windows.md

@@ -49,7 +49,7 @@ qemu-system-x86_64 \
 	-m 4G \
 	-bios ./$OVMF_DIR/OVMF_CODE.fd \
 	-cdrom ./$WIN_ISO_FILE \
-	-drive file=./$VIRTIO_ISO_FILE,index=0,media=cdrom \
+	-drive file=./$VIRTIO_ISO_FILE,index=0,media=cdrom
 	-drive if=none,id=root,file=./$IMG_FILE \
 	-device virtio-blk-pci,drive=root,disable-legacy=on \
 	-device virtio-net-pci,netdev=mynet0,disable-legacy=on \

event_monitor/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 
 [dependencies]
 flume = "0.10.14"
-libc = "0.2.153"
+libc = "0.2.147"
-once_cell = "1.19.0"
+once_cell = "1.18.0"
-serde = { version = "1.0.196", features = ["rc", "derive"] }
+serde = { version = "1.0.168", features = ["rc", "derive"] }
-serde_json = "1.0.109"
+serde_json = "1.0.107"

fuzz/Cargo.lock

@@ -12,9 +12,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.11"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
+checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -26,33 +26,33 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.6"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.3"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.2"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
 dependencies = [
  "windows-sys",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.2"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
 dependencies = [
  "anstyle",
  "windows-sys",
@@ -60,9 +60,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.79"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "api_client"
@@ -73,9 +73,9 @@ dependencies = [
 
 [[package]]
 name = "arbitrary"
-version = "1.3.2"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
+checksum = "a2e1373abdaa212b704512ec2bd8b26bd0b7d5c3f70117411a5d9a451383c859"
 
 [[package]]
 name = "arc-swap"
@@ -137,7 +137,7 @@ name = "block"
 version = "0.1.0"
 dependencies = [
  "byteorder",
- "crc-any",
+ "crc32c",
  "io-uring",
  "libc",
  "log",
@@ -184,34 +184,34 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.0"
+version = "4.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f"
+checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.5.0"
+version = "4.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99"
+checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663"
 dependencies = [
  "anstream",
  "anstyle",
  "clap_lex",
- "strsim 0.11.0",
+ "strsim",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
 
 [[package]]
 name = "cloud-hypervisor"
-version = "37.0.0"
+version = "35.0.0"
 dependencies = [
  "anyhow",
  "api_client",
@@ -252,7 +252,6 @@ dependencies = [
  "virtio-queue",
  "vm-device",
  "vm-memory",
- "vm-migration",
  "vm-virtio",
  "vmm",
  "vmm-sys-util",
@@ -265,25 +264,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
-name = "crc-any"
+name = "crc32c"
-version = "2.4.4"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c01a5e1f881f6fb6099a7bdf949e946719fd4f1fefa56264890574febf0eb6d0"
+checksum = "d8f48d60e5b4d2c53d5c2b1d8a58c849a70ae5e5509b08a48d047e3b65714a74"
 dependencies = [
- "debug-helper",
+ "rustc_version",
 ]
 
 [[package]]
 name = "crc64"
-version = "2.0.0"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2707e3afba5e19b75d582d88bc79237418f2a2a2d673d01cf9b03633b46e98f3"
+checksum = "55626594feae15d266d52440b26ff77de0e22230cf0c113abe619084c1ddc910"
 
 [[package]]
 name = "darling"
-version = "0.20.5"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc5d6b04b3fd0ba9926f945895de7d806260a2d7431ba82e7edaecb043c4c6b8"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -291,35 +290,29 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.5"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04e48a959bcd5c761246f5d090ebc2fbf7b9cd527a492b07a67510c108f1e7e3"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim 0.10.0",
+ "strsim",
- "syn 2.0.47",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.5"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.47",
+ "syn 2.0.32",
 ]
 
-[[package]]
-name = "debug-helper"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e"
-
 [[package]]
 name = "devices"
 version = "0.1.0"
@@ -393,21 +386,21 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
 
 [[package]]
 name = "getrandom"
-version = "0.2.12"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -442,9 +435,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
 name = "io-uring"
-version = "0.6.3"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9febecd4aebbe9c7c23c8e536e966805fdf09944c8a915e7991ee51acb67087"
+checksum = "460648e47a07a43110fbfa2e0b14afb2be920093c31e5dccc50e49568e099762"
 dependencies = [
  "bitflags 1.3.2",
  "libc",
@@ -452,32 +445,32 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.10"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "jobserver"
-version = "0.1.28"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
+checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.68"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "kvm-bindings"
-version = "0.7.0"
+version = "0.6.0"
-source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.7.0#2dcf85d4f8aa55befcaa996b699ddb18ec9ed059"
+source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.6.0-tdx#7d9ffb47e5b9b1989577258800a0f57c93f1445f"
 dependencies = [
  "serde",
  "serde_derive",
@@ -486,11 +479,10 @@ dependencies = [
 
 [[package]]
 name = "kvm-ioctls"
-version = "0.16.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9002dff009755414f22b962ec6ae6980b07d6d8b06e5297b1062019d72bd6a8c"
+checksum = "b8f8dc9c1896e5f144ec5d07169bc29f39a047686d29585a91f30489abfaeb6b"
 dependencies = [
- "bitflags 2.4.1",
  "kvm-bindings",
  "libc",
  "vmm-sys-util",
@@ -498,9 +490,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
 
 [[package]]
 name = "libfuzzer-sys"
@@ -515,9 +507,9 @@ dependencies = [
 
 [[package]]
 name = "linux-loader"
-version = "0.11.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb68dd3452f25a8defaf0ae593509cff0c777683e4d8924f59ac7c5f89267a83"
+checksum = "1db6a725c8000971f83fa93ed7ee1b600e55a1471a2a653379d3c84f72effdcf"
 dependencies = [
  "vm-memory",
 ]
@@ -541,7 +533,7 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 [[package]]
 name = "micro_http"
 version = "0.1.0"
-source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#e75dfa1eeea23b69caa7407bc2c3a76d7b7262fb"
+source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#a4d632f2c5ea45712c0d2002dc909a63879e85c3"
 dependencies = [
  "libc",
  "vmm-sys-util",
@@ -586,9 +578,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
 name = "option_parser"
@@ -619,38 +611,38 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.4"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0"
+checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.4"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690"
+checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.47",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
 dependencies = [
  "proc-macro2",
 ]
@@ -659,29 +651,36 @@ dependencies = [
 name = "rate_limiter"
 version = "0.1.0"
 dependencies = [
- "epoll",
  "libc",
  "log",
- "thiserror",
  "vmm-sys-util",
 ]
 
 [[package]]
 name = "remain"
-version = "0.2.12"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad5e011230cad274d0532460c5ab69828ea47ae75681b42a841663efffaf794"
+checksum = "bce3a7139d2ee67d07538ee5dba997364fbc243e7e7143e96eb830c74bfaa082"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.47",
+ "syn 2.0.32",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
 ]
 
 [[package]]
 name = "ryu"
-version = "1.0.16"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "scopeguard"
@@ -699,30 +698,36 @@ dependencies = [
 ]
 
 [[package]]
-name = "serde"
+name = "semver"
-version = "1.0.196"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+
+[[package]]
+name = "serde"
+version = "1.0.189"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.196"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.47",
+ "syn 2.0.32",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.113"
+version = "1.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
 dependencies = [
  "itoa",
  "ryu",
@@ -748,7 +753,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.47",
+ "syn 2.0.32",
 ]
 
 [[package]]
@@ -776,9 +781,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
 
 [[package]]
 name = "spin"
@@ -795,12 +800,6 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
-[[package]]
-name = "strsim"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
-
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -814,9 +813,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.47"
+version = "2.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1726efe18f42ae774cc644f330953a5e7b3c3003d3edcecf18850fe9d4dd9afb"
+checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -825,22 +824,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.56"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.56"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.47",
+ "syn 2.0.32",
 ]
 
 [[package]]
@@ -881,18 +880,18 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.7.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
+checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
 dependencies = [
  "getrandom",
 ]
 
 [[package]]
 name = "versionize"
-version = "0.2.0"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62929d59c7f6730b7298fcb363760550f4db6e353fbac4076d447d0e82799d6d"
+checksum = "dca4b7062e7e6d685901e815c35f9671e059de97c1c0905eeff8592f3fff442f"
 dependencies = [
  "bincode",
  "crc64",
@@ -907,8 +906,8 @@ dependencies = [
 
 [[package]]
 name = "versionize_derive"
-version = "0.1.6"
+version = "0.1.4"
-source = "git+https://github.com/cloud-hypervisor/versionize_derive?branch=ch-0.1.6#7906da996152e2d0ab08f5526440683bf3ca7834"
+source = "git+https://github.com/cloud-hypervisor/versionize_derive?branch=ch#e502b1d4aabab342386f0c53780d49f21a6a1df6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -918,7 +917,7 @@ dependencies = [
 [[package]]
 name = "vfio-bindings"
 version = "0.4.0"
-source = "git+https://github.com/rust-vmm/vfio?branch=main#0daff4d4c159e842cf18b8b90457a45032b2df5a"
+source = "git+https://github.com/rust-vmm/vfio?branch=main#847b0aa504ac6367efe42ba7e96a2d050737d4f0"
 dependencies = [
  "vmm-sys-util",
 ]
@@ -926,7 +925,7 @@ dependencies = [
 [[package]]
 name = "vfio-ioctls"
 version = "0.2.0"
-source = "git+https://github.com/rust-vmm/vfio?branch=main#0daff4d4c159e842cf18b8b90457a45032b2df5a"
+source = "git+https://github.com/rust-vmm/vfio?branch=main#847b0aa504ac6367efe42ba7e96a2d050737d4f0"
 dependencies = [
  "byteorder",
  "kvm-bindings",
@@ -942,7 +941,7 @@ dependencies = [
 [[package]]
 name = "vfio_user"
 version = "0.1.0"
-source = "git+https://github.com/rust-vmm/vfio-user?branch=main#a1f6e52829e069b6d698b2cfeecac742e4653186"
+source = "git+https://github.com/rust-vmm/vfio-user?branch=main#2d96b90a7279547356ad8f83aaa3115ad5497302"
 dependencies = [
  "bitflags 1.3.2",
  "libc",
@@ -958,11 +957,11 @@ dependencies = [
 
 [[package]]
 name = "vhost"
-version = "0.10.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b64e816d0d49769fbfaa1494eb77cc2a3ddc526ead05c7f922cb7d64106286f"
+checksum = "61957aeb36daf0b00b87fff9c10dd28a161bd35ab157553d340d183b3d8756e6"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 1.3.2",
  "libc",
  "vm-memory",
  "vmm-sys-util",
@@ -970,9 +969,9 @@ dependencies = [
 
 [[package]]
 name = "virtio-bindings"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "878bcb1b2812a10c30d53b0ed054999de3d98f25ece91fc173973f9c57aaae86"
+checksum = "c18d7b74098a946470ea265b5bacbbf877abc3373021388454de0d47735a5b98"
 
 [[package]]
 name = "virtio-devices"
@@ -1010,9 +1009,9 @@ dependencies = [
 
 [[package]]
 name = "virtio-queue"
-version = "0.11.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3f69a13d6610db9312acbb438b0390362af905d37634a2106be70c0f734986d"
+checksum = "35aca00da06841bd99162c381ec65893cace23ca0fb89254302cfe4bec4c300f"
 dependencies = [
  "log",
  "virtio-bindings",
@@ -1049,9 +1048,9 @@ source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#c5a99ab71b130435927
 
 [[package]]
 name = "vm-memory"
-version = "0.14.0"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74ffc42216c32c35f858fa4bfdcd9b61017dfd691e0240268fdc85dbf59e5459"
+checksum = "9dc276f0d00c17b9aeb584da0f1e1c673df0d183cc2539e3636ec8cbc5eae99b"
 dependencies = [
  "arc-swap",
  "libc",
@@ -1106,7 +1105,6 @@ dependencies = [
  "once_cell",
  "option_parser",
  "pci",
- "rate_limiter",
  "seccompiler",
  "serde",
  "serde_json",
@@ -1132,9 +1130,9 @@ dependencies = [
 
 [[package]]
 name = "vmm-sys-util"
-version = "0.12.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d1435039746e20da4f8d507a72ee1b916f7b4b05af7a91c093d2c6561934ede"
+checksum = "48b7b084231214f7427041e4220d77dfe726897a6d41fddee450696e66ff2a29"
 dependencies = [
  "bitflags 1.3.2",
  "libc",
@@ -1150,9 +1148,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.91"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -1160,24 +1158,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.91"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.47",
+ "syn 2.0.32",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.91"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1185,22 +1183,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.91"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.47",
+ "syn 2.0.32",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.91"
+version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
 
 [[package]]
 name = "winapi"
@@ -1226,18 +1224,18 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-sys"
-version = "0.52.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
  "windows-targets",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.52.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
  "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
@@ -1250,51 +1248,51 @@ dependencies = [
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.32"
+version = "0.7.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "dd66a62464e3ffd4e37bd09950c2b9dd6c4f8767380fabba0d523f9a775bc85a"
 dependencies = [
  "byteorder",
  "zerocopy-derive",
@@ -1302,11 +1300,11 @@ dependencies = [
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "255c4596d41e6916ced49cfafea18727b24d67878fa180ddfd69b9df34fd1726"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.47",
+ "syn 2.0.32",
 ]

fuzz/Cargo.toml

@@ -8,26 +8,22 @@ edition = "2021"
 [package.metadata]
 cargo-fuzz = true
 
-[features]
-igvm = []
-
 [dependencies]
 block = { path = "../block" }
 devices = { path = "../devices" }
 epoll = "4.3.1"
-libc = "0.2.152"
+libc = "0.2.149"
 libfuzzer-sys = "0.4.7"
-linux-loader = { version = "0.11.0", features = ["elf", "bzimage", "pe"] }
+linux-loader = { version = "0.9.1", features = ["elf", "bzimage", "pe"] }
 micro_http = { git = "https://github.com/firecracker-microvm/micro-http", branch = "main" }
 net_util = { path = "../net_util" }
-once_cell = "1.19.0"
+once_cell = "1.18.0"
 seccompiler = "0.4.0"
 virtio-devices = { path = "../virtio-devices" }
-virtio-queue = "0.11.0"
+virtio-queue = "0.9.0"
 vmm = { path = "../vmm" }
-vmm-sys-util = "0.12.1"
+vmm-sys-util = "0.11.2"
-vm-memory = "0.14.0"
+vm-memory = "0.12.2"
-vm-migration = { path = "../vm-migration" }
 vm-device = { path = "../vm-device" }
 vm-virtio = { path = "../vm-virtio" }
 
@@ -35,8 +31,8 @@ vm-virtio = { path = "../vm-virtio" }
 path = ".."
 
 [patch.crates-io]
-kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.7.0" }
+kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.6.0-tdx" }
-versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch-0.1.6" }
+versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch" }
 
 # Prevent this from interfering with workspaces
 [workspace]

fuzz/fuzz_targets/block.rs

@@ -21,7 +21,6 @@ use virtio_devices::{Block, VirtioDevice, VirtioInterrupt, VirtioInterruptType};
 use virtio_queue::{Queue, QueueT};
 use vm_memory::{bitmap::AtomicBitmap, Bytes, GuestAddress, GuestMemoryAtomic};
 use vmm_sys_util::eventfd::{EventFd, EFD_NONBLOCK};
-use std::collections::BTreeMap;
 
 type GuestMemoryMmap = vm_memory::GuestMemoryMmap<AtomicBitmap>;
 
@@ -50,7 +49,6 @@ fuzz_target!(|bytes| {
     let shm = memfd_create(&ffi::CString::new("fuzz").unwrap(), 0).unwrap();
     let disk_file: File = unsafe { File::from_raw_fd(shm) };
     let qcow_disk = Box::new(RawFileDiskSync::new(disk_file)) as Box<dyn DiskFile>;
-    let queue_affinity = BTreeMap::new();
     let mut block = Block::new(
         "tmp".to_owned(),
         qcow_disk,
@@ -64,7 +62,6 @@ fuzz_target!(|bytes| {
         None,
         EventFd::new(EFD_NONBLOCK).unwrap(),
         None,
-        queue_affinity,
     )
     .unwrap();
 

fuzz/fuzz_targets/cmos.rs

@@ -6,6 +6,8 @@
 use devices::legacy::Cmos;
 use libc::EFD_NONBLOCK;
 use libfuzzer_sys::fuzz_target;
+use std::sync::atomic::AtomicBool;
+use std::sync::Arc;
 use vm_device::BusDevice;
 use vmm_sys_util::eventfd::EventFd;
 

fuzz/fuzz_targets/http_api.rs

@@ -7,18 +7,9 @@ use libfuzzer_sys::fuzz_target;
 use micro_http::Request;
 use once_cell::sync::Lazy;
 use std::os::unix::io::AsRawFd;
-use std::path::PathBuf;
 use std::sync::mpsc::{channel, Receiver};
-use std::sync::{Arc, Mutex};
 use std::thread;
-use vm_migration::MigratableError;
+use vmm::api::{http::*, ApiRequest, ApiResponsePayload};
-use vmm::api::{
-    http::*, ApiRequest, RequestHandler, VmInfoResponse, VmReceiveMigrationData,
-    VmSendMigrationData, VmmPingResponse,
-};
-use vmm::config::RestoreConfig;
-use vmm::vm::{Error as VmError, VmState};
-use vmm::vm_config::*;
 use vmm::{EpollContext, EpollDispatch};
 use vmm_sys_util::eventfd::EventFd;
 
@@ -78,203 +69,6 @@ fn generate_request(bytes: &[u8]) -> Option<Request> {
     Request::try_from(&request, None).ok()
 }
 
-struct StubApiRequestHandler;
-
-impl RequestHandler for StubApiRequestHandler {
-    fn vm_create(&mut self, _: Arc<Mutex<VmConfig>>) -> Result<(), VmError> {
-        Ok(())
-    }
-
-    fn vm_boot(&mut self) -> Result<(), VmError> {
-        Ok(())
-    }
-
-    fn vm_pause(&mut self) -> Result<(), VmError> {
-        Ok(())
-    }
-
-    fn vm_resume(&mut self) -> Result<(), VmError> {
-        Ok(())
-    }
-
-    fn vm_snapshot(&mut self, _: &str) -> Result<(), VmError> {
-        Ok(())
-    }
-
-    fn vm_restore(&mut self, _: RestoreConfig) -> Result<(), VmError> {
-        Ok(())
-    }
-
-    #[cfg(all(target_arch = "x86_64", feature = "guest_debug"))]
-    fn vm_coredump(&mut self, _: &str) -> Result<(), VmError> {
-        Ok(())
-    }
-
-    fn vm_shutdown(&mut self) -> Result<(), VmError> {
-        Ok(())
-    }
-
-    fn vm_reboot(&mut self) -> Result<(), VmError> {
-        Ok(())
-    }
-
-    fn vm_info(&self) -> Result<VmInfoResponse, VmError> {
-        Ok(VmInfoResponse {
-            config: Arc::new(Mutex::new(VmConfig {
-                cpus: CpusConfig {
-                    boot_vcpus: 1,
-                    max_vcpus: 1,
-                    topology: None,
-                    kvm_hyperv: false,
-                    max_phys_bits: 46,
-                    affinity: None,
-                    features: CpuFeatures::default(),
-                },
-                memory: MemoryConfig {
-                    size: 536_870_912,
-                    mergeable: false,
-                    hotplug_method: HotplugMethod::Acpi,
-                    hotplug_size: None,
-                    hotplugged_size: None,
-                    shared: false,
-                    hugepages: false,
-                    hugepage_size: None,
-                    prefault: false,
-                    zones: None,
-                    thp: true,
-                },
-                payload: Some(PayloadConfig {
-                    kernel: Some(PathBuf::from("/path/to/kernel")),
-                    firmware: None,
-                    cmdline: None,
-                    initramfs: None,
-                    #[cfg(feature = "igvm")]
-                    igvm: None,
-                }),
-                rate_limit_groups: None,
-                disks: None,
-                net: None,
-                rng: RngConfig {
-                    src: PathBuf::from("/dev/urandom"),
-                    iommu: false,
-                },
-                balloon: None,
-                fs: None,
-                pmem: None,
-                serial: ConsoleConfig {
-                    file: None,
-                    mode: ConsoleOutputMode::Null,
-                    iommu: false,
-                    socket: None,
-                },
-                console: ConsoleConfig {
-                    file: None,
-                    mode: ConsoleOutputMode::Tty,
-                    iommu: false,
-                    socket: None,
-                },
-                #[cfg(target_arch = "x86_64")]
-                debug_console: DebugConsoleConfig::default(),
-                devices: None,
-                user_devices: None,
-                vdpa: None,
-                vsock: None,
-                pvpanic: false,
-                iommu: false,
-                #[cfg(target_arch = "x86_64")]
-                sgx_epc: None,
-                numa: None,
-                watchdog: false,
-                #[cfg(feature = "guest_debug")]
-                gdb: false,
-                platform: None,
-                tpm: None,
-                preserved_fds: None,
-            })),
-            state: VmState::Running,
-            memory_actual_size: 0,
-            device_tree: None,
-        })
-    }
-
-    fn vmm_ping(&self) -> VmmPingResponse {
-        VmmPingResponse {
-            build_version: String::new(),
-            version: String::new(),
-            pid: 0,
-            features: Vec::new(),
-        }
-    }
-
-    fn vm_delete(&mut self) -> Result<(), VmError> {
-        Ok(())
-    }
-
-    fn vmm_shutdown(&mut self) -> Result<(), VmError> {
-        Ok(())
-    }
-
-    fn vm_resize(&mut self, _: Option<u8>, _: Option<u64>, _: Option<u64>) -> Result<(), VmError> {
-        Ok(())
-    }
-
-    fn vm_resize_zone(&mut self, _: String, _: u64) -> Result<(), VmError> {
-        Ok(())
-    }
-
-    fn vm_add_device(&mut self, _: DeviceConfig) -> Result<Option<Vec<u8>>, VmError> {
-        Ok(None)
-    }
-
-    fn vm_add_user_device(&mut self, _: UserDeviceConfig) -> Result<Option<Vec<u8>>, VmError> {
-        Ok(None)
-    }
-
-    fn vm_remove_device(&mut self, _: String) -> Result<(), VmError> {
-        Ok(())
-    }
-
-    fn vm_add_disk(&mut self, _: DiskConfig) -> Result<Option<Vec<u8>>, VmError> {
-        Ok(None)
-    }
-
-    fn vm_add_fs(&mut self, _: FsConfig) -> Result<Option<Vec<u8>>, VmError> {
-        Ok(None)
-    }
-
-    fn vm_add_pmem(&mut self, _: PmemConfig) -> Result<Option<Vec<u8>>, VmError> {
-        Ok(None)
-    }
-
-    fn vm_add_net(&mut self, _: NetConfig) -> Result<Option<Vec<u8>>, VmError> {
-        Ok(None)
-    }
-
-    fn vm_add_vdpa(&mut self, _: VdpaConfig) -> Result<Option<Vec<u8>>, VmError> {
-        Ok(None)
-    }
-
-    fn vm_add_vsock(&mut self, _: VsockConfig) -> Result<Option<Vec<u8>>, VmError> {
-        Ok(None)
-    }
-
-    fn vm_counters(&mut self) -> Result<Option<Vec<u8>>, VmError> {
-        Ok(None)
-    }
-
-    fn vm_power_button(&mut self) -> Result<(), VmError> {
-        Ok(())
-    }
-
-    fn vm_receive_migration(&mut self, _: VmReceiveMigrationData) -> Result<(), MigratableError> {
-        Ok(())
-    }
-
-    fn vm_send_migration(&mut self, _: VmSendMigrationData) -> Result<(), MigratableError> {
-        Ok(())
-    }
-}
-
 fn http_receiver_stub(exit_evt: EventFd, api_evt: EventFd, api_receiver: Receiver<ApiRequest>) {
     let mut epoll = EpollContext::new().unwrap();
     epoll.add_event(&exit_evt, EpollDispatch::Exit).unwrap();
@@ -304,7 +98,89 @@ fn http_receiver_stub(exit_evt: EventFd, api_evt: EventFd, api_receiver: Receive
             EpollDispatch::Api => {
                 for _ in 0..api_evt.read().unwrap() {
                     let api_request = api_receiver.recv().unwrap();
-                    api_request(&mut StubApiRequestHandler).unwrap();
+                    match api_request {
+                        ApiRequest::VmCreate(_, sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmDelete(sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmBoot(sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmShutdown(sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmReboot(sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmInfo(sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmmPing(sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmPause(sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmResume(sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmSnapshot(_, sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmRestore(_, sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmmShutdown(sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmResize(_, sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmResizeZone(_, sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmAddDevice(_, sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmAddUserDevice(_, sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmRemoveDevice(_, sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmAddDisk(_, sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmAddFs(_, sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmAddPmem(_, sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmAddNet(_, sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmAddVdpa(_, sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmAddVsock(_, sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmCounters(sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmReceiveMigration(_, sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmSendMigration(_, sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                        ApiRequest::VmPowerButton(sender) => {
+                            sender.send(Ok(ApiResponsePayload::Empty)).unwrap();
+                        }
+                    }
                 }
             }
             _ => {

fuzz/fuzz_targets/linux_loader_cmdline.rs

@@ -23,8 +23,6 @@ fuzz_target!(|bytes| {
         kernel: None,
         cmdline: Some(String::from_utf8_lossy(&bytes).to_string()),
         initramfs: None,
-        #[cfg(feature = "igvm")]
-        igvm: None,
     };
     let kernel_cmdline = match vmm::vm::Vm::generate_cmdline(&payload_config) {
         Ok(cmdline) => cmdline,

hypervisor/Cargo.toml

@@ -12,22 +12,22 @@ sev_snp = ["igvm_parser", "igvm_defs"]
 tdx = []
 
 [dependencies]
-anyhow = "1.0.79"
+anyhow = "1.0.75"
 byteorder = "1.4.3"
-igvm_defs = { git = "https://github.com/microsoft/igvm", branch = "main", package = "igvm_defs", optional  = true }
+igvm_defs = { git = "https://github.com/microsoft/igvm", branch = "main" , package = "igvm_defs", optional  = true }
-igvm_parser = { git = "https://github.com/microsoft/igvm", branch = "main", package = "igvm", optional  = true }
+igvm_parser = { git = "https://github.com/microsoft/igvm", branch = "main" , package = "igvm", optional  = true }
-libc = "0.2.153"
+libc = "0.2.147"
-log = "0.4.20"
+log = "0.4.17"
-kvm-ioctls = { version = "0.16.0", optional = true }
+kvm-ioctls = { version = "0.13.0", optional = true }
-kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.7.0", features = ["with-serde", "fam-wrappers"], optional  = true }
+kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.6.0-tdx", features = ["with-serde", "fam-wrappers"], optional  = true }
 mshv-bindings = { git = "https://github.com/rust-vmm/mshv", branch = "main", features = ["with-serde", "fam-wrappers"], optional  = true }
 mshv-ioctls = { git = "https://github.com/rust-vmm/mshv", branch = "main", optional  = true}
-serde = { version = "1.0.196", features = ["rc", "derive"] }
+serde = { version = "1.0.168", features = ["rc", "derive"] }
 serde_with = { version = "3.4.0", default-features = false, features = ["macros"] }
 vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false }
-vm-memory = { version = "0.14.0", features = ["backend-mmap", "backend-atomic"] }
+vm-memory = { version = "0.12.2", features = ["backend-mmap", "backend-atomic"] }
-vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
+vmm-sys-util = { version = "0.11.0", features = ["with-serde"] }
-thiserror = "1.0.52"
+thiserror = "1.0.40"
 
 [target.'cfg(target_arch = "x86_64")'.dependencies.iced-x86]
 optional = true
@@ -36,4 +36,4 @@ default-features = false
 features = ["std", "decoder", "op_code_info", "instr_info", "fast_fmt"]
 
 [dev-dependencies]
-env_logger = "0.10.1"
+env_logger = "0.10.0"

hypervisor/src/arch/x86/mod.rs

@@ -311,17 +311,3 @@ pub struct MsrEntry {
     pub index: u32,
     pub data: u64,
 }
-
-#[serde_with::serde_as]
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
-pub struct XsaveState {
-    #[serde_as(as = "[_; 1024usize]")]
-    pub region: [u32; 1024usize],
-}
-
-impl Default for XsaveState {
-    fn default() -> Self {
-        // SAFETY: this is plain old data structure
-        unsafe { ::std::mem::zeroed() }
-    }
-}

hypervisor/src/cpu.rs

@@ -95,12 +95,12 @@ pub enum HypervisorCpuError {
     #[error("Failed to get Msr entries: {0}")]
     GetMsrEntries(#[source] anyhow::Error),
     ///
-    /// Setting multi-processing  state error
+    /// Setting MSR entries error
     ///
     #[error("Failed to set MP state: {0}")]
     SetMpState(#[source] anyhow::Error),
     ///
-    /// Getting multi-processing  state error
+    /// Getting Msr entries error
     ///
     #[error("Failed to get MP state: {0}")]
     GetMpState(#[source] anyhow::Error),
@@ -267,17 +267,6 @@ pub enum HypervisorCpuError {
     ///
     #[error("Failed to write to GPA: {0}")]
     GpaWrite(#[source] anyhow::Error),
-    ///
-    /// Error getting CPUID leaf
-    ///
-    #[error("Failed to get CPUID entries: {0}")]
-    GetCpuidVales(#[source] anyhow::Error),
-    ///
-    /// Setting SEV control register error
-    ///
-    #[cfg(feature = "sev_snp")]
-    #[error("Failed to set sev control register: {0}")]
-    SetSevControlRegister(#[source] anyhow::Error),
 }
 
 #[derive(Debug)]
@@ -488,21 +477,4 @@ pub trait Vcpu: Send + Sync {
     fn set_tsc_khz(&self, _freq: u32) -> Result<()> {
         Ok(())
     }
-    #[cfg(target_arch = "x86_64")]
-    ///
-    /// X86 specific call to retrieve cpuid leaf
-    ///
-    fn get_cpuid_values(
-        &self,
-        _function: u32,
-        _index: u32,
-        _xfem: u64,
-        _xss: u64,
-    ) -> Result<[u32; 4]> {
-        unimplemented!()
-    }
-    #[cfg(feature = "mshv")]
-    fn set_sev_control_register(&self, _reg: u64) -> Result<()> {
-        unimplemented!()
-    }
 }

hypervisor/src/kvm/mod.rs

@@ -47,7 +47,7 @@ use vmm_sys_util::eventfd::EventFd;
 pub mod x86_64;
 #[cfg(target_arch = "x86_64")]
 use crate::arch::x86::{
-    CpuIdEntry, FpuState, LapicState, MsrEntry, SpecialRegisters, StandardRegisters, XsaveState,
+    CpuIdEntry, FpuState, LapicState, MsrEntry, SpecialRegisters, StandardRegisters,
     NUM_IOAPIC_PINS,
 };
 #[cfg(target_arch = "x86_64")]
@@ -66,11 +66,13 @@ use kvm_bindings::{
 #[cfg(target_arch = "x86_64")]
 use x86_64::check_required_kvm_extensions;
 #[cfg(target_arch = "x86_64")]
-pub use x86_64::{CpuId, ExtendedControlRegisters, MsrEntries, VcpuKvmState};
+pub use x86_64::{CpuId, ExtendedControlRegisters, MsrEntries, VcpuKvmState, Xsave};
 // aarch64 dependencies
 #[cfg(target_arch = "aarch64")]
 pub mod aarch64;
 pub use kvm_bindings;
+#[cfg(feature = "tdx")]
+use kvm_bindings::KVMIO;
 pub use kvm_bindings::{
     kvm_clock_data, kvm_create_device, kvm_device_type_KVM_DEV_TYPE_VFIO, kvm_guest_debug,
     kvm_irq_routing, kvm_irq_routing_entry, kvm_mp_state, kvm_userspace_memory_region,
@@ -84,8 +86,6 @@ use kvm_bindings::{
     KVM_REG_ARM64_SYSREG_OP0_MASK, KVM_REG_ARM64_SYSREG_OP1_MASK, KVM_REG_ARM64_SYSREG_OP2_MASK,
     KVM_REG_ARM_CORE, KVM_REG_SIZE_U128, KVM_REG_SIZE_U32, KVM_REG_SIZE_U64,
 };
-#[cfg(feature = "tdx")]
-use kvm_bindings::{kvm_run__bindgen_ty_1, KVMIO};
 pub use kvm_ioctls;
 pub use kvm_ioctls::{Cap, Kvm};
 #[cfg(target_arch = "aarch64")]
@@ -169,52 +169,6 @@ pub struct TdxCapabilities {
     pub cpuid_configs: [TdxCpuidConfig; TDX_MAX_NR_CPUID_CONFIGS],
 }
 
-#[cfg(feature = "tdx")]
-#[derive(Copy, Clone)]
-pub struct KvmTdxExit {
-    pub type_: u32,
-    pub pad: u32,
-    pub u: KvmTdxExitU,
-}
-
-#[cfg(feature = "tdx")]
-#[repr(C)]
-#[derive(Copy, Clone)]
-pub union KvmTdxExitU {
-    pub vmcall: KvmTdxExitVmcall,
-}
-
-#[cfg(feature = "tdx")]
-#[repr(C)]
-#[derive(Debug, Default, Copy, Clone, PartialEq)]
-pub struct KvmTdxExitVmcall {
-    pub type_: u64,
-    pub subfunction: u64,
-    pub reg_mask: u64,
-    pub in_r12: u64,
-    pub in_r13: u64,
-    pub in_r14: u64,
-    pub in_r15: u64,
-    pub in_rbx: u64,
-    pub in_rdi: u64,
-    pub in_rsi: u64,
-    pub in_r8: u64,
-    pub in_r9: u64,
-    pub in_rdx: u64,
-    pub status_code: u64,
-    pub out_r11: u64,
-    pub out_r12: u64,
-    pub out_r13: u64,
-    pub out_r14: u64,
-    pub out_r15: u64,
-    pub out_rbx: u64,
-    pub out_rdi: u64,
-    pub out_rsi: u64,
-    pub out_r8: u64,
-    pub out_r9: u64,
-    pub out_rdx: u64,
-}
-
 impl From<kvm_userspace_memory_region> for UserMemoryRegion {
     fn from(region: kvm_userspace_memory_region) -> Self {
         let mut flags = USER_MEMORY_REGION_READ;
@@ -402,7 +356,6 @@ impl vm::Vm for KvmVm {
             .set_identity_map_address(address)
             .map_err(|e| vm::HypervisorVmError::SetIdentityMapAddress(e.into()))
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Sets the address of the three-page region in the VM's address space.
@@ -412,7 +365,6 @@ impl vm::Vm for KvmVm {
             .set_tss_address(offset)
             .map_err(|e| vm::HypervisorVmError::SetTssAddress(e.into()))
     }
-
     ///
     /// Creates an in-kernel interrupt controller.
     ///
@@ -421,7 +373,6 @@ impl vm::Vm for KvmVm {
             .create_irq_chip()
             .map_err(|e| vm::HypervisorVmError::CreateIrq(e.into()))
     }
-
     ///
     /// Registers an event that will, when signaled, trigger the `gsi` IRQ.
     ///
@@ -430,7 +381,6 @@ impl vm::Vm for KvmVm {
             .register_irqfd(fd, gsi)
             .map_err(|e| vm::HypervisorVmError::RegisterIrqFd(e.into()))
     }
-
     ///
     /// Unregisters an event that will, when signaled, trigger the `gsi` IRQ.
     ///
@@ -439,7 +389,6 @@ impl vm::Vm for KvmVm {
             .unregister_irqfd(fd, gsi)
             .map_err(|e| vm::HypervisorVmError::UnregisterIrqFd(e.into()))
     }
-
     ///
     /// Creates a VcpuFd object from a vcpu RawFd.
     ///
@@ -462,7 +411,6 @@ impl vm::Vm for KvmVm {
         };
         Ok(Arc::new(vcpu))
     }
-
     #[cfg(target_arch = "aarch64")]
     ///
     /// Creates a virtual GIC device.
@@ -472,7 +420,6 @@ impl vm::Vm for KvmVm {
             .map_err(|e| vm::HypervisorVmError::CreateVgic(anyhow!("Vgic error {:?}", e)))?;
         Ok(Arc::new(Mutex::new(gic_device)))
     }
-
     ///
     /// Registers an event to be signaled whenever a certain address is written to.
     ///
@@ -500,7 +447,6 @@ impl vm::Vm for KvmVm {
                 .map_err(|e| vm::HypervisorVmError::RegisterIoEvent(e.into()))
         }
     }
-
     ///
     /// Unregisters an event from a certain address it has been previously registered to.
     ///
@@ -595,7 +541,6 @@ impl vm::Vm for KvmVm {
             .set_gsi_routing(&irq_routing[0])
             .map_err(|e| vm::HypervisorVmError::SetGsiRouting(e.into()))
     }
-
     ///
     /// Creates a memory region structure that can be used with {create/remove}_user_memory_region
     ///
@@ -622,7 +567,6 @@ impl vm::Vm for KvmVm {
         }
         .into()
     }
-
     ///
     /// Creates a guest physical memory region.
     ///
@@ -659,7 +603,6 @@ impl vm::Vm for KvmVm {
                 .map_err(|e| vm::HypervisorVmError::CreateUserMemory(e.into()))
         }
     }
-
     ///
     /// Removes a guest physical memory region.
     ///
@@ -678,7 +621,6 @@ impl vm::Vm for KvmVm {
                 .map_err(|e| vm::HypervisorVmError::RemoveUserMemory(e.into()))
         }
     }
-
     ///
     /// Returns the preferred CPU target type which can be emulated by KVM on underlying host.
     ///
@@ -688,7 +630,6 @@ impl vm::Vm for KvmVm {
             .get_preferred_target(kvi)
             .map_err(|e| vm::HypervisorVmError::GetPreferredTarget(e.into()))
     }
-
     #[cfg(target_arch = "x86_64")]
     fn enable_split_irq(&self) -> vm::Result<()> {
         // Create split irqchip
@@ -704,7 +645,6 @@ impl vm::Vm for KvmVm {
             .map_err(|e| vm::HypervisorVmError::EnableSplitIrq(e.into()))?;
         Ok(())
     }
-
     #[cfg(target_arch = "x86_64")]
     fn enable_sgx_attribute(&self, file: File) -> vm::Result<()> {
         let mut cap = kvm_enable_cap {
@@ -717,7 +657,6 @@ impl vm::Vm for KvmVm {
             .map_err(|e| vm::HypervisorVmError::EnableSgxAttribute(e.into()))?;
         Ok(())
     }
-
     /// Retrieve guest clock.
     #[cfg(target_arch = "x86_64")]
     fn get_clock(&self) -> vm::Result<ClockData> {
@@ -727,7 +666,6 @@ impl vm::Vm for KvmVm {
             .map_err(|e| vm::HypervisorVmError::GetClock(e.into()))?
             .into())
     }
-
     /// Set guest clock.
     #[cfg(target_arch = "x86_64")]
     fn set_clock(&self, data: &ClockData) -> vm::Result<()> {
@@ -736,7 +674,6 @@ impl vm::Vm for KvmVm {
             .set_clock(&data)
             .map_err(|e| vm::HypervisorVmError::SetClock(e.into()))
     }
-
     /// Create a device that is used for passthrough
     fn create_passthrough_device(&self) -> vm::Result<VfioDeviceFd> {
         let mut vfio_dev = kvm_create_device {
@@ -748,7 +685,6 @@ impl vm::Vm for KvmVm {
         self.create_device(&mut vfio_dev)
             .map_err(|e| vm::HypervisorVmError::CreatePassthroughDevice(e.into()))
     }
-
     ///
     /// Start logging dirty pages
     ///
@@ -890,7 +826,6 @@ impl vm::Vm for KvmVm {
         )
         .map_err(vm::HypervisorVmError::InitMemRegionTdx)
     }
-
     /// Downcast to the underlying KvmVm type
     fn as_any(&self) -> &dyn Any {
         self
@@ -957,9 +892,7 @@ pub enum KvmError {
     #[error("Capability missing: {0:?}")]
     CapabilityMissing(Cap),
 }
-
 pub type KvmResult<T> = result::Result<T, KvmError>;
-
 impl KvmHypervisor {
     /// Create a hypervisor based on Kvm
     #[allow(clippy::new_ret_no_self)]
@@ -973,7 +906,6 @@ impl KvmHypervisor {
 
         Ok(Arc::new(KvmHypervisor { kvm: kvm_obj }))
     }
-
     /// Check if the hypervisor is available
     pub fn is_available() -> hypervisor::Result<bool> {
         match std::fs::metadata("/dev/kvm") {
@@ -985,7 +917,6 @@ impl KvmHypervisor {
         }
     }
 }
-
 /// Implementation of Hypervisor trait for KVM
 ///
 /// # Examples
@@ -1004,7 +935,6 @@ impl hypervisor::Hypervisor for KvmHypervisor {
     fn hypervisor_type(&self) -> HypervisorType {
         HypervisorType::Kvm
     }
-
     /// Create a KVM vm object of a specific VM type and return the object as Vm trait object
     ///
     /// # Examples
@@ -1160,7 +1090,6 @@ impl hypervisor::Hypervisor for KvmHypervisor {
         self.kvm.get_max_vcpus().min(u32::MAX as usize) as u32
     }
 }
-
 /// Vcpu struct for KVM
 pub struct KvmVcpu {
     fd: VcpuFd,
@@ -1170,7 +1099,6 @@ pub struct KvmVcpu {
     #[cfg(target_arch = "x86_64")]
     hyperv_synic: AtomicBool,
 }
-
 /// Implementation of Vcpu trait for KVM
 ///
 /// # Examples
@@ -1195,7 +1123,6 @@ impl cpu::Vcpu for KvmVcpu {
             .map_err(|e| cpu::HypervisorCpuError::GetStandardRegs(e.into()))?
             .into())
     }
-
     ///
     /// Returns the vCPU general purpose registers.
     /// The `KVM_GET_REGS` ioctl is not available on AArch64, `KVM_GET_ONE_REG`
@@ -1210,64 +1137,71 @@ impl cpu::Vcpu for KvmVcpu {
         // These actually are the general-purpose registers of the Armv8-a
         // architecture (i.e x0-x30 if used as a 64bit register or w0-30 when used as a 32bit register).
         for i in 0..31 {
-            let mut bytes = [0_u8; 8];
+            state.regs.regs[i] = self
-            self.fd
+                .fd
-                .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off), &mut bytes)
+                .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off))
-                .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?;
+                .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?
-            state.regs.regs[i] = u64::from_le_bytes(bytes);
+                .try_into()
+                .unwrap();
             off += std::mem::size_of::<u64>();
         }
 
         // We are now entering the "Other register" section of the ARMv8-a architecture.
         // First one, stack pointer.
         let off = offset_of!(user_pt_regs, sp);
-        let mut bytes = [0_u8; 8];
+        state.regs.sp = self
-        self.fd
+            .fd
-            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off), &mut bytes)
+            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off))
-            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?;
+            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?
-        state.regs.sp = u64::from_le_bytes(bytes);
+            .try_into()
+            .unwrap();
 
         // Second one, the program counter.
         let off = offset_of!(user_pt_regs, pc);
-        let mut bytes = [0_u8; 8];
+        state.regs.pc = self
-        self.fd
+            .fd
-            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off), &mut bytes)
+            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off))
-            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?;
+            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?
-        state.regs.pc = u64::from_le_bytes(bytes);
+            .try_into()
+            .unwrap();
 
         // Next is the processor state.
         let off = offset_of!(user_pt_regs, pstate);
-        let mut bytes = [0_u8; 8];
+        state.regs.pstate = self
-        self.fd
+            .fd
-            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off), &mut bytes)
+            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off))
-            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?;
+            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?
-        state.regs.pstate = u64::from_le_bytes(bytes);
+            .try_into()
+            .unwrap();
 
         // The stack pointer associated with EL1
         let off = offset_of!(kvm_regs, sp_el1);
-        let mut bytes = [0_u8; 8];
+        state.sp_el1 = self
-        self.fd
+            .fd
-            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off), &mut bytes)
+            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off))
-            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?;
+            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?
-        state.sp_el1 = u64::from_le_bytes(bytes);
+            .try_into()
+            .unwrap();
 
         // Exception Link Register for EL1, when taking an exception to EL1, this register
         // holds the address to which to return afterwards.
         let off = offset_of!(kvm_regs, elr_el1);
-        let mut bytes = [0_u8; 8];
+        state.elr_el1 = self
-        self.fd
+            .fd
-            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off), &mut bytes)
+            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off))
-            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?;
+            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?
-        state.elr_el1 = u64::from_le_bytes(bytes);
+            .try_into()
+            .unwrap();
 
         // Saved Program Status Registers, there are 5 of them used in the kernel.
         let mut off = offset_of!(kvm_regs, spsr);
         for i in 0..KVM_NR_SPSR as usize {
-            let mut bytes = [0_u8; 8];
+            state.spsr[i] = self
-            self.fd
+                .fd
-                .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off), &mut bytes)
+                .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off))
-                .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?;
+                .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?
-            state.spsr[i] = u64::from_le_bytes(bytes);
+                .try_into()
+                .unwrap();
             off += std::mem::size_of::<u64>();
         }
 
@@ -1275,32 +1209,32 @@ impl cpu::Vcpu for KvmVcpu {
         // https://elixir.free-electrons.com/linux/v4.9.62/source/arch/arm64/include/uapi/asm/kvm.h#L53
         let mut off = offset_of!(kvm_regs, fp_regs) + offset_of!(user_fpsimd_state, vregs);
         for i in 0..32 {
-            let mut bytes = [0_u8; 16];
+            state.fp_regs.vregs[i] = self
-            self.fd
+                .fd
-                .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U128, off), &mut bytes)
+                .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U128, off))
                 .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?;
-            state.fp_regs.vregs[i] = u128::from_le_bytes(bytes);
             off += mem::size_of::<u128>();
         }
 
         // Floating-point Status Register
         let off = offset_of!(kvm_regs, fp_regs) + offset_of!(user_fpsimd_state, fpsr);
-        let mut bytes = [0_u8; 4];
+        state.fp_regs.fpsr = self
-        self.fd
+            .fd
-            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U32, off), &mut bytes)
+            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U32, off))
-            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?;
+            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?
-        state.fp_regs.fpsr = u32::from_le_bytes(bytes);
+            .try_into()
+            .unwrap();
 
         // Floating-point Control Register
         let off = offset_of!(kvm_regs, fp_regs) + offset_of!(user_fpsimd_state, fpcr);
-        let mut bytes = [0_u8; 4];
+        state.fp_regs.fpcr = self
-        self.fd
+            .fd
-            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U32, off), &mut bytes)
+            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U32, off))
-            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?;
+            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?
-        state.fp_regs.fpcr = u32::from_le_bytes(bytes);
+            .try_into()
+            .unwrap();
         Ok(state)
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Sets the vCPU general purpose registers using the `KVM_SET_REGS` ioctl.
@@ -1326,7 +1260,7 @@ impl cpu::Vcpu for KvmVcpu {
             self.fd
                 .set_one_reg(
                     arm64_core_reg_id!(KVM_REG_SIZE_U64, off),
-                    &state.regs.regs[i].to_le_bytes(),
+                    state.regs.regs[i].into(),
                 )
                 .map_err(|e| cpu::HypervisorCpuError::SetCoreRegister(e.into()))?;
             off += std::mem::size_of::<u64>();
@@ -1336,7 +1270,7 @@ impl cpu::Vcpu for KvmVcpu {
         self.fd
             .set_one_reg(
                 arm64_core_reg_id!(KVM_REG_SIZE_U64, off),
-                &state.regs.sp.to_le_bytes(),
+                state.regs.sp.into(),
             )
             .map_err(|e| cpu::HypervisorCpuError::SetCoreRegister(e.into()))?;
 
@@ -1344,7 +1278,7 @@ impl cpu::Vcpu for KvmVcpu {
         self.fd
             .set_one_reg(
                 arm64_core_reg_id!(KVM_REG_SIZE_U64, off),
-                &state.regs.pc.to_le_bytes(),
+                state.regs.pc.into(),
             )
             .map_err(|e| cpu::HypervisorCpuError::SetCoreRegister(e.into()))?;
 
@@ -1352,7 +1286,7 @@ impl cpu::Vcpu for KvmVcpu {
         self.fd
             .set_one_reg(
                 arm64_core_reg_id!(KVM_REG_SIZE_U64, off),
-                &state.regs.pstate.to_le_bytes(),
+                state.regs.pstate.into(),
             )
             .map_err(|e| cpu::HypervisorCpuError::SetCoreRegister(e.into()))?;
 
@@ -1360,7 +1294,7 @@ impl cpu::Vcpu for KvmVcpu {
         self.fd
             .set_one_reg(
                 arm64_core_reg_id!(KVM_REG_SIZE_U64, off),
-                &state.sp_el1.to_le_bytes(),
+                state.sp_el1.into(),
             )
             .map_err(|e| cpu::HypervisorCpuError::SetCoreRegister(e.into()))?;
 
@@ -1368,7 +1302,7 @@ impl cpu::Vcpu for KvmVcpu {
         self.fd
             .set_one_reg(
                 arm64_core_reg_id!(KVM_REG_SIZE_U64, off),
-                &state.elr_el1.to_le_bytes(),
+                state.elr_el1.into(),
             )
             .map_err(|e| cpu::HypervisorCpuError::SetCoreRegister(e.into()))?;
 
@@ -1377,7 +1311,7 @@ impl cpu::Vcpu for KvmVcpu {
             self.fd
                 .set_one_reg(
                     arm64_core_reg_id!(KVM_REG_SIZE_U64, off),
-                    &state.spsr[i].to_le_bytes(),
+                    state.spsr[i].into(),
                 )
                 .map_err(|e| cpu::HypervisorCpuError::SetCoreRegister(e.into()))?;
             off += std::mem::size_of::<u64>();
@@ -1388,7 +1322,7 @@ impl cpu::Vcpu for KvmVcpu {
             self.fd
                 .set_one_reg(
                     arm64_core_reg_id!(KVM_REG_SIZE_U128, off),
-                    &state.fp_regs.vregs[i].to_le_bytes(),
+                    state.fp_regs.vregs[i],
                 )
                 .map_err(|e| cpu::HypervisorCpuError::SetCoreRegister(e.into()))?;
             off += mem::size_of::<u128>();
@@ -1398,7 +1332,7 @@ impl cpu::Vcpu for KvmVcpu {
         self.fd
             .set_one_reg(
                 arm64_core_reg_id!(KVM_REG_SIZE_U32, off),
-                &state.fp_regs.fpsr.to_le_bytes(),
+                state.fp_regs.fpsr.into(),
             )
             .map_err(|e| cpu::HypervisorCpuError::SetCoreRegister(e.into()))?;
 
@@ -1406,7 +1340,7 @@ impl cpu::Vcpu for KvmVcpu {
         self.fd
             .set_one_reg(
                 arm64_core_reg_id!(KVM_REG_SIZE_U32, off),
-                &state.fp_regs.fpcr.to_le_bytes(),
+                state.fp_regs.fpcr.into(),
             )
             .map_err(|e| cpu::HypervisorCpuError::SetCoreRegister(e.into()))?;
         Ok(())
@@ -1423,7 +1357,6 @@ impl cpu::Vcpu for KvmVcpu {
             .map_err(|e| cpu::HypervisorCpuError::GetSpecialRegs(e.into()))?
             .into())
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Sets the vCPU special registers using the `KVM_SET_SREGS` ioctl.
@@ -1434,7 +1367,6 @@ impl cpu::Vcpu for KvmVcpu {
             .set_sregs(&sregs)
             .map_err(|e| cpu::HypervisorCpuError::SetSpecialRegs(e.into()))
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Returns the floating point state (FPU) from the vCPU.
@@ -1446,7 +1378,6 @@ impl cpu::Vcpu for KvmVcpu {
             .map_err(|e| cpu::HypervisorCpuError::GetFloatingPointRegs(e.into()))?
             .into())
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Set the floating point state (FPU) of a vCPU using the `KVM_SET_FPU` ioct.
@@ -1457,7 +1388,6 @@ impl cpu::Vcpu for KvmVcpu {
             .set_fpu(&fpu)
             .map_err(|e| cpu::HypervisorCpuError::SetFloatingPointRegs(e.into()))
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// X86 specific call to setup the CPUID registers.
@@ -1472,7 +1402,6 @@ impl cpu::Vcpu for KvmVcpu {
             .set_cpuid2(&kvm_cpuid)
             .map_err(|e| cpu::HypervisorCpuError::SetCpuid(e.into()))
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// X86 specific call to enable HyperV SynIC
@@ -1490,7 +1419,6 @@ impl cpu::Vcpu for KvmVcpu {
             .enable_cap(&cap)
             .map_err(|e| cpu::HypervisorCpuError::EnableHyperVSyncIc(e.into()))
     }
-
     ///
     /// X86 specific call to retrieve the CPUID registers.
     ///
@@ -1505,7 +1433,6 @@ impl cpu::Vcpu for KvmVcpu {
 
         Ok(v)
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Returns the state of the LAPIC (Local Advanced Programmable Interrupt Controller).
@@ -1517,7 +1444,6 @@ impl cpu::Vcpu for KvmVcpu {
             .map_err(|e| cpu::HypervisorCpuError::GetlapicState(e.into()))?
             .into())
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Sets the state of the LAPIC (Local Advanced Programmable Interrupt Controller).
@@ -1528,7 +1454,6 @@ impl cpu::Vcpu for KvmVcpu {
             .set_lapic(&klapic)
             .map_err(|e| cpu::HypervisorCpuError::SetLapicState(e.into()))
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Returns the model-specific registers (MSR) for this vCPU.
@@ -1550,7 +1475,6 @@ impl cpu::Vcpu for KvmVcpu {
 
         Ok(succ)
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Setup the model-specific registers (MSR) for this vCPU.
@@ -1563,7 +1487,6 @@ impl cpu::Vcpu for KvmVcpu {
             .set_msrs(&kvm_msrs)
             .map_err(|e| cpu::HypervisorCpuError::SetMsrEntries(e.into()))
     }
-
     ///
     /// Returns the vcpu's current "multiprocessing state".
     ///
@@ -1574,7 +1497,6 @@ impl cpu::Vcpu for KvmVcpu {
             .map_err(|e| cpu::HypervisorCpuError::GetMpState(e.into()))?
             .into())
     }
-
     ///
     /// Sets the vcpu's current "multiprocessing state".
     ///
@@ -1583,7 +1505,6 @@ impl cpu::Vcpu for KvmVcpu {
             .set_mp_state(mp_state.into())
             .map_err(|e| cpu::HypervisorCpuError::SetMpState(e.into()))
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Translates guest virtual address to guest physical address using the `KVM_TRANSLATE` ioctl.
@@ -1602,7 +1523,6 @@ impl cpu::Vcpu for KvmVcpu {
             _ => Ok((tr.physical_address, 0)),
         }
     }
-
     ///
     /// Triggers the running of the current virtual CPU returning an exit reason.
     ///
@@ -1647,7 +1567,7 @@ impl cpu::Vcpu for KvmVcpu {
                         Ok(cpu::VmExit::Shutdown)
                     } else {
                         Err(cpu::HypervisorCpuError::RunVcpu(anyhow!(
-                            "Unexpected system event with type 0x{:x}, flags 0x{:x?}",
+                            "Unexpected system event with type 0x{:x}, flags 0x{:x}",
                             event_type,
                             flags
                         )))
@@ -1694,7 +1614,6 @@ impl cpu::Vcpu for KvmVcpu {
             },
         }
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Let the guest know that it has been paused, which prevents from
@@ -1712,7 +1631,6 @@ impl cpu::Vcpu for KvmVcpu {
 
         Ok(())
     }
-
     ///
     /// Sets debug registers to set hardware breakpoints and/or enable single step.
     ///
@@ -1766,14 +1684,12 @@ impl cpu::Vcpu for KvmVcpu {
             .set_guest_debug(&dbg)
             .map_err(|e| cpu::HypervisorCpuError::SetDebugRegs(e.into()))
     }
-
     #[cfg(target_arch = "aarch64")]
     fn vcpu_init(&self, kvi: &VcpuInit) -> cpu::Result<()> {
         self.fd
             .vcpu_init(kvi)
             .map_err(|e| cpu::HypervisorCpuError::VcpuInit(e.into()))
     }
-
     ///
     /// Gets a list of the guest registers that are supported for the
     /// KVM_GET_ONE_REG/KVM_SET_ONE_REG calls.
@@ -1784,7 +1700,6 @@ impl cpu::Vcpu for KvmVcpu {
             .get_reg_list(reg_list)
             .map_err(|e| cpu::HypervisorCpuError::GetRegList(e.into()))
     }
-
     ///
     /// Gets the value of a system register
     ///
@@ -1811,13 +1726,13 @@ impl cpu::Vcpu for KvmVcpu {
                     | KVM_REG_ARM64_SYSREG_CRN_MASK
                     | KVM_REG_ARM64_SYSREG_CRM_MASK
                     | KVM_REG_ARM64_SYSREG_OP2_MASK)) as u64);
-        let mut bytes = [0_u8; 8];
+        Ok(self
-        self.fd
+            .fd
-            .get_one_reg(id, &mut bytes)
+            .get_one_reg(id)
-            .map_err(|e| cpu::HypervisorCpuError::GetSysRegister(e.into()))?;
+            .map_err(|e| cpu::HypervisorCpuError::GetSysRegister(e.into()))?
-        Ok(u64::from_le_bytes(bytes))
+            .try_into()
+            .unwrap())
     }
-
     ///
     /// Configure core registers for a given CPU.
     ///
@@ -1842,7 +1757,7 @@ impl cpu::Vcpu for KvmVcpu {
         self.fd
             .set_one_reg(
                 arm64_core_reg_id!(KVM_REG_SIZE_U64, pstate),
-                &PSTATE_FAULT_BITS_64.to_le_bytes(),
+                PSTATE_FAULT_BITS_64.into(),
             )
             .map_err(|e| cpu::HypervisorCpuError::SetCoreRegister(e.into()))?;
 
@@ -1851,10 +1766,7 @@ impl cpu::Vcpu for KvmVcpu {
             // Setting the PC (Processor Counter) to the current program address (kernel address).
             let pc = offset_of!(user_pt_regs, pc) + kreg_off;
             self.fd
-                .set_one_reg(
+                .set_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, pc), boot_ip.into())
-                    arm64_core_reg_id!(KVM_REG_SIZE_U64, pc),
-                    &boot_ip.to_le_bytes(),
-                )
                 .map_err(|e| cpu::HypervisorCpuError::SetCoreRegister(e.into()))?;
 
             // Last mandatory thing to set -> the address pointing to the FDT (also called DTB).
@@ -1865,7 +1777,7 @@ impl cpu::Vcpu for KvmVcpu {
             self.fd
                 .set_one_reg(
                     arm64_core_reg_id!(KVM_REG_SIZE_U64, regs0),
-                    &fdt_start.to_le_bytes(),
+                    fdt_start.into(),
                 )
                 .map_err(|e| cpu::HypervisorCpuError::SetCoreRegister(e.into()))?;
         }
@@ -1995,7 +1907,6 @@ impl cpu::Vcpu for KvmVcpu {
         }
         .into())
     }
-
     ///
     /// Get the current AArch64 CPU state
     ///
@@ -2030,13 +1941,14 @@ impl cpu::Vcpu for KvmVcpu {
         // register list, we are simply calling KVM_GET_ONE_REG.
         let indices = reg_list.as_slice();
         for index in indices.iter() {
-            let mut bytes = [0_u8; 8];
-            self.fd
-                .get_one_reg(*index, &mut bytes)
-                .map_err(|e| cpu::HypervisorCpuError::GetSysRegister(e.into()))?;
             sys_regs.push(kvm_bindings::kvm_one_reg {
                 id: *index,
-                addr: u64::from_le_bytes(bytes),
+                addr: self
+                    .fd
+                    .get_one_reg(*index)
+                    .map_err(|e| cpu::HypervisorCpuError::GetSysRegister(e.into()))?
+                    .try_into()
+                    .unwrap(),
             });
         }
 
@@ -2044,7 +1956,6 @@ impl cpu::Vcpu for KvmVcpu {
 
         Ok(state.into())
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Restore the previously saved CPU state
@@ -2134,7 +2045,6 @@ impl cpu::Vcpu for KvmVcpu {
 
         Ok(())
     }
-
     ///
     /// Restore the previously saved AArch64 CPU state
     ///
@@ -2146,7 +2056,7 @@ impl cpu::Vcpu for KvmVcpu {
         // Set system registers
         for reg in &state.sys_regs {
             self.fd
-                .set_one_reg(reg.id, &reg.addr.to_le_bytes())
+                .set_one_reg(reg.id, reg.addr.into())
                 .map_err(|e| cpu::HypervisorCpuError::SetSysRegister(e.into()))?;
         }
 
@@ -2178,12 +2088,7 @@ impl cpu::Vcpu for KvmVcpu {
     fn get_tdx_exit_details(&mut self) -> cpu::Result<TdxExitDetails> {
         let kvm_run = self.fd.get_kvm_run();
         // SAFETY: accessing a union field in a valid structure
-        let tdx_vmcall = unsafe {
+        let tdx_vmcall = unsafe { &mut kvm_run.__bindgen_anon_1.tdx.u.vmcall };
-            &mut (*((&mut kvm_run.__bindgen_anon_1) as *mut kvm_run__bindgen_ty_1
-                as *mut KvmTdxExit))
-                .u
-                .vmcall
-        };
 
         tdx_vmcall.status_code = TDG_VP_VMCALL_INVALID_OPERAND;
 
@@ -2207,19 +2112,13 @@ impl cpu::Vcpu for KvmVcpu {
     fn set_tdx_status(&mut self, status: TdxExitStatus) {
         let kvm_run = self.fd.get_kvm_run();
         // SAFETY: accessing a union field in a valid structure
-        let tdx_vmcall = unsafe {
+        let tdx_vmcall = unsafe { &mut kvm_run.__bindgen_anon_1.tdx.u.vmcall };
-            &mut (*((&mut kvm_run.__bindgen_anon_1) as *mut kvm_run__bindgen_ty_1
-                as *mut KvmTdxExit))
-                .u
-                .vmcall
-        };
 
         tdx_vmcall.status_code = match status {
             TdxExitStatus::Success => TDG_VP_VMCALL_SUCCESS,
             TdxExitStatus::InvalidOperand => TDG_VP_VMCALL_INVALID_OPERAND,
         };
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Return the list of initial MSR entries for a VCPU
@@ -2245,7 +2144,6 @@ impl cpu::Vcpu for KvmVcpu {
         ]
         .to_vec()
     }
-
     #[cfg(target_arch = "aarch64")]
     fn has_pmu_support(&self) -> bool {
         let cpu_attr = kvm_bindings::kvm_device_attr {
@@ -2256,7 +2154,6 @@ impl cpu::Vcpu for KvmVcpu {
         };
         self.fd.has_device_attr(&cpu_attr).is_ok()
     }
-
     #[cfg(target_arch = "aarch64")]
     fn init_pmu(&self, irq: u32) -> cpu::Result<()> {
         let cpu_attr = kvm_bindings::kvm_device_attr {
@@ -2319,25 +2216,20 @@ impl KvmVcpu {
     ///
     /// X86 specific call that returns the vcpu's current "xsave struct".
     ///
-    fn get_xsave(&self) -> cpu::Result<XsaveState> {
+    fn get_xsave(&self) -> cpu::Result<Xsave> {
-        Ok(self
+        self.fd
-            .fd
             .get_xsave()
-            .map_err(|e| cpu::HypervisorCpuError::GetXsaveState(e.into()))?
+            .map_err(|e| cpu::HypervisorCpuError::GetXsaveState(e.into()))
-            .into())
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// X86 specific call that sets the vcpu's current "xsave struct".
     ///
-    fn set_xsave(&self, xsave: &XsaveState) -> cpu::Result<()> {
+    fn set_xsave(&self, xsave: &Xsave) -> cpu::Result<()> {
-        let xsave: kvm_bindings::kvm_xsave = (*xsave).clone().into();
         self.fd
-            .set_xsave(&xsave)
+            .set_xsave(xsave)
             .map_err(|e| cpu::HypervisorCpuError::SetXsaveState(e.into()))
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// X86 specific call that returns the vcpu's current "xcrs".
@@ -2347,7 +2239,6 @@ impl KvmVcpu {
             .get_xcrs()
             .map_err(|e| cpu::HypervisorCpuError::GetXcsr(e.into()))
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// X86 specific call that sets the vcpu's current "xcrs".
@@ -2357,7 +2248,6 @@ impl KvmVcpu {
             .set_xcrs(xcrs)
             .map_err(|e| cpu::HypervisorCpuError::SetXcsr(e.into()))
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Returns currently pending exceptions, interrupts, and NMIs as well as related
@@ -2368,7 +2258,6 @@ impl KvmVcpu {
             .get_vcpu_events()
             .map_err(|e| cpu::HypervisorCpuError::GetVcpuEvents(e.into()))
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Sets pending exceptions, interrupts, and NMIs as well as related states

hypervisor/src/kvm/x86_64/mod.rs

@@ -10,7 +10,7 @@
 
 use crate::arch::x86::{
     CpuIdEntry, DescriptorTable, FpuState, LapicState, MsrEntry, SegmentRegister, SpecialRegisters,
-    StandardRegisters, XsaveState, CPUID_FLAG_VALID_INDEX,
+    StandardRegisters, CPUID_FLAG_VALID_INDEX,
 };
 use crate::kvm::{Cap, Kvm, KvmError, KvmResult};
 use serde::{Deserialize, Serialize};
@@ -23,7 +23,7 @@ pub use {
     kvm_bindings::kvm_lapic_state, kvm_bindings::kvm_mp_state as MpState,
     kvm_bindings::kvm_msr_entry, kvm_bindings::kvm_regs, kvm_bindings::kvm_segment,
     kvm_bindings::kvm_sregs, kvm_bindings::kvm_vcpu_events as VcpuEvents,
-    kvm_bindings::kvm_xcrs as ExtendedControlRegisters, kvm_bindings::kvm_xsave,
+    kvm_bindings::kvm_xcrs as ExtendedControlRegisters, kvm_bindings::kvm_xsave as Xsave,
     kvm_bindings::CpuId, kvm_bindings::MsrList, kvm_bindings::Msrs as MsrEntries,
     kvm_bindings::KVM_CPUID_FLAG_SIGNIFCANT_INDEX,
 };
@@ -64,7 +64,7 @@ pub struct VcpuKvmState {
     pub sregs: kvm_sregs,
     pub fpu: FpuState,
     pub lapic_state: LapicState,
-    pub xsave: XsaveState,
+    pub xsave: Xsave,
     pub xcrs: ExtendedControlRegisters,
     pub mp_state: MpState,
     pub tsc_khz: Option<u32>,
@@ -330,18 +330,3 @@ impl From<MsrEntry> for kvm_msr_entry {
         }
     }
 }
-
-impl From<kvm_xsave> for XsaveState {
-    fn from(s: kvm_xsave) -> Self {
-        Self { region: s.region }
-    }
-}
-
-impl From<XsaveState> for kvm_xsave {
-    fn from(s: XsaveState) -> Self {
-        Self {
-            region: s.region,
-            extra: Default::default(),
-        }
-    }
-}

hypervisor/src/lib.rs

@@ -134,7 +134,6 @@ pub const USER_MEMORY_REGION_READ: u32 = 1;
 pub const USER_MEMORY_REGION_WRITE: u32 = 1 << 1;
 pub const USER_MEMORY_REGION_EXECUTE: u32 = 1 << 2;
 pub const USER_MEMORY_REGION_LOG_DIRTY: u32 = 1 << 3;
-pub const USER_MEMORY_REGION_ADJUSTABLE: u32 = 1 << 4;
 
 #[derive(Debug)]
 pub enum MpState {

hypervisor/src/mshv/mod.rs

@@ -31,8 +31,7 @@ use snp_constants::*;
 
 use crate::{
     ClockData, CpuState, IoEventAddress, IrqRoutingEntry, MpState, UserMemoryRegion,
-    USER_MEMORY_REGION_ADJUSTABLE, USER_MEMORY_REGION_EXECUTE, USER_MEMORY_REGION_READ,
+    USER_MEMORY_REGION_EXECUTE, USER_MEMORY_REGION_READ, USER_MEMORY_REGION_WRITE,
-    USER_MEMORY_REGION_WRITE,
 };
 #[cfg(feature = "sev_snp")]
 use igvm_defs::IGVM_VHS_SNP_ID_BLOCK;
@@ -74,9 +73,6 @@ impl From<mshv_user_mem_region> for UserMemoryRegion {
         if region.flags & HV_MAP_GPA_EXECUTABLE != 0 {
             flags |= USER_MEMORY_REGION_EXECUTE;
         }
-        if region.flags & HV_MAP_GPA_ADJUSTABLE != 0 {
-            flags |= USER_MEMORY_REGION_ADJUSTABLE;
-        }
 
         UserMemoryRegion {
             guest_phys_addr: (region.guest_pfn << PAGE_SHIFT as u64)
@@ -101,9 +97,6 @@ impl From<UserMemoryRegion> for mshv_user_mem_region {
         if region.flags & USER_MEMORY_REGION_EXECUTE != 0 {
             flags |= HV_MAP_GPA_EXECUTABLE;
         }
-        if region.flags & USER_MEMORY_REGION_ADJUSTABLE != 0 {
-            flags |= HV_MAP_GPA_ADJUSTABLE;
-        }
 
         mshv_user_mem_region {
             guest_pfn: region.guest_phys_addr >> PAGE_SHIFT,
@@ -207,7 +200,6 @@ impl MshvHypervisor {
         }
     }
 }
-
 /// Implementation of Hypervisor trait for Mshv
 ///
 /// # Examples
@@ -306,8 +298,6 @@ impl hypervisor::Hypervisor for MshvHypervisor {
             fd: vm_fd,
             msrs,
             dirty_log_slots: Arc::new(RwLock::new(HashMap::new())),
-            #[cfg(feature = "sev_snp")]
-            sev_snp_enabled: mshv_vm_type == VmType::Snp,
         }))
     }
 
@@ -348,8 +338,6 @@ pub struct MshvVcpu {
     cpuid: Vec<CpuIdEntry>,
     msrs: Vec<MsrEntry>,
     vm_ops: Option<Arc<dyn vm::VmOps>>,
-    #[cfg(feature = "sev_snp")]
-    vm_fd: Arc<VmFd>,
 }
 
 /// Implementation of Vcpu trait for Microsoft Hypervisor
@@ -376,7 +364,6 @@ impl cpu::Vcpu for MshvVcpu {
             .map_err(|e| cpu::HypervisorCpuError::GetStandardRegs(e.into()))?
             .into())
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Sets the vCPU general purpose registers.
@@ -387,7 +374,6 @@ impl cpu::Vcpu for MshvVcpu {
             .set_regs(&regs)
             .map_err(|e| cpu::HypervisorCpuError::SetStandardRegs(e.into()))
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Returns the vCPU special registers.
@@ -399,7 +385,6 @@ impl cpu::Vcpu for MshvVcpu {
             .map_err(|e| cpu::HypervisorCpuError::GetSpecialRegs(e.into()))?
             .into())
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Sets the vCPU special registers.
@@ -410,7 +395,6 @@ impl cpu::Vcpu for MshvVcpu {
             .set_sregs(&sregs)
             .map_err(|e| cpu::HypervisorCpuError::SetSpecialRegs(e.into()))
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Returns the floating point state (FPU) from the vCPU.
@@ -422,7 +406,6 @@ impl cpu::Vcpu for MshvVcpu {
             .map_err(|e| cpu::HypervisorCpuError::GetFloatingPointRegs(e.into()))?
             .into())
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Set the floating point state (FPU) of a vCPU.
@@ -455,7 +438,6 @@ impl cpu::Vcpu for MshvVcpu {
 
         Ok(succ)
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Setup the model-specific registers (MSR) for this vCPU.
@@ -477,7 +459,6 @@ impl cpu::Vcpu for MshvVcpu {
         /* We always have SynIC enabled on MSHV */
         Ok(())
     }
-
     #[allow(non_upper_case_globals)]
     fn run(&self) -> std::result::Result<cpu::VmExit, cpu::HypervisorCpuError> {
         let hv_message: hv_message = hv_message::default();
@@ -606,17 +587,6 @@ impl cpu::Vcpu for MshvVcpu {
 
                     Ok(cpu::VmExit::Ignore)
                 }
-                hv_message_type_HVMSG_UNACCEPTED_GPA => {
-                    let info = x.to_memory_info().unwrap();
-                    let gva = info.guest_virtual_address;
-                    let gpa = info.guest_physical_address;
-
-                    Err(cpu::HypervisorCpuError::RunVcpu(anyhow!(
-                        "Unhandled VCPU exit: Unaccepted GPA({:x}) found at GVA({:x})",
-                        gpa,
-                        gva,
-                    )))
-                }
                 hv_message_type_HVMSG_X64_CPUID_INTERCEPT => {
                     let info = x.to_cpuid_info().unwrap();
                     debug!("cpuid eax: {:x}", { info.rax });
@@ -1006,59 +976,6 @@ impl cpu::Vcpu for MshvVcpu {
                                             })?;
                                     }
                                 }
-                                SVM_EXITCODE_SNP_GUEST_REQUEST => {
-                                    let req_gpa =
-                                        info.__bindgen_anon_2.__bindgen_anon_1.sw_exit_info1;
-                                    let rsp_gpa =
-                                        info.__bindgen_anon_2.__bindgen_anon_1.sw_exit_info2;
-
-                                    let mshv_psp_req =
-                                        mshv_issue_psp_guest_request { req_gpa, rsp_gpa };
-                                    self.vm_fd
-                                        .psp_issue_guest_request(&mshv_psp_req)
-                                        .map_err(|e| cpu::HypervisorCpuError::RunVcpu(e.into()))?;
-
-                                    debug!(
-                                        "SNP guest request: req_gpa {:0x} rsp_gpa {:0x}",
-                                        req_gpa, rsp_gpa
-                                    );
-
-                                    let mut swei2_rw_gpa_arg = mshv_bindings::mshv_read_write_gpa {
-                                        base_gpa: ghcb_gpa + GHCB_SW_EXITINFO2_OFFSET,
-                                        byte_count: std::mem::size_of::<u64>() as u32,
-                                        ..Default::default()
-                                    };
-                                    self.fd
-                                        .gpa_write(&mut swei2_rw_gpa_arg)
-                                        .map_err(|e| cpu::HypervisorCpuError::GpaWrite(e.into()))?;
-                                }
-                                SVM_EXITCODE_SNP_AP_CREATION => {
-                                    let vmsa_gpa =
-                                        info.__bindgen_anon_2.__bindgen_anon_1.sw_exit_info2;
-                                    let apic_id =
-                                        info.__bindgen_anon_2.__bindgen_anon_1.sw_exit_info1 >> 32;
-                                    debug!(
-                                        "SNP AP CREATE REQUEST with VMSA GPA {:0x}, and APIC ID {:?}",
-                                        vmsa_gpa, apic_id
-                                    );
-
-                                    let mshv_ap_create_req = mshv_sev_snp_ap_create {
-                                        vp_id: apic_id,
-                                        vmsa_gpa,
-                                    };
-                                    self.vm_fd
-                                        .sev_snp_ap_create(&mshv_ap_create_req)
-                                        .map_err(|e| cpu::HypervisorCpuError::RunVcpu(e.into()))?;
-
-                                    let mut swei2_rw_gpa_arg = mshv_bindings::mshv_read_write_gpa {
-                                        base_gpa: ghcb_gpa + GHCB_SW_EXITINFO2_OFFSET,
-                                        byte_count: std::mem::size_of::<u64>() as u32,
-                                        ..Default::default()
-                                    };
-                                    self.fd
-                                        .gpa_write(&mut swei2_rw_gpa_arg)
-                                        .map_err(|e| cpu::HypervisorCpuError::GpaWrite(e.into()))?;
-                                }
                                 _ => panic!(
                                     "GHCB_INFO_NORMAL: Unhandled exit code: {:0x}",
                                     exit_code
@@ -1085,7 +1002,6 @@ impl cpu::Vcpu for MshvVcpu {
             },
         }
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// X86 specific call to setup the CPUID registers.
@@ -1099,7 +1015,6 @@ impl cpu::Vcpu for MshvVcpu {
             .register_intercept_result_cpuid(&mshv_cpuid)
             .map_err(|e| cpu::HypervisorCpuError::SetCpuid(e.into()))
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// X86 specific call to retrieve the CPUID registers.
@@ -1107,23 +1022,6 @@ impl cpu::Vcpu for MshvVcpu {
     fn get_cpuid2(&self, _num_entries: usize) -> cpu::Result<Vec<CpuIdEntry>> {
         Ok(self.cpuid.clone())
     }
-
-    #[cfg(target_arch = "x86_64")]
-    ///
-    /// X86 specific call to retrieve cpuid leaf
-    ///
-    fn get_cpuid_values(
-        &self,
-        function: u32,
-        index: u32,
-        xfem: u64,
-        xss: u64,
-    ) -> cpu::Result<[u32; 4]> {
-        self.fd
-            .get_cpuid_values(function, index, xfem, xss)
-            .map_err(|e| cpu::HypervisorCpuError::GetCpuidVales(e.into()))
-    }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Returns the state of the LAPIC (Local Advanced Programmable Interrupt Controller).
@@ -1135,7 +1033,6 @@ impl cpu::Vcpu for MshvVcpu {
             .map_err(|e| cpu::HypervisorCpuError::GetlapicState(e.into()))?
             .into())
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Sets the state of the LAPIC (Local Advanced Programmable Interrupt Controller).
@@ -1146,21 +1043,18 @@ impl cpu::Vcpu for MshvVcpu {
             .set_lapic(&lapic)
             .map_err(|e| cpu::HypervisorCpuError::SetLapicState(e.into()))
     }
-
     ///
     /// Returns the vcpu's current "multiprocessing state".
     ///
     fn get_mp_state(&self) -> cpu::Result<MpState> {
         Ok(MpState::Mshv)
     }
-
     ///
     /// Sets the vcpu's current "multiprocessing state".
     ///
     fn set_mp_state(&self, _mp_state: MpState) -> cpu::Result<()> {
         Ok(())
     }
-
     ///
     /// Set CPU state
     ///
@@ -1186,7 +1080,6 @@ impl cpu::Vcpu for MshvVcpu {
             .map_err(|e| cpu::HypervisorCpuError::SetDebugRegs(e.into()))?;
         Ok(())
     }
-
     ///
     /// Get CPU State
     ///
@@ -1223,7 +1116,6 @@ impl cpu::Vcpu for MshvVcpu {
         }
         .into())
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Translate guest virtual address to guest physical address
@@ -1240,7 +1132,6 @@ impl cpu::Vcpu for MshvVcpu {
 
         Ok((gpa, result_code))
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Return the list of initial MSR entries for a VCPU
@@ -1261,18 +1152,6 @@ impl cpu::Vcpu for MshvVcpu {
         ]
         .to_vec()
     }
-
-    ///
-    /// Sets the AMD specific vcpu's sev control register.
-    ///
-    #[cfg(feature = "sev_snp")]
-    fn set_sev_control_register(&self, vmsa_pfn: u64) -> cpu::Result<()> {
-        let sev_control_reg = snp::get_sev_control_register(vmsa_pfn);
-
-        self.fd
-            .set_sev_control_register(sev_control_reg)
-            .map_err(|e| cpu::HypervisorCpuError::SetSevControlRegister(e.into()))
-    }
 }
 
 impl MshvVcpu {
@@ -1285,7 +1164,6 @@ impl MshvVcpu {
             .get_xsave()
             .map_err(|e| cpu::HypervisorCpuError::GetXsaveState(e.into()))
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// X86 specific call that sets the vcpu's current "xsave struct".
@@ -1295,7 +1173,6 @@ impl MshvVcpu {
             .set_xsave(xsave)
             .map_err(|e| cpu::HypervisorCpuError::SetXsaveState(e.into()))
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// X86 specific call that returns the vcpu's current "xcrs".
@@ -1305,7 +1182,6 @@ impl MshvVcpu {
             .get_xcrs()
             .map_err(|e| cpu::HypervisorCpuError::GetXcsr(e.into()))
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// X86 specific call that sets the vcpu's current "xcrs".
@@ -1315,7 +1191,6 @@ impl MshvVcpu {
             .set_xcrs(xcrs)
             .map_err(|e| cpu::HypervisorCpuError::SetXcsr(e.into()))
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Returns currently pending exceptions, interrupts, and NMIs as well as related
@@ -1326,7 +1201,6 @@ impl MshvVcpu {
             .get_vcpu_events()
             .map_err(|e| cpu::HypervisorCpuError::GetVcpuEvents(e.into()))
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Sets pending exceptions, interrupts, and NMIs as well as related states
@@ -1469,8 +1343,6 @@ pub struct MshvVm {
     fd: Arc<VmFd>,
     msrs: Vec<MsrEntry>,
     dirty_log_slots: Arc<RwLock<HashMap<u64, MshvDirtyLogSlot>>>,
-    #[cfg(feature = "sev_snp")]
-    sev_snp_enabled: bool,
 }
 
 impl MshvVm {
@@ -1508,7 +1380,6 @@ impl vm::Vm for MshvVm {
     fn set_identity_map_address(&self, _address: u64) -> vm::Result<()> {
         Ok(())
     }
-
     #[cfg(target_arch = "x86_64")]
     ///
     /// Sets the address of the three-page region in the VM's address space.
@@ -1516,14 +1387,12 @@ impl vm::Vm for MshvVm {
     fn set_tss_address(&self, _offset: usize) -> vm::Result<()> {
         Ok(())
     }
-
     ///
     /// Creates an in-kernel interrupt controller.
     ///
     fn create_irq_chip(&self) -> vm::Result<()> {
         Ok(())
     }
-
     ///
     /// Registers an event that will, when signaled, trigger the `gsi` IRQ.
     ///
@@ -1536,7 +1405,6 @@ impl vm::Vm for MshvVm {
 
         Ok(())
     }
-
     ///
     /// Unregisters an event that will, when signaled, trigger the `gsi` IRQ.
     ///
@@ -1549,7 +1417,6 @@ impl vm::Vm for MshvVm {
 
         Ok(())
     }
-
     ///
     /// Creates a VcpuFd object from a vcpu RawFd.
     ///
@@ -1568,33 +1435,23 @@ impl vm::Vm for MshvVm {
             cpuid: Vec::new(),
             msrs: self.msrs.clone(),
             vm_ops,
-            #[cfg(feature = "sev_snp")]
-            vm_fd: self.fd.clone(),
         };
         Ok(Arc::new(vcpu))
     }
-
     #[cfg(target_arch = "x86_64")]
     fn enable_split_irq(&self) -> vm::Result<()> {
         Ok(())
     }
-
     #[cfg(target_arch = "x86_64")]
     fn enable_sgx_attribute(&self, _file: File) -> vm::Result<()> {
         Ok(())
     }
-
     fn register_ioevent(
         &self,
         fd: &EventFd,
         addr: &IoEventAddress,
         datamatch: Option<DataMatch>,
     ) -> vm::Result<()> {
-        #[cfg(feature = "sev_snp")]
-        if self.sev_snp_enabled {
-            return Ok(());
-        }
-
         let addr = &mshv_ioctls::IoEventAddress::from(*addr);
         debug!(
             "register_ioevent fd {} addr {:x?} datamatch {:?}",
@@ -1619,7 +1476,6 @@ impl vm::Vm for MshvVm {
                 .map_err(|e| vm::HypervisorVmError::RegisterIoEvent(e.into()))
         }
     }
-
     /// Unregister an event from a certain address it has been previously registered to.
     fn unregister_ioevent(&self, fd: &EventFd, addr: &IoEventAddress) -> vm::Result<()> {
         let addr = &mshv_ioctls::IoEventAddress::from(*addr);
@@ -1674,7 +1530,7 @@ impl vm::Vm for MshvVm {
         readonly: bool,
         _log_dirty_pages: bool,
     ) -> UserMemoryRegion {
-        let mut flags = HV_MAP_GPA_READABLE | HV_MAP_GPA_EXECUTABLE | HV_MAP_GPA_ADJUSTABLE;
+        let mut flags = HV_MAP_GPA_READABLE | HV_MAP_GPA_EXECUTABLE;
         if !readonly {
             flags |= HV_MAP_GPA_WRITABLE;
         }
@@ -1744,7 +1600,6 @@ impl vm::Vm for MshvVm {
             .set_msi_routing(&msi_routing[0])
             .map_err(|e| vm::HypervisorVmError::SetGsiRouting(e.into()))
     }
-
     ///
     /// Start logging dirty pages
     ///
@@ -1753,7 +1608,6 @@ impl vm::Vm for MshvVm {
             .enable_dirty_page_tracking()
             .map_err(|e| vm::HypervisorVmError::StartDirtyLog(e.into()))
     }
-
     ///
     /// Stop logging dirty pages
     ///
@@ -1772,7 +1626,6 @@ impl vm::Vm for MshvVm {
             .map_err(|e| vm::HypervisorVmError::StartDirtyLog(e.into()))?;
         Ok(())
     }
-
     ///
     /// Get dirty pages bitmap (one bit per page)
     ///
@@ -1785,24 +1638,20 @@ impl vm::Vm for MshvVm {
             )
             .map_err(|e| vm::HypervisorVmError::GetDirtyLog(e.into()))
     }
-
     /// Retrieve guest clock.
     #[cfg(target_arch = "x86_64")]
     fn get_clock(&self) -> vm::Result<ClockData> {
         Ok(ClockData::Mshv)
     }
-
     /// Set guest clock.
     #[cfg(target_arch = "x86_64")]
     fn set_clock(&self, _data: &ClockData) -> vm::Result<()> {
         Ok(())
     }
-
     /// Downcast to the underlying MshvVm type
     fn as_any(&self) -> &dyn Any {
         self
     }
-
     /// Initialize the SEV-SNP VM
     #[cfg(feature = "sev_snp")]
     fn sev_snp_init(&self) -> vm::Result<()> {
@@ -1814,9 +1663,6 @@ impl vm::Vm for MshvVm {
             .map_err(|e| vm::HypervisorVmError::InitializeSevSnp(e.into()))
     }
 
-    ///
-    /// Importing isolated pages, these pages will be used
-    /// for the PSP(Platform Security Processor) measurement.
     #[cfg(feature = "sev_snp")]
     fn import_isolated_pages(
         &self,
@@ -1844,16 +1690,11 @@ impl vm::Vm for MshvVm {
             .import_isolated_pages(&isolated_pages[0])
             .map_err(|e| vm::HypervisorVmError::ImportIsolatedPages(e.into()))
     }
-
-    ///
-    /// Complete isolated import, telling the hypervisor that
-    /// importing the pages to guest memory is complete.
-    ///
     #[cfg(feature = "sev_snp")]
     fn complete_isolated_import(
         &self,
         snp_id_block: IGVM_VHS_SNP_ID_BLOCK,
-        host_data: [u8; 32],
+        host_data: &[u8],
         id_block_enabled: u8,
     ) -> vm::Result<()> {
         let mut auth_info = hv_snp_id_auth_info {
@@ -1886,7 +1727,7 @@ impl vm::Vm for MshvVm {
                         policy: get_default_snp_guest_policy(),
                     },
                     id_auth_info: auth_info,
-                    host_data,
+                    host_data: host_data[0..32].try_into().unwrap(),
                     id_block_enabled,
                     author_key_enabled: 0,
                 },

hypervisor/src/vm.rs

@@ -385,7 +385,7 @@ pub trait Vm: Send + Sync + Any {
     fn complete_isolated_import(
         &self,
         _snp_id_block: IGVM_VHS_SNP_ID_BLOCK,
-        _host_data: [u8; 32],
+        _host_data: &[u8],
         _id_block_enabled: u8,
     ) -> Result<()> {
         unimplemented!()

net_gen/Cargo.toml

@@ -5,4 +5,4 @@ authors = ["The Chromium OS Authors"]
 edition = "2021"
 
 [dependencies]
-vmm-sys-util = "0.12.1"
+vmm-sys-util = "0.11.0"

net_util/Cargo.toml

@@ -6,23 +6,23 @@ edition = "2021"
 
 [dependencies]
 epoll = "4.3.3"
-getrandom = "0.2.11"
+getrandom = "0.2.10"
-libc = "0.2.153"
+libc = "0.2.147"
-log = "0.4.20"
+log = "0.4.17"
 net_gen = { path = "../net_gen" }
 rate_limiter = { path = "../rate_limiter" }
-serde = "1.0.196"
+serde = "1.0.168"
-thiserror = "1.0.52"
+thiserror = "1.0.40"
-versionize = "0.2.0"
+versionize = "0.1.10"
-versionize_derive = "0.1.6"
+versionize_derive = "0.1.4"
 virtio-bindings = "0.2.0"
-virtio-queue = "0.11.0"
+virtio-queue = "0.9.0"
-vm-memory = { version = "0.14.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
+vm-memory = { version = "0.12.2", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
 vm-virtio = { path = "../vm-virtio" }
-vmm-sys-util = "0.12.1"
+vmm-sys-util = "0.11.0"
 
 [dev-dependencies]
-once_cell = "1.19.0"
+once_cell = "1.18.0"
 pnet = "0.34.0"
 pnet_datalink = "0.34.0"
-serde_json = "1.0.109"
+serde_json = "1.0.107"

net_util/src/open_tap.rs

@@ -72,10 +72,6 @@ pub fn open_tap(
     let mut taps: Vec<Tap> = Vec::new();
     let mut ifname: String = String::new();
     let vnet_hdr_size = vnet_hdr_len() as i32;
-    // Check if the given interface exists before we create it.
-    let tap_existed = if_name.map_or(false, |n| {
-        Path::new(&format!("/sys/class/net/{n}")).exists()
-    });
 
     // In case the tap interface already exists, check if the number of
     // queues is appropriate. The tap might not support multiqueue while
@@ -91,19 +87,11 @@ pub fn open_tap(
                 Some(name) => Tap::open_named(name, num_rx_q, flags).map_err(Error::TapOpen)?,
                 None => Tap::new(num_rx_q).map_err(Error::TapOpen)?,
             };
-            // Don't overwrite ip configuration of existing interfaces:
+            if let Some(ip) = ip_addr {
-            if !tap_existed {
+                tap.set_ip_addr(ip).map_err(Error::TapSetIp)?;
-                if let Some(ip) = ip_addr {
+            }
-                    tap.set_ip_addr(ip).map_err(Error::TapSetIp)?;
+            if let Some(mask) = netmask {
-                }
+                tap.set_netmask(mask).map_err(Error::TapSetNetmask)?;
-                if let Some(mask) = netmask {
-                    tap.set_netmask(mask).map_err(Error::TapSetNetmask)?;
-                }
-            } else {
-                warn!(
-                    "Tap {} already exists. IP configuration will not be overwritten.",
-                    if_name.unwrap_or_default()
-                );
             }
             if let Some(mac) = host_mac {
                 tap.set_mac_addr(*mac).map_err(Error::TapSetMac)?

option_parser/src/lib.rs

@@ -290,17 +290,6 @@ impl TupleValue for Vec<u64> {
     }
 }
 
-impl TupleValue for Vec<usize> {
-    fn parse_value(input: &str) -> Result<Self, TupleError> {
-        Ok(IntegerList::from_str(input)
-            .map_err(TupleError::InvalidIntegerList)?
-            .0
-            .iter()
-            .map(|v| *v as usize)
-            .collect())
-    }
-}
-
 pub struct Tuple<S, T>(pub Vec<(S, T)>);
 
 pub enum TupleError {

pci/Cargo.toml

@@ -10,21 +10,21 @@ kvm = ["vfio-ioctls/kvm"]
 mshv = ["vfio-ioctls/mshv"]
 
 [dependencies]
-anyhow = "1.0.79"
+anyhow = "1.0.75"
 byteorder = "1.4.3"
 hypervisor = { path = "../hypervisor" }
 vfio-bindings = { git = "https://github.com/rust-vmm/vfio", branch = "main", features = ["fam-wrappers"] }
 vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false }
 vfio_user = { git = "https://github.com/rust-vmm/vfio-user", branch = "main" }
 
-vmm-sys-util = "0.12.1"
+vmm-sys-util = "0.11.0"
-libc = "0.2.153"
+libc = "0.2.147"
-log = "0.4.20"
+log = "0.4.17"
-serde = { version = "1.0.196", features = ["derive"] }
+serde = { version = "1.0.168", features = ["derive"] }
-thiserror = "1.0.52"
+thiserror = "1.0.40"
-versionize = "0.2.0"
+versionize = "0.1.10"
-versionize_derive = "0.1.6"
+versionize_derive = "0.1.4"
 vm-allocator = { path = "../vm-allocator" }
 vm-device = { path = "../vm-device" }
-vm-memory = { version = "0.14.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
+vm-memory = { version = "0.12.2", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
 vm-migration = { path = "../vm-migration" }

pci/src/device.rs

@@ -58,8 +58,7 @@ pub trait PciDevice: BusDevice {
     fn allocate_bars(
         &mut self,
         _allocator: &Arc<Mutex<SystemAllocator>>,
-        _mmio32_allocator: &mut AddressAllocator,
+        _mmio_allocator: &mut AddressAllocator,
-        _mmio64_allocator: &mut AddressAllocator,
         _resources: Option<Vec<Resource>>,
     ) -> Result<Vec<PciBarConfiguration>> {
         Ok(Vec::new())
@@ -69,8 +68,7 @@ pub trait PciDevice: BusDevice {
     fn free_bars(
         &mut self,
         _allocator: &mut SystemAllocator,
-        _mmio32_allocator: &mut AddressAllocator,
+        _mmio_allocator: &mut AddressAllocator,
-        _mmio64_allocator: &mut AddressAllocator,
     ) -> Result<()> {
         Ok(())
     }

pci/src/vfio.rs

@@ -529,13 +529,10 @@ impl VfioCommon {
         }
     }
 
-    // The `allocator` argument is unused on `aarch64`
-    #[allow(unused_variables)]
     pub(crate) fn allocate_bars(
         &mut self,
         allocator: &Arc<Mutex<SystemAllocator>>,
-        mmio32_allocator: &mut AddressAllocator,
+        mmio_allocator: &mut AddressAllocator,
-        mmio64_allocator: &mut AddressAllocator,
         resources: Option<Vec<Resource>>,
     ) -> Result<Vec<PciBarConfiguration>, PciDeviceError> {
         let mut bars = Vec::new();
@@ -684,23 +681,26 @@ impl VfioCommon {
                 }
                 PciBarRegionType::Memory32BitRegion => {
                     // BAR allocation must be naturally aligned
-                    mmio32_allocator
+                    allocator
-                        .allocate(restored_bar_addr, region_size, Some(region_size))
+                        .lock()
+                        .unwrap()
+                        .allocate_mmio_hole_addresses(
+                            restored_bar_addr,
+                            region_size,
+                            Some(region_size),
+                        )
                         .ok_or(PciDeviceError::IoAllocationFailed(region_size))?
                 }
                 PciBarRegionType::Memory64BitRegion => {
                     // We need do some fixup to keep MMIO RW region and msix cap region page size
                     // aligned.
                     region_size = self.fixup_msix_region(bar_id, region_size);
-                    mmio64_allocator
+                    mmio_allocator
                         .allocate(
                             restored_bar_addr,
                             region_size,
-                            Some(std::cmp::max(
+                            // SAFETY: FFI call. Trivially safe.
-                                // SAFETY: FFI call. Trivially safe.
+                            Some(unsafe { sysconf(_SC_PAGESIZE) as GuestUsize }),
-                                unsafe { sysconf(_SC_PAGESIZE) as GuestUsize },
-                                region_size,
-                            )),
                         )
                         .ok_or(PciDeviceError::IoAllocationFailed(region_size))?
                 }
@@ -742,13 +742,10 @@ impl VfioCommon {
         Ok(bars)
     }
 
-    // The `allocator` argument is unused on `aarch64`
-    #[allow(unused_variables)]
     pub(crate) fn free_bars(
         &mut self,
         allocator: &mut SystemAllocator,
-        mmio32_allocator: &mut AddressAllocator,
+        mmio_allocator: &mut AddressAllocator,
-        mmio64_allocator: &mut AddressAllocator,
     ) -> Result<(), PciDeviceError> {
         for region in self.mmio_regions.iter() {
             match region.type_ {
@@ -759,10 +756,10 @@ impl VfioCommon {
                     error!("I/O region is not supported");
                 }
                 PciBarRegionType::Memory32BitRegion => {
-                    mmio32_allocator.free(region.start, region.length);
+                    allocator.free_mmio_hole_addresses(region.start, region.length);
                 }
                 PciBarRegionType::Memory64BitRegion => {
-                    mmio64_allocator.free(region.start, region.length);
+                    mmio_allocator.free(region.start, region.length);
                 }
             }
         }
@@ -1571,16 +1568,6 @@ impl VfioPciDevice {
                     self.vm
                         .create_user_memory_region(mem_region)
                         .map_err(VfioPciError::CreateUserMemoryRegion)?;
-
-                    if !self.iommu_attached {
-                        self.container
-                            .vfio_dma_map(
-                                user_memory_region.start,
-                                user_memory_region.size,
-                                user_memory_region.host_addr,
-                            )
-                            .map_err(VfioPciError::DmaMap)?;
-                    }
                 }
             }
         }
@@ -1591,16 +1578,6 @@ impl VfioPciDevice {
     pub fn unmap_mmio_regions(&mut self) {
         for region in self.common.mmio_regions.iter() {
             for user_memory_region in region.user_memory_regions.iter() {
-                // Unmap from vfio container
-                if !self.iommu_attached {
-                    if let Err(e) = self
-                        .container
-                        .vfio_dma_unmap(user_memory_region.start, user_memory_region.size)
-                    {
-                        error!("Could not unmap mmio region from vfio container: {}", e);
-                    }
-                }
-
                 // Remove region
                 let r = self.vm.make_user_memory_region(
                     user_memory_region.slot,
@@ -1717,22 +1694,19 @@ impl PciDevice for VfioPciDevice {
     fn allocate_bars(
         &mut self,
         allocator: &Arc<Mutex<SystemAllocator>>,
-        mmio32_allocator: &mut AddressAllocator,
+        mmio_allocator: &mut AddressAllocator,
-        mmio64_allocator: &mut AddressAllocator,
         resources: Option<Vec<Resource>>,
     ) -> Result<Vec<PciBarConfiguration>, PciDeviceError> {
         self.common
-            .allocate_bars(allocator, mmio32_allocator, mmio64_allocator, resources)
+            .allocate_bars(allocator, mmio_allocator, resources)
     }
 
     fn free_bars(
         &mut self,
         allocator: &mut SystemAllocator,
-        mmio32_allocator: &mut AddressAllocator,
+        mmio_allocator: &mut AddressAllocator,
-        mmio64_allocator: &mut AddressAllocator,
     ) -> Result<(), PciDeviceError> {
-        self.common
+        self.common.free_bars(allocator, mmio_allocator)
-            .free_bars(allocator, mmio32_allocator, mmio64_allocator)
     }
 
     fn write_config_register(

pci/src/vfio_user.rs

@@ -397,22 +397,19 @@ impl PciDevice for VfioUserPciDevice {
     fn allocate_bars(
         &mut self,
         allocator: &Arc<Mutex<SystemAllocator>>,
-        mmio32_allocator: &mut AddressAllocator,
+        mmio_allocator: &mut AddressAllocator,
-        mmio64_allocator: &mut AddressAllocator,
         resources: Option<Vec<Resource>>,
     ) -> Result<Vec<PciBarConfiguration>, PciDeviceError> {
         self.common
-            .allocate_bars(allocator, mmio32_allocator, mmio64_allocator, resources)
+            .allocate_bars(allocator, mmio_allocator, resources)
     }
 
     fn free_bars(
         &mut self,
         allocator: &mut SystemAllocator,
-        mmio32_allocator: &mut AddressAllocator,
+        mmio_allocator: &mut AddressAllocator,
-        mmio64_allocator: &mut AddressAllocator,
     ) -> Result<(), PciDeviceError> {
-        self.common
+        self.common.free_bars(allocator, mmio_allocator)
-            .free_bars(allocator, mmio32_allocator, mmio64_allocator)
     }
 
     fn as_any(&mut self) -> &mut dyn Any {

performance-metrics/Cargo.toml

@@ -6,10 +6,10 @@ edition = "2021"
 build = "../build.rs"
 
 [dependencies]
-clap = { version = "4.4.7", features = ["wrap_help"] }
+clap = { version = "4.0.32", features = ["wrap_help"] }
 dirs = "5.0.0"
-serde = { version = "1.0.196", features = ["rc", "derive"] }
+serde = { version = "1.0.168", features = ["rc", "derive"] }
-serde_json = "1.0.109"
+serde_json = "1.0.107"
 test_infra = { path = "../test_infra" }
-thiserror = "1.0.52"
+thiserror = "1.0.40"
 wait-timeout = "0.2.0"

performance-metrics/src/performance_tests.rs

@@ -19,7 +19,6 @@ pub const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-amd64-custom-20210609-
 #[cfg(target_arch = "aarch64")]
 pub const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-arm64-custom-20210929-0-update-tool.raw";
 
-#[allow(dead_code)]
 #[derive(Debug)]
 enum Error {
     BootTimeParse,

rate_limiter/Cargo.toml

@@ -4,8 +4,6 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-epoll = "4.3.3"
+libc = "0.2.147"
-libc = "0.2.153"
+log = "0.4.17"
-log = "0.4.20"
+vmm-sys-util = "0.11.0"
-thiserror = "1.0.40"
-vmm-sys-util = "0.12.1"

rate_limiter/src/group.rs

@@ -1,526 +0,0 @@
-// Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-//
-// Copyright 2023 Crusoe Energy Systems LLC
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::{RateLimiter, TokenType};
-use core::panic::AssertUnwindSafe;
-use std::fs::File;
-use std::io;
-use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
-use std::result;
-use std::sync::{Arc, Mutex};
-use std::thread;
-use thiserror::Error;
-use vmm_sys_util::eventfd::EventFd;
-
-/// Errors associated with rate-limiter group.
-#[derive(Debug, Error)]
-pub enum Error {
-    /// Cannot create thread
-    #[error("Error spawning rate-limiter thread {0}")]
-    ThreadSpawn(#[source] io::Error),
-
-    /// Cannot create epoll context.
-    #[error("Error creating epoll context: {0}")]
-    Epoll(#[source] io::Error),
-
-    /// Cannot create EventFd.
-    #[error("Error creating EventFd: {0}")]
-    EventFd(#[source] io::Error),
-
-    /// Cannot create RateLimiter.
-    #[error("Error creating RateLimiter: {0}")]
-    RateLimiter(#[source] io::Error),
-
-    /// Cannot read from EventFd.
-    #[error("Error reading from EventFd: {0}")]
-    EventFdRead(#[source] io::Error),
-
-    /// Cannot write to EventFd.
-    #[error("Error writing to EventFd: {0}")]
-    EventFdWrite(#[source] io::Error),
-}
-
-/// The RateLimiterGroupHandle is a handle to a RateLimiterGroup that may be
-/// used in exactly the same way as the RateLimiter type. When the RateLimiter
-/// within a RateLimiterGroup is unblocked, each RateLimiterGroupHandle will
-/// be notified.
-pub struct RateLimiterGroupHandle {
-    eventfd: Arc<EventFd>,
-    inner: Arc<RateLimiterGroupInner>,
-}
-
-impl RateLimiterGroupHandle {
-    fn new(inner: Arc<RateLimiterGroupInner>) -> result::Result<Self, Error> {
-        let eventfd = Arc::new(EventFd::new(0).map_err(Error::EventFd)?);
-        inner.handles.lock().unwrap().push(eventfd.clone());
-        Ok(Self { eventfd, inner })
-    }
-
-    /// Attempts to consume tokens and returns whether that is possible.
-    ///
-    /// If rate limiting is disabled on provided `token_type`, this function will always succeed.
-    pub fn consume(&self, tokens: u64, token_type: TokenType) -> bool {
-        self.inner.rate_limiter.consume(tokens, token_type)
-    }
-
-    /// Adds tokens of `token_type` to their respective bucket.
-    ///
-    /// Can be used to *manually* add tokens to a bucket. Useful for reverting a
-    /// `consume()` if needed.
-    pub fn manual_replenish(&self, tokens: u64, token_type: TokenType) {
-        self.inner.rate_limiter.manual_replenish(tokens, token_type)
-    }
-
-    /// This function needs to be called every time there is an event on the
-    /// FD provided by this object's `AsRawFd` trait implementation.
-    ///
-    /// # Errors
-    ///
-    /// If the rate limiter is disabled or is not blocked, an error is returned.
-    pub fn event_handler(&self) -> Result<(), Error> {
-        self.eventfd.read().map_err(Error::EventFdRead).map(|_| ())
-    }
-
-    /// Returns whether this rate limiter is blocked.
-    ///
-    /// The limiter 'blocks' when a `consume()` operation fails because there was not enough
-    /// budget for it.
-    /// An event will be generated on the exported FD when the limiter 'unblocks'.
-    pub fn is_blocked(&self) -> bool {
-        self.inner.rate_limiter.is_blocked()
-    }
-}
-
-impl Clone for RateLimiterGroupHandle {
-    fn clone(&self) -> Self {
-        RateLimiterGroupHandle::new(self.inner.clone()).unwrap()
-    }
-}
-
-impl AsRawFd for RateLimiterGroupHandle {
-    fn as_raw_fd(&self) -> RawFd {
-        self.eventfd.as_raw_fd()
-    }
-}
-
-impl Drop for RateLimiterGroupHandle {
-    fn drop(&mut self) {
-        let mut handles = self.inner.handles.lock().unwrap();
-        let index = handles
-            .iter()
-            .position(|handle| handle.as_raw_fd() == self.eventfd.as_raw_fd())
-            .expect("RateLimiterGroupHandle must be subscribed to RateLimiterGroup");
-        handles.remove(index);
-    }
-}
-
-struct RateLimiterGroupInner {
-    id: String,
-    rate_limiter: RateLimiter,
-    handles: Mutex<Vec<Arc<EventFd>>>,
-}
-
-/// A RateLimiterGroup is an extension of RateLimiter that enables rate-limiting
-/// the aggregate io consumption of multiple consumers.
-pub struct RateLimiterGroup {
-    inner: Arc<RateLimiterGroupInner>,
-    epoll_file: File,
-    kill_evt: EventFd,
-    epoll_thread: Option<thread::JoinHandle<()>>,
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-#[repr(u64)]
-enum EpollDispatch {
-    Kill = 1,
-    Unblocked = 2,
-    Unknown,
-}
-
-impl From<u64> for EpollDispatch {
-    fn from(v: u64) -> Self {
-        use EpollDispatch::*;
-        match v {
-            1 => Kill,
-            2 => Unblocked,
-            _ => Unknown,
-        }
-    }
-}
-
-impl RateLimiterGroup {
-    /// Create a new RateLimiterGroup.
-    pub fn new(
-        id: &str,
-        bytes_total_capacity: u64,
-        bytes_one_time_burst: u64,
-        bytes_complete_refill_time_ms: u64,
-        ops_total_capacity: u64,
-        ops_one_time_burst: u64,
-        ops_complete_refill_time_ms: u64,
-    ) -> result::Result<Self, Error> {
-        let rate_limiter = RateLimiter::new(
-            bytes_total_capacity,
-            bytes_one_time_burst,
-            bytes_complete_refill_time_ms,
-            ops_total_capacity,
-            ops_one_time_burst,
-            ops_complete_refill_time_ms,
-        )
-        .map_err(Error::RateLimiter)?;
-
-        let epoll_fd = epoll::create(true).map_err(Error::Epoll)?;
-        let kill_evt = EventFd::new(0).map_err(Error::EventFd)?;
-
-        epoll::ctl(
-            epoll_fd,
-            epoll::ControlOptions::EPOLL_CTL_ADD,
-            kill_evt.as_raw_fd(),
-            epoll::Event::new(epoll::Events::EPOLLIN, EpollDispatch::Kill as u64),
-        )
-        .map_err(Error::Epoll)?;
-
-        epoll::ctl(
-            epoll_fd,
-            epoll::ControlOptions::EPOLL_CTL_ADD,
-            rate_limiter.as_raw_fd(),
-            epoll::Event::new(epoll::Events::EPOLLIN, EpollDispatch::Unblocked as u64),
-        )
-        .map_err(Error::Epoll)?;
-
-        // Use 'File' to enforce closing on 'epoll_fd'
-        // SAFETY: epoll_fd is valid
-        let epoll_file = unsafe { File::from_raw_fd(epoll_fd) };
-
-        Ok(Self {
-            inner: Arc::new(RateLimiterGroupInner {
-                id: id.to_string(),
-                rate_limiter,
-                handles: Mutex::new(Vec::new()),
-            }),
-            epoll_file,
-            kill_evt,
-            epoll_thread: None,
-        })
-    }
-
-    /// Create a new RateLimiterGroupHandle.
-    pub fn new_handle(&self) -> result::Result<RateLimiterGroupHandle, Error> {
-        RateLimiterGroupHandle::new(self.inner.clone())
-    }
-
-    /// Start a worker thread to broadcast an event to each RateLimiterGroupHandle
-    /// when the RateLimiter becomes unblocked.
-    pub fn start_thread(&mut self, exit_evt: EventFd) -> result::Result<(), Error> {
-        let inner = self.inner.clone();
-        let epoll_fd = self.epoll_file.as_raw_fd();
-        thread::Builder::new()
-            .name(format!("rate-limit-group-{}", inner.id))
-            .spawn(move || {
-                let res = std::panic::catch_unwind(AssertUnwindSafe(move || {
-                    const EPOLL_EVENTS_LEN: usize = 2;
-
-                    let mut events =
-                        [epoll::Event::new(epoll::Events::empty(), 0); EPOLL_EVENTS_LEN];
-
-                    loop {
-                        let num_events = match epoll::wait(epoll_fd, -1, &mut events[..]) {
-                            Ok(res) => res,
-                            Err(e) => {
-                                if e.kind() == io::ErrorKind::Interrupted {
-                                    continue;
-                                } else {
-                                    return Err(Error::Epoll(e));
-                                }
-                            }
-                        };
-
-                        for event in events.iter().take(num_events) {
-                            let dispatch_event: EpollDispatch = event.data.into();
-                            match dispatch_event {
-                                EpollDispatch::Unknown => {
-                                    let event = event.data;
-                                    warn!("Unknown rate-limiter loop event: {}", event);
-                                }
-                                EpollDispatch::Unblocked => {
-                                    inner.rate_limiter.event_handler().unwrap();
-                                    let handles = inner.handles.lock().unwrap();
-                                    for handle in handles.iter() {
-                                        handle.write(1).map_err(Error::EventFdWrite)?
-                                    }
-                                }
-                                EpollDispatch::Kill => {
-                                    info!(
-                                        "KILL_EVENT received, stopping rate-limit-group epoll loop"
-                                    );
-                                    return Ok(());
-                                }
-                            }
-                        }
-                    }
-                }));
-
-                match res {
-                    Ok(res) => {
-                        if let Err(e) = res {
-                            error!("Error running rate-limit-group worker: {:?}", e);
-                            exit_evt.write(1).unwrap();
-                        }
-                    }
-                    Err(_) => {
-                        error!("rate-limit-group worker panicked");
-                        exit_evt.write(1).unwrap();
-                    }
-                };
-            })
-            .map(|thread| self.epoll_thread.insert(thread))
-            .map_err(Error::ThreadSpawn)?;
-
-        Ok(())
-    }
-}
-
-impl Drop for RateLimiterGroup {
-    fn drop(&mut self) {
-        self.kill_evt.write(1).unwrap();
-
-        if let Some(t) = self.epoll_thread.take() {
-            if let Err(e) = t.join() {
-                error!("Error joining thread: {:?}", e);
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-pub(crate) mod tests {
-    use super::RateLimiterGroupHandle;
-    use crate::{group::RateLimiterGroup, TokenBucket, TokenType, REFILL_TIMER_INTERVAL_MS};
-    use std::{os::fd::AsRawFd, thread, time::Duration};
-    use vmm_sys_util::eventfd::EventFd;
-
-    impl RateLimiterGroupHandle {
-        pub fn bandwidth(&self) -> Option<TokenBucket> {
-            let guard = self.inner.rate_limiter.inner.lock().unwrap();
-            guard.bandwidth.clone()
-        }
-
-        pub fn ops(&self) -> Option<TokenBucket> {
-            let guard = self.inner.rate_limiter.inner.lock().unwrap();
-            guard.ops.clone()
-        }
-    }
-
-    #[test]
-    fn test_rate_limiter_group_new() {
-        let l = RateLimiterGroup::new("test", 1000, 1001, 1002, 1003, 1004, 1005).unwrap();
-        let h = l.new_handle().unwrap();
-        let bw = h.bandwidth().unwrap();
-        assert_eq!(bw.capacity(), 1000);
-        assert_eq!(bw.one_time_burst(), 1001);
-        assert_eq!(bw.refill_time_ms(), 1002);
-        assert_eq!(bw.budget(), 1000);
-
-        let ops = h.ops().unwrap();
-        assert_eq!(ops.capacity(), 1003);
-        assert_eq!(ops.one_time_burst(), 1004);
-        assert_eq!(ops.refill_time_ms(), 1005);
-        assert_eq!(ops.budget(), 1003);
-    }
-
-    #[test]
-    fn test_rate_limiter_group_manual_replenish() {
-        // rate limiter with limit of 1000 bytes/s and 1000 ops/s
-        let l = RateLimiterGroup::new("test", 1000, 0, 1000, 1000, 0, 1000).unwrap();
-        let h = l.new_handle().unwrap();
-
-        // consume 123 bytes
-        assert!(h.consume(123, TokenType::Bytes));
-        h.manual_replenish(23, TokenType::Bytes);
-        {
-            let bytes_tb = h.bandwidth().unwrap();
-            assert_eq!(bytes_tb.budget(), 900);
-        }
-        // consume 123 ops
-        assert!(h.consume(123, TokenType::Ops));
-        h.manual_replenish(23, TokenType::Ops);
-        {
-            let bytes_tb = h.ops().unwrap();
-            assert_eq!(bytes_tb.budget(), 900);
-        }
-    }
-
-    #[test]
-    fn test_rate_limiter_group_bandwidth() {
-        // rate limiter with limit of 1000 bytes/s
-        let mut l = RateLimiterGroup::new("test", 1000, 0, 1000, 0, 0, 0).unwrap();
-        l.start_thread(EventFd::new(0).unwrap()).unwrap();
-
-        let h = l.new_handle().unwrap();
-
-        // limiter should not be blocked
-        assert!(!h.is_blocked());
-        // raw FD for this disabled should be valid
-        assert!(h.as_raw_fd() > 0);
-
-        // ops/s limiter should be disabled so consume(whatever) should work
-        assert!(h.consume(u64::max_value(), TokenType::Ops));
-
-        // do full 1000 bytes
-        assert!(h.consume(1000, TokenType::Bytes));
-        // try and fail on another 100
-        assert!(!h.consume(100, TokenType::Bytes));
-        // since consume failed, limiter should be blocked now
-        assert!(h.is_blocked());
-        // wait half the timer period
-        thread::sleep(Duration::from_millis(REFILL_TIMER_INTERVAL_MS / 2));
-        // limiter should still be blocked
-        assert!(h.is_blocked());
-        // wait the other half of the timer period
-        thread::sleep(Duration::from_millis(REFILL_TIMER_INTERVAL_MS / 2));
-        // the timer_fd should have an event on it by now
-        assert!(h.event_handler().is_ok());
-        // limiter should now be unblocked
-        assert!(!h.is_blocked());
-        // try and succeed on another 100 bytes this time
-        assert!(h.consume(100, TokenType::Bytes));
-    }
-
-    #[test]
-    fn test_rate_limiter_group_ops() {
-        // rate limiter with limit of 1000 ops/s
-        let mut l = RateLimiterGroup::new("test", 0, 0, 0, 1000, 0, 1000).unwrap();
-        l.start_thread(EventFd::new(0).unwrap()).unwrap();
-
-        let h = l.new_handle().unwrap();
-
-        // limiter should not be blocked
-        assert!(!h.is_blocked());
-        // raw FD for this disabled should be valid
-        assert!(h.as_raw_fd() > 0);
-
-        // bytes/s limiter should be disabled so consume(whatever) should work
-        assert!(h.consume(u64::max_value(), TokenType::Bytes));
-
-        // do full 1000 ops
-        assert!(h.consume(1000, TokenType::Ops));
-        // try and fail on another 100
-        assert!(!h.consume(100, TokenType::Ops));
-        // since consume failed, limiter should be blocked now
-        assert!(h.is_blocked());
-        // wait half the timer period
-        thread::sleep(Duration::from_millis(REFILL_TIMER_INTERVAL_MS / 2));
-        // limiter should still be blocked
-        assert!(h.is_blocked());
-        // wait the other half of the timer period
-        thread::sleep(Duration::from_millis(REFILL_TIMER_INTERVAL_MS / 2));
-        // the timer_fd should have an event on it by now
-        assert!(h.event_handler().is_ok());
-        // limiter should now be unblocked
-        assert!(!h.is_blocked());
-        // try and succeed on another 100 ops this time
-        assert!(h.consume(100, TokenType::Ops));
-    }
-
-    #[test]
-    fn test_rate_limiter_group_full() {
-        // rate limiter with limit of 1000 bytes/s and 1000 ops/s
-        let mut l = RateLimiterGroup::new("test", 1000, 0, 1000, 1000, 0, 1000).unwrap();
-        l.start_thread(EventFd::new(0).unwrap()).unwrap();
-
-        let h = l.new_handle().unwrap();
-
-        // limiter should not be blocked
-        assert!(!h.is_blocked());
-        // raw FD for this disabled should be valid
-        assert!(h.as_raw_fd() > 0);
-
-        // do full 1000 bytes
-        assert!(h.consume(1000, TokenType::Ops));
-        // do full 1000 bytes
-        assert!(h.consume(1000, TokenType::Bytes));
-        // try and fail on another 100 ops
-        assert!(!h.consume(100, TokenType::Ops));
-        // try and fail on another 100 bytes
-        assert!(!h.consume(100, TokenType::Bytes));
-        // since consume failed, limiter should be blocked now
-        assert!(h.is_blocked());
-        // wait half the timer period
-        thread::sleep(Duration::from_millis(REFILL_TIMER_INTERVAL_MS / 2));
-        // limiter should still be blocked
-        assert!(h.is_blocked());
-        // wait the other half of the timer period
-        thread::sleep(Duration::from_millis(REFILL_TIMER_INTERVAL_MS / 2));
-        // the timer_fd should have an event on it by now
-        assert!(h.event_handler().is_ok());
-        // limiter should now be unblocked
-        assert!(!h.is_blocked());
-        // try and succeed on another 100 ops this time
-        assert!(h.consume(100, TokenType::Ops));
-        // try and succeed on another 100 bytes this time
-        assert!(h.consume(100, TokenType::Bytes));
-    }
-
-    #[test]
-    fn test_rate_limiter_group_overconsumption() {
-        // initialize the rate limiter
-        let mut l = RateLimiterGroup::new("test", 1000, 0, 1000, 1000, 0, 1000).unwrap();
-        l.start_thread(EventFd::new(0).unwrap()).unwrap();
-
-        let h = l.new_handle().unwrap();
-
-        // try to consume 2.5x the bucket size
-        // we are "borrowing" 1.5x the bucket size in tokens since
-        // the bucket is full
-        assert!(h.consume(2500, TokenType::Bytes));
-
-        // check that even after a whole second passes, the rate limiter
-        // is still blocked
-        thread::sleep(Duration::from_millis(1000));
-        assert!(h.is_blocked());
-
-        // after 1.5x the replenish time has passed, the rate limiter
-        // is available again
-        thread::sleep(Duration::from_millis(500));
-        assert!(h.event_handler().is_ok());
-        assert!(!h.is_blocked());
-
-        // reset the rate limiter
-        let mut l = RateLimiterGroup::new("test", 1000, 0, 1000, 1000, 0, 1000).unwrap();
-        l.start_thread(EventFd::new(0).unwrap()).unwrap();
-
-        let h = l.new_handle().unwrap();
-        // try to consume 1.5x the bucket size
-        // we are "borrowing" 1.5x the bucket size in tokens since
-        // the bucket is full, should arm the timer to 0.5x replenish
-        // time, which is 500 ms
-        assert!(h.consume(1500, TokenType::Bytes));
-
-        // check that after more than the minimum refill time,
-        // the rate limiter is still blocked
-        thread::sleep(Duration::from_millis(200));
-        assert!(h.is_blocked());
-
-        // try to consume some tokens, which should fail as the timer
-        // is still active
-        assert!(!h.consume(100, TokenType::Bytes));
-        assert!(h.is_blocked());
-
-        // check that after the minimum refill time, the timer was not
-        // overwritten and the rate limiter is still blocked from the
-        // borrowing we performed earlier
-        thread::sleep(Duration::from_millis(100));
-        assert!(h.is_blocked());
-        assert!(!h.consume(100, TokenType::Bytes));
-
-        // after waiting out the full duration, rate limiter should be
-        // available again
-        thread::sleep(Duration::from_millis(200));
-        assert!(h.event_handler().is_ok());
-        assert!(!h.is_blocked());
-        assert!(h.consume(100, TokenType::Bytes));
-    }
-}

rate_limiter/src/lib.rs

@@ -53,9 +53,6 @@ use std::sync::Mutex;
 use std::time::{Duration, Instant};
 use vmm_sys_util::timerfd::TimerFd;
 
-/// Module for group rate limiting.
-pub mod group;
-
 #[derive(Debug)]
 /// Describes the errors that may occur while handling rate limiter events.
 pub enum Error {

release-notes.md

@@ -1,20 +1,4 @@
-- [v38.0](#v380)
+- [v36.1](#v361)
-    - [Group Rate Limiter on Block Devices](#group-rate-limiter-on-block-devices)
-    - [CPU Pinning Support for Block Device Worker Thread](#cpu-pinning-support-for-block-device-worker-thread)
-    - [Optimized Boot Time with Parallel Memory Prefault](#optimized-boot-time-with-parallel-memory-prefault)
-    - [New 'debug-console' Device](#new-debug-console-device)
-    - [Improved VFIO Device Support](#improved-vfio-device-support)
-    - [Extended CPU Affinity Support](#extended-cpu-affinity-support)
-    - [Notable Bug Fixes](#notable-bug-fixes)
-    - [Contributors](#contributors)
-- [v37.0](#v370)
-    - [Long Term Support (LTS) Release](#long-term-support-lts-release)
-    - [Multiple PCI segments Support for 32-bit VFIO devices](#multiple-pci-segments-support-for-32-bit-vfio-devices)
-    - [Configurable Named TAP Devices](#configurable-named-tap-devices)
-    - [TTY Output from Both Serial Device and Virtio Console](#tty-output-from-both-serial-device-and-virtio-console)
-    - [Faster VM Restoration from Snapshots](#faster-vm-restoration-from-snapshots)
-    - [Notable Bug Fixes](#notable-bug-fixes-1)
-    - [Contributors](#contributors-1)
 - [v36.0](#v360)
     - [Command Line Changes](#command-line-changes)
     - [Enabled Features Reported via API Endpoint and CLI](#enabled-features-reported-via-api-endpoint-and-cli)
@@ -23,31 +7,31 @@
     - [Unix Socket Backend for Serial Port](#unix-socket-backend-for-serial-port)
     - [AIO Backend for Block Devices](#aio-backend-for-block-devices)
     - [Documentation Improvements](#documentation-improvements)
-    - [Notable Bug Fixes](#notable-bug-fixes-2)
+    - [Notable Bug Fixes](#notable-bug-fixes)
-    - [Contributors](#contributors-2)
+    - [Contributors](#contributors)
 - [v35.0](#v350)
     - [`virtio-vsock` Support for Linux Guest Kernel v6.3+](#virtio-vsock-support-for-linux-guest-kernel-v63)
     - [User Specified Serial Number for `virtio-block`](#user-specified-serial-number-for-virtio-block)
     - [vCPU TSC Frequency Included in Migration State](#vcpu-tsc-frequency-included-in-migration-state)
-    - [Notable Bug Fixes](#notable-bug-fixes-3)
+    - [Notable Bug Fixes](#notable-bug-fixes-1)
-    - [Contributors](#contributors-3)
+    - [Contributors](#contributors-1)
 - [v34.0](#v340)
     - [Paravirtualised Panic Device Support](#paravirtualised-panic-device-support)
     - [Improvements to VM Core Dump](#improvements-to-vm-core-dump)
     - [QCOW2 Support for Backing Files](#qcow2-support-for-backing-files)
     - [Minimum Host Kernel Bump](#minimum-host-kernel-bump)
-    - [Notable Bug Fixes](#notable-bug-fixes-4)
+    - [Notable Bug Fixes](#notable-bug-fixes-2)
-    - [Contributors](#contributors-4)
+    - [Contributors](#contributors-2)
 - [v33.0](#v330)
     - [D-Bus based API](#d-bus-based-api)
     - [Expose Host CPU Cache Details for AArch64](#expose-host-cpu-cache-details-for-aarch64)
-    - [Notable Bug Fixes](#notable-bug-fixes-5)
+    - [Notable Bug Fixes](#notable-bug-fixes-3)
-    - [Contributors](#contributors-5)
+    - [Contributors](#contributors-3)
 - [v32.0](#v320)
     - [Increased PCI Segment Limit](#increased-pci-segment-limit)
     - [API Changes](#api-changes)
-    - [Notable Bug Fixes](#notable-bug-fixes-6)
+    - [Notable Bug Fixes](#notable-bug-fixes-4)
-    - [Contributors](#contributors-6)
+    - [Contributors](#contributors-4)
 - [v31.1](#v311)
 - [v31.0](#v310)
     - [Update to Latest `acpi_tables`](#update-to-latest-acpi_tables)
@@ -55,15 +39,15 @@
     - [Improvements on Console `SIGWINCH` Handler](#improvements-on-console-sigwinch-handler)
     - [Remove Directory Support from `MemoryZoneConfig::file`](#remove-directory-support-from-memoryzoneconfigfile)
     - [Documentation Improvements](#documentation-improvements-1)
-    - [Notable Bug Fixes](#notable-bug-fixes-7)
+    - [Notable Bug Fixes](#notable-bug-fixes-5)
-    - [Contributors](#contributors-7)
+    - [Contributors](#contributors-5)
 - [v30.0](#v300)
     - [Command Line Changes for Reduced Binary Size](#command-line-changes-for-reduced-binary-size)
     - [Basic vfio-user Server Support](#basic-vfio-user-server-support)
     - [Heap Profiling Support](#heap-profiling-support)
     - [Documentation Improvements](#documentation-improvements-2)
-    - [Notable Bug Fixes](#notable-bug-fixes-8)
+    - [Notable Bug Fixes](#notable-bug-fixes-6)
-    - [Contributors](#contributors-8)
+    - [Contributors](#contributors-6)
 - [v28.2](#v282)
 - [v29.0](#v290)
     - [Release Binary Supports Both MSHV and KVM](#release-binary-supports-both-mshv-and-kvm)
@@ -73,20 +57,20 @@
     - [`AArch64` Documentation Integration](#aarch64-documentation-integration)
     - [`virtio-block` Counters Enhancement](#virtio-block-counters-enhancement)
     - [TCP Offload Control](#tcp-offload-control)
-    - [Notable Bug Fixes](#notable-bug-fixes-9)
+    - [Notable Bug Fixes](#notable-bug-fixes-7)
     - [Removals](#removals)
     - [Deprecations](#deprecations)
-    - [Contributors](#contributors-9)
+    - [Contributors](#contributors-7)
 - [v28.1](#v281)
 - [v28.0](#v280)
     - [Community Engagement (Reminder)](#community-engagement-reminder)
-    - [Long Term Support (LTS) Release](#long-term-support-lts-release-1)
+    - [Long Term Support (LTS) Release](#long-term-support-lts-release)
     - [Virtualised TPM Support](#virtualised-tpm-support)
     - [Transparent Huge Page Support](#transparent-huge-page-support)
     - [README Quick Start Improved](#readme-quick-start-improved)
-    - [Notable Bug Fixes](#notable-bug-fixes-10)
+    - [Notable Bug Fixes](#notable-bug-fixes-8)
     - [Removals](#removals-1)
-    - [Contributors](#contributors-10)
+    - [Contributors](#contributors-8)
 - [v27.0](#v270)
     - [Community Engagement](#community-engagement)
     - [Prebuilt Packages](#prebuilt-packages)
@@ -95,41 +79,41 @@
     - [Simplified Build Feature Flags](#simplified-build-feature-flags)
     - [Asynchronous Kernel Loading](#asynchronous-kernel-loading)
     - [GDB Support for AArch64](#gdb-support-for-aarch64)
-    - [Notable Bug Fixes](#notable-bug-fixes-11)
+    - [Notable Bug Fixes](#notable-bug-fixes-9)
     - [Deprecations](#deprecations-1)
-    - [Contributors](#contributors-11)
+    - [Contributors](#contributors-9)
 - [v26.0](#v260)
     - [SMBIOS Improvements via `--platform`](#smbios-improvements-via---platform)
     - [Unified Binary MSHV and KVM Support](#unified-binary-mshv-and-kvm-support)
-    - [Notable Bug Fixes](#notable-bug-fixes-12)
+    - [Notable Bug Fixes](#notable-bug-fixes-10)
     - [Deprecations](#deprecations-2)
     - [Removals](#removals-2)
-    - [Contributors](#contributors-12)
+    - [Contributors](#contributors-10)
 - [v25.0](#v250)
     - [`ch-remote` Improvements](#ch-remote-improvements-1)
     - [VM "Coredump" Support](#vm-coredump-support)
-    - [Notable Bug Fixes](#notable-bug-fixes-13)
+    - [Notable Bug Fixes](#notable-bug-fixes-11)
     - [Removals](#removals-3)
-    - [Contributors](#contributors-13)
+    - [Contributors](#contributors-11)
 - [v24.0](#v240)
     - [Bypass Mode for `virtio-iommu`](#bypass-mode-for-virtio-iommu)
     - [Ensure Identifiers Uniqueness](#ensure-identifiers-uniqueness)
     - [Sparse Mmap support](#sparse-mmap-support)
     - [Expose Platform Serial Number](#expose-platform-serial-number)
-    - [Notable Bug Fixes](#notable-bug-fixes-14)
+    - [Notable Bug Fixes](#notable-bug-fixes-12)
     - [Notable Improvements](#notable-improvements)
     - [Deprecations](#deprecations-3)
     - [New on the Website](#new-on-the-website)
-    - [Contributors](#contributors-14)
+    - [Contributors](#contributors-12)
 - [v23.1](#v231)
 - [v23.0](#v230)
     - [vDPA Support](#vdpa-support)
     - [Updated OS Support list](#updated-os-support-list)
     - [`AArch64` Memory Map Improvements](#aarch64-memory-map-improvements)
     - [`AMX` Support](#amx-support)
-    - [Notable Bug Fixes](#notable-bug-fixes-15)
+    - [Notable Bug Fixes](#notable-bug-fixes-13)
     - [Deprecations](#deprecations-4)
-    - [Contributors](#contributors-15)
+    - [Contributors](#contributors-13)
 - [v22.1](#v221)
 - [v22.0](#v220)
     - [GDB Debug Stub Support](#gdb-debug-stub-support)
@@ -140,13 +124,13 @@
     - [PMU Support for AArch64](#pmu-support-for-aarch64)
     - [Documentation Under CC-BY-4.0 License](#documentation-under-cc-by-40-license)
     - [Deprecation of "Classic" `virtiofsd`](#deprecation-of-classic-virtiofsd)
-    - [Notable Bug Fixes](#notable-bug-fixes-16)
+    - [Notable Bug Fixes](#notable-bug-fixes-14)
-    - [Contributors](#contributors-16)
+    - [Contributors](#contributors-14)
 - [v21.0](#v210)
     - [Efficient Local Live Migration (for Live Upgrade)](#efficient-local-live-migration-for-live-upgrade)
     - [Recommended Kernel is Now 5.15](#recommended-kernel-is-now-515)
-    - [Notable Bug fixes](#notable-bug-fixes-17)
+    - [Notable Bug fixes](#notable-bug-fixes-15)
-    - [Contributors](#contributors-17)
+    - [Contributors](#contributors-15)
 - [v20.2](#v202)
 - [v20.1](#v201)
 - [v20.0](#v200)
@@ -155,8 +139,8 @@
     - [Improved VFIO support](#improved-vfio-support)
     - [Safer code](#safer-code)
     - [Extended documentation](#extended-documentation)
-    - [Notable bug fixes](#notable-bug-fixes-18)
+    - [Notable bug fixes](#notable-bug-fixes-16)
-    - [Contributors](#contributors-18)
+    - [Contributors](#contributors-16)
 - [v19.0](#v190)
     - [Improved PTY handling for serial and `virtio-console`](#improved-pty-handling-for-serial-and-virtio-console)
     - [PCI boot time optimisations](#pci-boot-time-optimisations)
@@ -164,8 +148,8 @@
     - [Live migration enhancements](#live-migration-enhancements)
     - [`virtio-mem` support with `vfio-user`](#virtio-mem-support-with-vfio-user)
     - [AArch64 for `virtio-iommu`](#aarch64-for-virtio-iommu)
-    - [Notable bug fixes](#notable-bug-fixes-19)
+    - [Notable bug fixes](#notable-bug-fixes-17)
-    - [Contributors](#contributors-19)
+    - [Contributors](#contributors-17)
 - [v18.0](#v180)
     - [Experimental User Device (`vfio-user`) support](#experimental-user-device-vfio-user-support)
     - [Migration support for `vhost-user` devices](#migration-support-for-vhost-user-devices)
@@ -175,23 +159,23 @@
     - [Live migration on MSHV hypervisor](#live-migration-on-mshv-hypervisor)
     - [AArch64 CPU topology support](#aarch64-cpu-topology-support)
     - [Power button support on AArch64](#power-button-support-on-aarch64)
-    - [Notable bug fixes](#notable-bug-fixes-20)
+    - [Notable bug fixes](#notable-bug-fixes-18)
-    - [Contributors](#contributors-20)
+    - [Contributors](#contributors-18)
 - [v17.0](#v170)
     - [ARM64 NUMA support using ACPI](#arm64-numa-support-using-acpi)
     - [`Seccomp` support for MSHV backend](#seccomp-support-for-mshv-backend)
     - [Hotplug of `macvtap` devices](#hotplug-of-macvtap-devices)
     - [Improved SGX support](#improved-sgx-support)
     - [Inflight tracking for `vhost-user` devices](#inflight-tracking-for-vhost-user-devices)
-    - [Notable bug fixes](#notable-bug-fixes-21)
+    - [Notable bug fixes](#notable-bug-fixes-19)
-    - [Contributors](#contributors-21)
+    - [Contributors](#contributors-19)
 - [v16.0](#v160)
     - [Improved live migration support](#improved-live-migration-support)
     - [Improved `vhost-user` support](#improved-vhost-user-support)
     - [ARM64 ACPI and UEFI support](#arm64-acpi-and-uefi-support)
-    - [Notable bug fixes](#notable-bug-fixes-22)
+    - [Notable bug fixes](#notable-bug-fixes-20)
     - [Removed functionality](#removed-functionality)
-    - [Contributors](#contributors-22)
+    - [Contributors](#contributors-20)
 - [v15.0](#v150)
     - [Version numbering and stability guarantees](#version-numbering-and-stability-guarantees)
     - [Network device rate limiting](#network-device-rate-limiting)
@@ -199,7 +183,7 @@
     - [`--api-socket` supports file descriptor parameter](#--api-socket-supports-file-descriptor-parameter)
     - [Bug fixes](#bug-fixes)
     - [Deprecations](#deprecations-5)
-    - [Contributors](#contributors-23)
+    - [Contributors](#contributors-21)
 - [v0.14.1](#v0141)
 - [v0.14.0](#v0140)
     - [Structured event monitoring](#structured-event-monitoring)
@@ -209,7 +193,7 @@
     - [PTY control for serial and `virtio-console`](#pty-control-for-serial-and-virtio-console)
     - [Block device rate limiting](#block-device-rate-limiting)
     - [Deprecations](#deprecations-6)
-    - [Contributors](#contributors-24)
+    - [Contributors](#contributors-22)
 - [v0.13.0](#v0130)
     - [Wider VFIO device support](#wider-vfio-device-support)
     - [Improved huge page support](#improved-huge-page-support)
@@ -217,13 +201,13 @@
     - [VHD disk image support](#vhd-disk-image-support)
     - [Improved Virtio device threading](#improved-virtio-device-threading)
     - [Clean shutdown support via synthetic power button](#clean-shutdown-support-via-synthetic-power-button)
-    - [Contributors](#contributors-25)
+    - [Contributors](#contributors-23)
 - [v0.12.0](#v0120)
     - [ARM64 enhancements](#arm64-enhancements)
     - [Removal of `vhost-user-net` and `vhost-user-block` self spawning](#removal-of-vhost-user-net-and-vhost-user-block-self-spawning)
     - [Migration of `vhost-user-fs` backend](#migration-of-vhost-user-fs-backend)
     - [Enhanced "info" API](#enhanced-info-api)
-    - [Contributors](#contributors-26)
+    - [Contributors](#contributors-24)
 - [v0.11.0](#v0110)
     - [`io_uring` support by default for `virtio-block`](#io_uring-support-by-default-for-virtio-block)
     - [Windows Guest Support](#windows-guest-support)
@@ -235,15 +219,15 @@
     - [Default Log Level Changed](#default-log-level-changed)
     - [New `--balloon` Parameter Added](#new---balloon-parameter-added)
     - [Experimental `virtio-watchdog` Support](#experimental-virtio-watchdog-support)
-    - [Notable Bug Fixes](#notable-bug-fixes-23)
+    - [Notable Bug Fixes](#notable-bug-fixes-21)
-    - [Contributors](#contributors-27)
+    - [Contributors](#contributors-25)
 - [v0.10.0](#v0100)
     - [`virtio-block` Support for Multiple Descriptors](#virtio-block-support-for-multiple-descriptors)
     - [Memory Zones](#memory-zones)
     - [`Seccomp` Sandbox Improvements](#seccomp-sandbox-improvements)
     - [Preliminary KVM HyperV Emulation Control](#preliminary-kvm-hyperv-emulation-control)
-    - [Notable Bug Fixes](#notable-bug-fixes-24)
+    - [Notable Bug Fixes](#notable-bug-fixes-22)
-    - [Contributors](#contributors-28)
+    - [Contributors](#contributors-26)
 - [v0.9.0](#v090)
     - [`io_uring` Based Block Device Support](#io_uring-based-block-device-support)
     - [Block and Network Device Statistics](#block-and-network-device-statistics)
@@ -256,17 +240,17 @@
     - [Enhancements to ARM64 Support](#enhancements-to-arm64-support)
     - [Intel SGX Support](#intel-sgx-support)
     - [`Seccomp` Sandbox Improvements](#seccomp-sandbox-improvements-1)
-    - [Notable Bug Fixes](#notable-bug-fixes-25)
+    - [Notable Bug Fixes](#notable-bug-fixes-23)
-    - [Contributors](#contributors-29)
+    - [Contributors](#contributors-27)
 - [v0.8.0](#v080)
     - [Experimental Snapshot and Restore Support](#experimental-snapshot-and-restore-support)
     - [Experimental ARM64 Support](#experimental-arm64-support)
     - [Support for Using 5-level Paging in Guests](#support-for-using-5-level-paging-in-guests)
     - [Virtio Device Interrupt Suppression for Network Devices](#virtio-device-interrupt-suppression-for-network-devices)
     - [`vhost_user_fs` Improvements](#vhost_user_fs-improvements)
-    - [Notable Bug Fixes](#notable-bug-fixes-26)
+    - [Notable Bug Fixes](#notable-bug-fixes-24)
     - [Command Line and API Changes](#command-line-and-api-changes)
-    - [Contributors](#contributors-30)
+    - [Contributors](#contributors-28)
 - [v0.7.0](#v070)
     - [Block, Network, Persistent Memory (PMEM), VirtioFS and Vsock hotplug](#block-network-persistent-memory-pmem-virtiofs-and-vsock-hotplug)
     - [Alternative `libc` Support](#alternative-libc-support)
@@ -276,14 +260,14 @@
     - [`Seccomp` Sandboxing](#seccomp-sandboxing)
     - [Updated Distribution Support](#updated-distribution-support)
     - [Command Line and API Changes](#command-line-and-api-changes-1)
-    - [Contributors](#contributors-31)
+    - [Contributors](#contributors-29)
 - [v0.6.0](#v060)
     - [Directly Assigned Devices Hotplug](#directly-assigned-devices-hotplug)
     - [Shared Filesystem Improvements](#shared-filesystem-improvements)
     - [Block and Networking IO Self Offloading](#block-and-networking-io-self-offloading)
     - [Command Line Interface](#command-line-interface)
     - [PVH Boot](#pvh-boot)
-    - [Contributors](#contributors-32)
+    - [Contributors](#contributors-30)
 - [v0.5.1](#v051)
 - [v0.5.0](#v050)
     - [Virtual Machine Dynamic Resizing](#virtual-machine-dynamic-resizing)
@@ -291,7 +275,7 @@
     - [New Interrupt Management Framework](#new-interrupt-management-framework)
     - [Development Tools](#development-tools)
     - [Kata Containers Integration](#kata-containers-integration)
-    - [Contributors](#contributors-33)
+    - [Contributors](#contributors-31)
 - [v0.4.0](#v040)
     - [Dynamic virtual CPUs addition](#dynamic-virtual-cpus-addition)
     - [Programmatic firmware tables generation](#programmatic-firmware-tables-generation)
@@ -300,7 +284,7 @@
     - [Userspace IOAPIC by default](#userspace-ioapic-by-default)
     - [PCI BAR reprogramming](#pci-bar-reprogramming)
     - [New `cloud-hypervisor` organization](#new-cloud-hypervisor-organization)
-    - [Contributors](#contributors-34)
+    - [Contributors](#contributors-32)
 - [v0.3.0](#v030)
     - [Block device offloading](#block-device-offloading)
     - [Network device backend](#network-device-backend)
@@ -327,138 +311,16 @@
     - [Unit testing](#unit-testing)
     - [Integration tests parallelization](#integration-tests-parallelization)
 
-# v38.0
+# v36.1
 
-This release has been tracked in our [roadmap
+This is a bug fix release. The following issues have been addressed:
-project](https://github.com/orgs/cloud-hypervisor/projects/6) as iteration
-v38.0. The following user visible changes have been made:
-
-### Group Rate Limiter on Block Devices
-
-Users now can throttle a group of block devices with the new
-`--rate-limiter-group` option. Details can be found from the [I/O
-Throttling documentation](docs/io_throttling.md)
-
-### CPU Pinning Support for Block Device Worker Thread
-
-Users now have the option to pin virt-queue threads for block devices
-to specific host cpus.
-
-### Optimized Boot Time with Parallel Memory Prefault
-
-The boot time with `prefault` option enabled is optimized via parallel
-memory prefault.
-
-### New 'debug-console' Device
-
-A 'debug-console' device is added to provide a user-configurable debug
-port for logging guest information. Details can be found from the [Debug
-IO Ports documentation](docs/debug-port.md).
-
-### Improved VFIO Device Support
-
-All non-emulated MMIO regions of VFIO devices are now mapped to the VFIO
-container, allowing PCIe P2P between all VFIO devices on the same
-VM. This is required for a wide variety of multi-GPU workloads involving
-GPUDirect P2P (DMA between two GPUs), GPUDirect RDMA (DMA between a GPU
-and an IB device).
-
-### Extended CPU Affinity Support
-
-Users now can set the vcpu affinity to a host CPU with index larger
-than 255.
-
-### Notable Bug Fixes
-
-* Enable HTT flag to avoid crashing cpu topology enumeration software
-such as hwloc in the guest (#6146)
-* Fix several security advisories from dependencies (#6134, #6141)
-* Handle non-power-of-two CPU topology properly (#6062)
-* Various bug fixes around `virtio-vsock`(#6080, #6091, #6095)
-* Enable nested virtualization on AMD if supported (#6106)
-* Align VFIO devices PCI BARs naturally (#6196)
-
-### Contributors
-
-Many thanks to everyone who has contributed to our release:
-* Alyssa Ross <hi@alyssa.is>
-* Bo Chen <chen.bo@intel.com>
-* Daniel Farina <daniel@ubicloud.com>
-* Jinank Jain <jinankjain@microsoft.com>
-* Muminul Islam <muislam@microsoft.com>
-* Peteris Rudzusiks <rye@stripe.com>
-* Philipp Schuster <philipp.schuster@cyberus-technology.de>
-* Ravi kumar Veeramally <ravikumar.veeramally@intel.com>
-* Rob Bradford <rbradford@rivosinc.com>
-* Ruslan Mstoi <ruslan.mstoi@intel.com>
-* Sean Banko <sbanko@crusoeenergy.com>
-* Thomas Barrett <tbarrett@crusoeenergy.com>
-* Wei Liu <liuwe@microsoft.com>
-* Yi Wang <foxywang@tencent.com>
-* acarp <acarp@crusoeenergy.com>
-
-# v37.0
-
-This release has been tracked in our [roadmap
-project](https://github.com/orgs/cloud-hypervisor/projects/6) as iteration
-v37.0. The following user visible changes have been made:
-
-### Long Term Support (LTS) Release
-
-This release is a LTS release. Point releases for bug fixes will be made
-for the next 18 months; live migration and live upgrade will be
-supported between the point releases of the LTS.
-
-### Multiple PCI segments Support for 32-bit VFIO devices
-
-Now VFIO devices with 32-bit memory BARs can be attached to non-zero PCI
-segments on the guest, allowing users to have more 32-bit devices and
-assign such devices to appropriate NUMA nodes for better performance.
-
-### Configurable Named TAP Devices
-
-Named TAP devices now accepts IP configuration from users, such as IP
-and MAC address, as long as the named TAP device is created by Cloud
-Hypervisor (e.g. not existing TAP devices).
-
-### TTY Output from Both Serial Device and Virtio Console
-
-Now legacy serial device and virtio console can be set as TTY mode as
-the same time. This allows users to capture early boot logs with the
-legacy serial device without losing performance benefits of using
-virtio-console, when appropriate kernel configuration is used (such as
-using kernel command-line `console=hvc0 earlyprintk=ttyS0` on x86).
-
-### Faster VM Restoration from Snapshots
-
-The speed of VM restoration from snapshots is improved with a better
-implementation of deserializing JSON files.
-
-### Notable Bug Fixes
 
 * Fix aio backend behavior for block devices when writeback cache
-  disabled (#5930)
+disabled (#5930)
 * Fix PvPanic device PCI BAR alignment (#5956)
 * Bug fix to OpenAPI specification file (#5967)
 * Error out early for live migration when TDX is enabled (#6025)
 
-### Contributors
-
-Many thanks to everyone who has contributed to our release:
-
-* Bo Chen <chen.bo@intel.com>
-* Jinank Jain <jinankjain@microsoft.com>
-* Markus Sütter <markus.suetter@secunet.com>
-* Michael Zhao <michael.zhao@arm.com>
-* Muminul Islam <muislam@microsoft.com>
-* Rob Bradford <rbradford@rivosinc.com>
-* Rui Chang <rui.chang@arm.com>
-* Ruslan Mstoi <ruslan.mstoi@intel.com>
-* Thomas Barrett <tbarrett@crusoeenergy.com>
-* Wei Liu <liuwe@microsoft.com>
-* Yi Wang <foxywang@tencent.com>
-* Yong He <alexyonghe@tencent.com>
-
 # v36.0
 
 This release has been tracked in our [roadmap

resources/Dockerfile

@@ -6,7 +6,7 @@
 FROM ubuntu:22.04 as dev
 
 ARG TARGETARCH
-ARG RUST_TOOLCHAIN="1.70.0"
+ARG RUST_TOOLCHAIN="1.67.1"
 ARG CLH_SRC_DIR="/cloud-hypervisor"
 ARG CLH_BUILD_DIR="$CLH_SRC_DIR/build"
 ARG CARGO_REGISTRY_DIR="$CLH_BUILD_DIR/cargo_registry"

scripts/check-image-compatibility.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 : '
     This script checks if an image is compatible with Cloud Hypervisor.
     At first, it detects the image type(raw or qcow2),
@@ -8,6 +8,8 @@
     a message about the compatibility of the image.
 '
 
+
+
 usage="$(basename "$0") [-h] -f -w -- program to check Cloud Hypervisor compatible image
 
 where:
@@ -16,11 +18,12 @@ where:
     -w  directory to be used for temporary files"
 
 function check_command {
-    if ! command -v "$1" &>/dev/null; then
+    if ! command -v  $1 &> /dev/null
-        echo "Command $1 could not be found"
+        then
+            echo "Command $1 could not be found"
         exit 1
     fi
-}
+};
 
 function check_if_root {
     if [ "$EUID" -ne 0 ]; then
@@ -28,32 +31,27 @@ function check_if_root {
         exit 1
     fi
 
-}
+};
 
 check_if_root
 working_dir=""
 while getopts ':hf:w:' option; do
     case "$option" in
-    h)
+        h) echo "$usage"
-        echo "$usage"
+            exit
-        exit
+            ;;
-        ;;
+        f) file_name=$OPTARG
-    f)
+            ;;
-        file_name=$OPTARG
+        w) working_dir=$OPTARG
-        ;;
+            ;;
-    w)
+        :) printf "missing argument for -%s\n" "$OPTARG" >&2
-        working_dir=$OPTARG
+            echo "$usage" >&2
-        ;;
+            exit 1
-    :)
+            ;;
-        printf "missing argument for -%s\n" "$OPTARG" >&2
+        \?) printf "illegal option: -%s\n" "$OPTARG" >&2
-        echo "$usage" >&2
+            echo "$usage" >&2
-        exit 1
+            exit 1
-        ;;
+            ;;
-    \?)
-        printf "illegal option: -%s\n" "$OPTARG" >&2
-        echo "$usage" >&2
-        exit 1
-        ;;
     esac
 done
 
@@ -61,64 +59,67 @@ shift $((OPTIND - 1))
 
 if [ -z "${file_name}" ]; then
     echo "You must provide the image file name"
-    exit 1
+	exit 1
 fi
 if [[ ! -f ${file_name} ]]; then
     echo "File ${file_name} does not exist"
     exit 1
 fi
 
-file_abs_path=$(readlink -m "${file_name}")
+file_abs_path=`readlink -m ${file_name}`
 if [[ "${working_dir}" != "" && ! -d "${working_dir}" ]]; then
     echo "Directory ${working_dir} does not exist"
     exit 1
 elif [[ "${working_dir}" == "" ]]; then
-    working_dir=$(mktemp -d)
+    working_dir=`mktemp -d`
     tmp_created=1
 else
-    working_dir=$(readlink -m "${working_dir}")
+    working_dir=`readlink -m ${working_dir}`
 fi
 
+#get file extension and image type
+extension="${file_name##*.}"
 filename="${file_name%.*}"
 dest_file=${working_dir}/${filename}.raw
-image_type=$(qemu-img info "${file_abs_path}" | grep 'file format:' | awk '{ print $3 }')
+image_type=$(qemu-img info ${file_abs_path} | grep 'file format:' | awk '{ print $3 }')
 echo "Image type detected as ${image_type}"
 
+
 if [[ "${image_type}" == "raw" ]]; then
-    dest_file=${file_abs_path}
+	dest_file=${file_abs_path}
 elif [[ "$image_type" == "qcow2" ]]; then
-    if lsmod | grep "nbd" &>/dev/null; then
+    if lsmod | grep "nbd" &> /dev/null ; then
         echo "Module nbd is loaded!"
     else
         echo "Module nbd is not loaded. Trying to load the module"
-
+        modprobe nbd max_part=8
-        if ! modprobe nbd max_part=8; then
+        if [ $? != 0 ]; then
             echo "failed to load nbd module. Exiting"
             exit 1
         fi
     fi
     check_command qemu-img
     dest_file=/dev/nbd0
-    qemu-nbd --connect=${dest_file} "${file_abs_path}" --read-only
+    qemu-nbd --connect=${dest_file} ${file_abs_path} --read-only
 fi
 
 check_command blkid
 #get part info
-part_type=$(blkid -o value -s PTTYPE "${dest_file}")
+part_type=$(blkid -o value -s PTTYPE ${dest_file})
 
 check_command partx
-nr_partitions=$(partx -g "${dest_file}" | wc -l)
+nr_partitions=`partx -g ${dest_file}  | wc -l`
 
 check_command fdisk
-out=$(fdisk -l "${dest_file}" --bytes | grep -i -A "${nr_partitions}" 'Device' | tail -n +2)
+out=`fdisk -l  ${dest_file} --bytes | grep -i -A ${nr_partitions} 'Device' | tail -n +2`
 
 IFS='
 '
 i=0
-declare -A lines
+declare -A liness
-for x in $out; do
+for x in $out ; do
-    lines[$i]=$x
+	lines[$i]=$x
-    i=$((i + 1))
+	i=$((i+1))
 done
 
 declare -A partitions
@@ -126,86 +127,89 @@ IFS=' '
 i=0
 ROWS=${#lines[@]}
 
-for line in "${lines[@]}"; do
+for line in "${lines[@]}";
-    j=0
+do
-    read -a -r str_arr <<<"$line"
+	j=0
-    for val in "${str_arr[@]}"; do
+	read -a str_arr <<< "$line"
-        if [[ "$val" != "*" ]]; then
+	for val in "${str_arr[@]}";
-            partitions[$i, $j]=$val
+	do
-            j=$((j + 1))
+		if [[ "$val" != "*" ]]; then
-        fi
+			partitions[$i,$j]=$val
-    done
+			j=$((j+1))
-    i=$((i + 1))
+		fi
+	done
+	i=$((i+1))
 done
 
 COLUMNS=$j
+COUNT=${#partitions[@]}
 START_ADDRESS_INDEX=1
-FILE_SYS_INDEX2=$((COLUMNS - 1))
+FILE_SYS_INDEX2=$((COLUMNS-1))
-FILE_SYS_INDEX1=$((COLUMNS - 2))
+FILE_SYS_INDEX1=$((COLUMNS-2))
 DEVICE_INDEX=0
 # Here we have all the partition info now lets mount and analyze the contents
-for ((i = 0; i < ROWS; i++)); do
+for ((i=0;i<ROWS;i++)) do
-    if [[ "$part_type" == "gpt" && "${partitions[$i, ${FILE_SYS_INDEX1}]}" == "Linux" && "${partitions[$i, ${FILE_SYS_INDEX2}]}" == "filesystem" ]]; then
+	if [[ "$part_type" == "gpt" && "${partitions[$i,${FILE_SYS_INDEX1}]}" == "Linux" && "${partitions[$i,${FILE_SYS_INDEX2}]}" == "filesystem" ]]; then
         echo "The image has GPT partitions"
         MOUNT_ROW=$i
-        break
+		break
-    elif [[ "$part_type" == "dos" && "${partitions[$i, ${FILE_SYS_INDEX1}]}" == "Linux" && "${partitions[$i, ${FILE_SYS_INDEX2}]}" == "" ]]; then
+	elif [[ "$part_type" == "dos" && "${partitions[$i,${FILE_SYS_INDEX1}]}" == "Linux" && "${partitions[$i,${FILE_SYS_INDEX2}]}" == "" ]]; then
         echo "The image has DOS partitions"
         MOUNT_ROW=$i
         break
-    fi
+	fi
 done
 
-start_address=${partitions[${MOUNT_ROW}, ${START_ADDRESS_INDEX}]}
+start_address=${partitions[${MOUNT_ROW},${START_ADDRESS_INDEX}]}
-offset=$((start_address * 512))
+offset=$((start_address*512))
 
 MOUNT_DIR=/mnt/clh-img-check/
 rm -rf ${MOUNT_DIR}
 mkdir ${MOUNT_DIR}
 if [[ "${image_type}" == "raw" ]]; then
-    mount -o ro,loop,offset=$offset "${dest_file}" ${MOUNT_DIR}
+    mount -o ro,loop,offset=$offset ${dest_file} ${MOUNT_DIR}
 elif [[ "${image_type}" == "qcow2" ]]; then
-    mount -o ro "${partitions[${MOUNT_ROW}, ${DEVICE_INDEX}]}" ${MOUNT_DIR}
+    mount -o ro ${partitions[${MOUNT_ROW},${DEVICE_INDEX}]} ${MOUNT_DIR}
 fi
 
 CONFIG_DIR=${MOUNT_DIR}boot/
 if [[ "$part_type" == "dos" ]]; then
-    CONFIG_DIR=${MOUNT_DIR}
+	CONFIG_DIR=${MOUNT_DIR}
 fi
 
 #check VIRTIO
 HAS_VIRTIO=1
-for conf_file in "${CONFIG_DIR}"config*; do
+for conf_file in ${CONFIG_DIR}config*; do
-    out=$(grep -cE "CONFIG_VIRTIO=y|CONFIG_VIRTIO_BLK=y|CONFIG_VIRTIO_BLK=m" "${conf_file}")
+    out=`grep -E "CONFIG_VIRTIO=y|CONFIG_VIRTIO_BLK=y|CONFIG_VIRTIO_BLK=m" ${conf_file} | wc -l`
     if [[ "$out" != "2" ]]; then
-        echo "VIRTIO not found"
+	    echo "VIRTIO not found"
-        HAS_VIRTIO=0
+		HAS_VIRTIO=0
-    fi
+	fi
 done
 
 #clean up
 umount ${MOUNT_DIR}
 
 if [[ "${tmp_created}" == "1" ]]; then
-    rm -rf "${working_dir}"
+    rm -rf ${working_dir}
 fi
 
-if [[ "${image_type}" == "qcow2" ]]; then
+if [[ "${image_type}" == "qcow2" ]];then
-    qemu-nbd --disconnect "${dest_file}" >/dev/null
+    qemu-nbd --disconnect ${dest_file} > /dev/null
 fi
 
 result=""
 if [[ "${part_type}" == "dos" ]]; then
-    result="dos mode not supported"
+	result="dos mode not supported"
 fi
 if [[ "${HAS_VIRTIO}" == "0" ]]; then
-    if [[ "$result" != "" ]]; then
+	if [[ "$result" != "" ]]; then
-        result="${result},"
+		result="${result},"
-    fi
+	fi
-    result="$result VirtIO module not found in the image"
+	result="$result VirtIO module not found in the image"
 fi
-if [[ "$result" == "" ]]; then
+if [[ "$result" == "" ]];then
-    echo "No incompatibilities found"
+	echo "No incompatibilities found"
 else
-    echo "$result"
+	echo "$result"
 fi

scripts/common-aarch64.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 WORKLOADS_DIR="$HOME/workloads"
 
@@ -22,26 +22,26 @@ build_edk2() {
 
     # Prepare source code
     checkout_repo "$EDK2_DIR" "$EDK2_REPO" master "46b4606ba23498d3d0e66b53e498eb3d5d592586"
-    pushd "$EDK2_DIR" || exit
+    pushd "$EDK2_DIR"
     git submodule update --init
-    popd || exit
+    popd
     checkout_repo "$EDK2_PLAT_DIR" "$EDK2_PLAT_REPO" master "8227e9e9f6a8aefbd772b40138f835121ccb2307"
     checkout_repo "$ACPICA_DIR" "$ACPICA_REPO" master "b9c69f81a05c45611c91ea9cbce8756078d76233"
 
-    if [[ ! -f "$EDK2_DIR/.built" ||
+    if [[ ! -f "$EDK2_DIR/.built" || \
-        ! -f "$EDK2_PLAT_DIR/.built" ||
+          ! -f "$EDK2_PLAT_DIR/.built" || \
-        ! -f "$ACPICA_DIR/.built" ]]; then
+          ! -f "$ACPICA_DIR/.built" ]]; then
-        pushd "$EDK2_BUILD_DIR" || exit
+        pushd "$EDK2_BUILD_DIR"
         # Build
-        make -C acpica -j "$(nproc)"
+        make -C acpica -j `nproc`
-        # shellcheck disable=SC1091
         source edk2/edksetup.sh
-        make -C edk2/BaseTools -j "$(nproc)"
+        make -C edk2/BaseTools -j `nproc`
         build -a AARCH64 -t GCC5 -p ArmVirtPkg/ArmVirtCloudHv.dsc -b RELEASE -n 0
         cp Build/ArmVirtCloudHv-AARCH64/RELEASE_GCC5/FV/CLOUDHV_EFI.fd "$WORKLOADS_DIR"
         touch "$EDK2_DIR"/.built
         touch "$EDK2_PLAT_DIR"/.built
         touch "$ACPICA_DIR"/.built
-        popd || exit
+        popd
     fi
 }
+

scripts/create-cloud-init.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set -x
 
 rm -f /tmp/ubuntu-cloudinit.img
@@ -6,3 +6,4 @@ mkdosfs -n CIDATA -C /tmp/ubuntu-cloudinit.img 8192
 mcopy -oi /tmp/ubuntu-cloudinit.img -s test_data/cloud-init/ubuntu/local/user-data ::
 mcopy -oi /tmp/ubuntu-cloudinit.img -s test_data/cloud-init/ubuntu/local/meta-data ::
 mcopy -oi /tmp/ubuntu-cloudinit.img -s test_data/cloud-init/ubuntu/local/network-config ::
+

scripts/dev_cli.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 # Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # Copyright © 2020 Intel Corporation
@@ -121,7 +121,9 @@ ensure_latest_ctr() {
     if [ "$CTR_IMAGE_VERSION" = "local" ]; then
         build_container
     else
-        if ! $DOCKER_RUNTIME pull "$CTR_IMAGE"; then
+        $DOCKER_RUNTIME pull "$CTR_IMAGE"
+
+        if [ $? -ne 0 ]; then
             build_container
         fi
 
@@ -141,8 +143,7 @@ fix_dir_perms() {
         --workdir "$CTR_CLH_ROOT_DIR" \
         --rm \
         --volume /dev:/dev \
-        --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" \
+        --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" $exported_volumes \
-        ${exported_volumes:+"$exported_volumes"} \
         "$CTR_IMAGE" \
         chown -R "$(id -u):$(id -g)" "$CTR_CLH_ROOT_DIR"
 
@@ -157,9 +158,9 @@ process_volumes_args() {
         return
     fi
     exported_volumes=""
-    arr_vols=("${arg_vols//#/ }")
+    arr_vols=(${arg_vols//#/ })
     for var in "${arr_vols[@]}"; do
-        parts=("${var//:/ }")
+        parts=(${var//:/ })
         if [[ ! -e "${parts[0]}" ]]; then
             echo "The volume ${parts[0]} does not exist."
             exit 1
@@ -232,10 +233,10 @@ cmd_build() {
         "--debug") { build="debug"; } ;;
         "--release") { build="release"; } ;;
         "--runtime")
-            shift
+	    shift
-            DOCKER_RUNTIME="$1"
+	    DOCKER_RUNTIME="$1"
-            export DOCKER_RUNTIME
+	    export DOCKER_RUNTIME
-            ;;
+	    ;;
         "--libc")
             shift
             [[ "$1" =~ ^(musl|gnu)$ ]] ||
@@ -281,7 +282,6 @@ cmd_build() {
     [ $build = "release" ] && cargo_args+=("--release")
     cargo_args+=(--target "$target")
 
-    # shellcheck disable=SC2153
     rustflags="$RUSTFLAGS"
     target_cc=""
     if [ "$(uname -m)" = "aarch64" ] && [ "$libc" = "musl" ]; then
@@ -293,12 +293,11 @@ cmd_build() {
         --workdir "$CTR_CLH_ROOT_DIR" \
         --rm \
         --volume $exported_device \
-        --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" \
+        --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" $exported_volumes \
-        ${exported_volumes:+"$exported_volumes"} \
         --env RUSTFLAGS="$rustflags" \
         --env TARGET_CC="$target_cc" \
         "$CTR_IMAGE" \
-        cargo build --all "$features_build" \
+        cargo build --all $features_build \
         --target-dir "$CTR_CLH_CARGO_TARGET" \
         "${cargo_args[@]}" && say "Binaries placed under $CLH_CARGO_TARGET/$target/$build"
 }
@@ -313,8 +312,7 @@ cmd_clean() {
         --user "$(id -u):$(id -g)" \
         --workdir "$CTR_CLH_ROOT_DIR" \
         --rm \
-        --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" \
+        --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" $exported_volumes \
-        ${exported_volumes:+"$exported_volumes"} \
         "$CTR_IMAGE" \
         cargo clean \
         --target-dir "$CTR_CLH_CARGO_TARGET" \
@@ -363,6 +361,7 @@ cmd_tests() {
             hypervisor="$1"
             ;;
         "--all") {
+            cargo=true
             unit=true
             integration=true
         } ;;
@@ -384,7 +383,7 @@ cmd_tests() {
         exported_device="/dev/mshv"
     fi
 
-    if [ ! -e "${exported_device}" ]; then
+    if [ ! -e "${exported_device}" ] ; then
         die "${exported_device} does not exist on the system"
     fi
 
@@ -410,8 +409,7 @@ cmd_tests() {
             --device $exported_device \
             --device /dev/net/tun \
             --cap-add net_admin \
-            --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" \
+            --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" $exported_volumes \
-            ${exported_volumes:+"$exported_volumes"} \
             --env BUILD_TARGET="$target" \
             --env RUSTFLAGS="$rustflags" \
             --env TARGET_CC="$target_cc" \
@@ -430,14 +428,12 @@ cmd_tests() {
             --net="$CTR_CLH_NET" \
             --mount type=tmpfs,destination=/tmp \
             --volume /dev:/dev \
-            --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" \
+            --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" $exported_volumes \
-            ${exported_volumes:+"$exported_volumes"} \
             --volume "$CLH_INTEGRATION_WORKLOADS:$CTR_CLH_INTEGRATION_WORKLOADS" \
             --env USER="root" \
             --env BUILD_TARGET="$target" \
             --env RUSTFLAGS="$rustflags" \
             --env TARGET_CC="$target_cc" \
-            --env AUTH_DOWNLOAD_TOKEN="$AUTH_DOWNLOAD_TOKEN" \
             "$CTR_IMAGE" \
             dbus-run-session ./scripts/run_integration_tests_"$(uname -m)".sh "$@" || fix_dir_perms $? || exit $?
     fi
@@ -453,14 +449,12 @@ cmd_tests() {
             --net="$CTR_CLH_NET" \
             --mount type=tmpfs,destination=/tmp \
             --volume /dev:/dev \
-            --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" \
+            --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" $exported_volumes \
-            ${exported_volumes:+"$exported_volumes"} \
             --volume "$CLH_INTEGRATION_WORKLOADS:$CTR_CLH_INTEGRATION_WORKLOADS" \
             --env USER="root" \
             --env BUILD_TARGET="$target" \
             --env RUSTFLAGS="$rustflags" \
             --env TARGET_CC="$target_cc" \
-            --env AUTH_DOWNLOAD_TOKEN="$AUTH_DOWNLOAD_TOKEN" \
             "$CTR_IMAGE" \
             ./scripts/run_integration_tests_sgx.sh "$@" || fix_dir_perms $? || exit $?
     fi
@@ -476,14 +470,12 @@ cmd_tests() {
             --net="$CTR_CLH_NET" \
             --mount type=tmpfs,destination=/tmp \
             --volume /dev:/dev \
-            --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" \
+            --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" $exported_volumes \
-            ${exported_volumes:+"$exported_volumes"} \
             --volume "$CLH_INTEGRATION_WORKLOADS:$CTR_CLH_INTEGRATION_WORKLOADS" \
             --env USER="root" \
             --env BUILD_TARGET="$target" \
             --env RUSTFLAGS="$rustflags" \
             --env TARGET_CC="$target_cc" \
-            --env AUTH_DOWNLOAD_TOKEN="$AUTH_DOWNLOAD_TOKEN" \
             "$CTR_IMAGE" \
             ./scripts/run_integration_tests_vfio.sh "$@" || fix_dir_perms $? || exit $?
     fi
@@ -499,14 +491,12 @@ cmd_tests() {
             --net="$CTR_CLH_NET" \
             --mount type=tmpfs,destination=/tmp \
             --volume /dev:/dev \
-            --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" \
+            --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" $exported_volumes \
-            ${exported_volumes:+"$exported_volumes"} \
             --volume "$CLH_INTEGRATION_WORKLOADS:$CTR_CLH_INTEGRATION_WORKLOADS" \
             --env USER="root" \
             --env BUILD_TARGET="$target" \
             --env RUSTFLAGS="$rustflags" \
             --env TARGET_CC="$target_cc" \
-            --env AUTH_DOWNLOAD_TOKEN="$AUTH_DOWNLOAD_TOKEN" \
             "$CTR_IMAGE" \
             ./scripts/run_integration_tests_windows_"$(uname -m)".sh "$@" || fix_dir_perms $? || exit $?
     fi
@@ -522,14 +512,12 @@ cmd_tests() {
             --net="$CTR_CLH_NET" \
             --mount type=tmpfs,destination=/tmp \
             --volume /dev:/dev \
-            --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" \
+            --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" $exported_volumes \
-            ${exported_volumes:+"$exported_volumes"} \
             --volume "$CLH_INTEGRATION_WORKLOADS:$CTR_CLH_INTEGRATION_WORKLOADS" \
             --env USER="root" \
             --env BUILD_TARGET="$target" \
             --env RUSTFLAGS="$rustflags" \
             --env TARGET_CC="$target_cc" \
-            --env AUTH_DOWNLOAD_TOKEN="$AUTH_DOWNLOAD_TOKEN" \
             "$CTR_IMAGE" \
             ./scripts/run_integration_tests_live_migration.sh "$@" || fix_dir_perms $? || exit $?
     fi
@@ -545,14 +533,12 @@ cmd_tests() {
             --net="$CTR_CLH_NET" \
             --mount type=tmpfs,destination=/tmp \
             --volume /dev:/dev \
-            --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" \
+            --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" $exported_volumes \
-            ${exported_volumes:+"$exported_volumes"} \
             --volume "$CLH_INTEGRATION_WORKLOADS:$CTR_CLH_INTEGRATION_WORKLOADS" \
             --env USER="root" \
             --env BUILD_TARGET="$target" \
             --env RUSTFLAGS="$rustflags" \
             --env TARGET_CC="$target_cc" \
-            --env AUTH_DOWNLOAD_TOKEN="$AUTH_DOWNLOAD_TOKEN" \
             "$CTR_IMAGE" \
             ./scripts/run_integration_tests_rate_limiter.sh "$@" || fix_dir_perms $? || exit $?
     fi
@@ -568,15 +554,13 @@ cmd_tests() {
             --net="$CTR_CLH_NET" \
             --mount type=tmpfs,destination=/tmp \
             --volume /dev:/dev \
-            --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" \
+            --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" $exported_volumes \
-            ${exported_volumes:+"$exported_volumes"} \
             --volume "$CLH_INTEGRATION_WORKLOADS:$CTR_CLH_INTEGRATION_WORKLOADS" \
             --env USER="root" \
             --env BUILD_TARGET="$target" \
             --env RUSTFLAGS="$rustflags" \
             --env TARGET_CC="$target_cc" \
             --env RUST_BACKTRACE="${RUST_BACKTRACE}" \
-            --env AUTH_DOWNLOAD_TOKEN="$AUTH_DOWNLOAD_TOKEN" \
             "$CTR_IMAGE" \
             ./scripts/run_metrics.sh "$@" || fix_dir_perms $? || exit $?
     fi
@@ -597,9 +581,9 @@ build_container() {
 
     $DOCKER_RUNTIME build \
         --target dev \
-        -t "$CTR_IMAGE" \
+        -t $CTR_IMAGE \
         -f $BUILD_DIR/Dockerfile \
-        --build-arg TARGETARCH="$TARGETARCH" \
+        --build-arg TARGETARCH=$TARGETARCH \
         $BUILD_DIR
 }
 
@@ -659,8 +643,7 @@ cmd_shell() {
         --net="$CTR_CLH_NET" \
         --tmpfs /tmp:exec \
         --volume /dev:/dev \
-        --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" \
+        --volume "$CLH_ROOT_DIR:$CTR_CLH_ROOT_DIR" $exported_volumes \
-        ${exported_volumes:+"$exported_volumes"} \
         --volume "$CLH_INTEGRATION_WORKLOADS:$CTR_CLH_INTEGRATION_WORKLOADS" \
         --env USER="root" \
         --entrypoint bash \

scripts/gitlint/rules.py

@@ -1,92 +0,0 @@
-from gitlint.rules import LineRule, RuleViolation, CommitMessageTitle
-import re
-
-
-class TitleStartsWithComponent(LineRule):
-    """A rule to enforce valid commit message title
-
-    Valid title format:
-    component1[, component2, componentN]: submodule: summary
-
-    Title should have at least one component
-    Components are separated by comma+space: ", "
-    Components are validated to be in valid_components
-    Components list is ended by a colon
-    Submodules are not validated
-
-    """
-
-    # A rule MUST have a human friendly name
-    name = "title-has-valid-component"
-
-    # A rule MUST have a *unique* id.
-    # We recommend starting with UL (for User-defined Line-rule)
-    id = "UL1"
-
-    # A line-rule MUST have a target (not required for CommitRules).
-    target = CommitMessageTitle
-
-    def validate(self, line, _commit):
-        valid_components = (
-            'api_client',
-            'arch',
-            'block',
-            'build',
-            'ch-remote',
-            'ci',
-            'devices',
-            'docs',
-            'event_monitor',
-            'fuzz',
-            'github',
-            'gitignore',
-            'gitlint',
-            'hypervisor',
-            'Jenkinsfile',
-            'main',
-            'misc',
-            'net_gen',
-            'net_util',
-            'option_parser',
-            'pci',
-            'performance-metrics',
-            'rate_limiter',
-            'README',
-            'resources',
-            'scripts',
-            'serial_buffer',
-            'test_data',
-            'test_infra',
-            'tests',
-            'tpm',
-            'tracer',
-            'vhost_user_block',
-            'vhost_user_net',
-            'virtio-devices',
-            'vm-allocator',
-            'vm-device',
-            'vmm',
-            'vm-migration',
-            'vm-virtio')
-
-        ptrn_title = re.compile(r'^(.+?):\s(.+)$')
-        match = ptrn_title.match(line)
-
-        if not match:
-            self.log.debug("Invalid commit title {}", line)
-            return [RuleViolation(self.id, "Commit title does not comply with "
-                                  "rule: 'component: change summary'")]
-        components = match.group(1)
-        summary = match.group(2)
-        self.log.debug(f"\nComponents: {components}\nSummary: {summary}")
-
-        ptrn_components = re.compile(r',\s')
-        components_list = re.split(ptrn_components, components)
-        self.log.debug("components list: %s" % components_list)
-
-        for component in components_list:
-            if component not in valid_components:
-                return [RuleViolation(self.id,
-                                      f"Invalid component: {component}, "
-                                      "\nValid components are: {}".format(
-                                          " ".join(valid_components)))]

scripts/prepare_vdpa.sh

@@ -1,20 +1,20 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set -x
 
 sudo apt install -y libncurses-dev gawk flex bison openssl libssl-dev dkms libelf-dev libudev-dev libpci-dev libiberty-dev autoconf git make dpkg-dev libmnl-dev pkg-config iproute2
 sudo sed -i -- 's/# deb-src/deb-src/g' /etc/apt/sources.list
 sudo apt update
-apt-get source linux-image-unsigned-"$(uname -r)"
+apt-get source linux-image-unsigned-`uname -r`
-pushd linux-azure*/drivers/vdpa/vdpa_sim/ || exit
+pushd linux-azure*/drivers/vdpa/vdpa_sim/
-cat <<'EOF' >Makefile
+cat <<'EOF' > Makefile
 # SPDX-License-Identifier: GPL-2.0
 obj-m += vdpa_sim.o
 obj-m += vdpa_sim_net.o
 obj-m += vdpa_sim_blk.o
 EOF
-make -C /lib/modules/"$(uname -r)"/build M="$PWD"
+make -C /lib/modules/`uname -r`/build M=$PWD
-sudo make -C /lib/modules/"$(uname -r)"/build M="$PWD" modules_install
+sudo make -C /lib/modules/`uname -r`/build M=$PWD modules_install
-popd || exit
+popd
 sudo depmod -a
 sudo modprobe vdpa
 sudo modprobe vhost_vdpa

scripts/run_integration_tests_aarch64.sh

@@ -1,11 +1,9 @@
-#!/usr/bin/env bash
+#!/bin/bash
-# shellcheck disable=SC2048,SC2086
 set -x
 
-# shellcheck source=/dev/null
+source $HOME/.cargo/env
-source "$HOME"/.cargo/env
+source $(dirname "$0")/test-util.sh
-source "$(dirname "$0")"/test-util.sh
+source $(dirname "$0")/common-aarch64.sh
-source "$(dirname "$0")"/common-aarch64.sh
 
 WORKLOADS_LOCK="$WORKLOADS_DIR/integration_test.lock"
 
@@ -16,16 +14,16 @@ build_spdk_nvme() {
     checkout_repo "$SPDK_DIR" "$SPDK_REPO" master "ef8bcce58f3f02b79c0619a297e4f17e81e62b24"
 
     if [ ! -f "$SPDK_DIR/.built" ]; then
-        pushd "$SPDK_DIR" || exit
+        pushd $SPDK_DIR
         git submodule update --init
         apt-get update
         sed -i "/grpcio/d" scripts/pkgdep/debian.sh
         ./scripts/pkgdep.sh
         ./configure --with-vfio-user
         chmod +x /usr/local/lib/python3.10/dist-packages/ninja/data/bin/ninja
-        make -j "$(nproc)" || exit 1
+        make -j `nproc` || exit 1
         touch .built
-        popd || exit
+        popd
     fi
     if [ ! -d "/usr/local/bin/spdk-nvme" ]; then
         mkdir -p $SPDK_DEPLOY_DIR
@@ -43,33 +41,33 @@ build_virtiofsd() {
     checkout_repo "$VIRTIOFSD_DIR" "$VIRTIOFSD_REPO" v1.8.0 "97ea7908fe7f9bc59916671a771bdcfaf4044b45"
 
     if [ ! -f "$VIRTIOFSD_DIR/.built" ]; then
-        pushd "$VIRTIOFSD_DIR" || exit
+        pushd $VIRTIOFSD_DIR
         rm -rf target/
         time RUSTFLAGS="" TARGET_CC="" cargo build --release
         cp target/release/virtiofsd "$WORKLOADS_DIR/" || exit 1
         touch .built
-        popd || exit
+        popd
     fi
 }
 
 update_workloads() {
-    cp scripts/sha1sums-aarch64 "$WORKLOADS_DIR"
+    cp scripts/sha1sums-aarch64 $WORKLOADS_DIR
 
     BIONIC_OS_IMAGE_DOWNLOAD_NAME="bionic-server-cloudimg-arm64.img"
     BIONIC_OS_IMAGE_DOWNLOAD_URL="https://cloud-hypervisor.azureedge.net/$BIONIC_OS_IMAGE_DOWNLOAD_NAME"
     BIONIC_OS_DOWNLOAD_IMAGE="$WORKLOADS_DIR/$BIONIC_OS_IMAGE_DOWNLOAD_NAME"
     if [ ! -f "$BIONIC_OS_DOWNLOAD_IMAGE" ]; then
-        pushd "$WORKLOADS_DIR" || exit
+        pushd $WORKLOADS_DIR
         time wget --quiet $BIONIC_OS_IMAGE_DOWNLOAD_URL || exit 1
-        popd || exit
+        popd
     fi
 
     BIONIC_OS_RAW_IMAGE_NAME="bionic-server-cloudimg-arm64.raw"
     BIONIC_OS_RAW_IMAGE="$WORKLOADS_DIR/$BIONIC_OS_RAW_IMAGE_NAME"
     if [ ! -f "$BIONIC_OS_RAW_IMAGE" ]; then
-        pushd "$WORKLOADS_DIR" || exit
+        pushd $WORKLOADS_DIR
         time qemu-img convert -p -f qcow2 -O raw $BIONIC_OS_IMAGE_DOWNLOAD_NAME $BIONIC_OS_RAW_IMAGE_NAME || exit 1
-        popd || exit
+        popd
     fi
 
     # Convert the raw image to qcow2 image to remove compressed blocks from the disk. Therefore letting the
@@ -77,101 +75,102 @@ update_workloads() {
     BIONIC_OS_QCOW2_IMAGE_UNCOMPRESSED_NAME="bionic-server-cloudimg-arm64.qcow2"
     BIONIC_OS_QCOW2_UNCOMPRESSED_IMAGE="$WORKLOADS_DIR/$BIONIC_OS_QCOW2_IMAGE_UNCOMPRESSED_NAME"
     if [ ! -f "$BIONIC_OS_QCOW2_UNCOMPRESSED_IMAGE" ]; then
-        pushd "$WORKLOADS_DIR" || exit
+        pushd $WORKLOADS_DIR
-        time qemu-img convert -p -f raw -O qcow2 $BIONIC_OS_RAW_IMAGE_NAME "$BIONIC_OS_QCOW2_UNCOMPRESSED_IMAGE" || exit 1
+        time qemu-img convert -p -f raw -O qcow2 $BIONIC_OS_RAW_IMAGE_NAME $BIONIC_OS_QCOW2_UNCOMPRESSED_IMAGE || exit 1
-        popd || exit
+        popd
     fi
 
     FOCAL_OS_RAW_IMAGE_NAME="focal-server-cloudimg-arm64-custom-20210929-0.raw"
     FOCAL_OS_RAW_IMAGE_DOWNLOAD_URL="https://cloud-hypervisor.azureedge.net/$FOCAL_OS_RAW_IMAGE_NAME"
     FOCAL_OS_RAW_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_RAW_IMAGE_NAME"
     if [ ! -f "$FOCAL_OS_RAW_IMAGE" ]; then
-        pushd "$WORKLOADS_DIR" || exit
+        pushd $WORKLOADS_DIR
         time wget --quiet $FOCAL_OS_RAW_IMAGE_DOWNLOAD_URL || exit 1
-        popd || exit
+        popd
     fi
 
     FOCAL_OS_QCOW2_IMAGE_UNCOMPRESSED_NAME="focal-server-cloudimg-arm64-custom-20210929-0.qcow2"
     FOCAL_OS_QCOW2_IMAGE_UNCOMPRESSED_DOWNLOAD_URL="https://cloud-hypervisor.azureedge.net/$FOCAL_OS_QCOW2_IMAGE_UNCOMPRESSED_NAME"
     FOCAL_OS_QCOW2_UNCOMPRESSED_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_QCOW2_IMAGE_UNCOMPRESSED_NAME"
     if [ ! -f "$FOCAL_OS_QCOW2_UNCOMPRESSED_IMAGE" ]; then
-        pushd "$WORKLOADS_DIR" || exit
+        pushd $WORKLOADS_DIR
         time wget --quiet $FOCAL_OS_QCOW2_IMAGE_UNCOMPRESSED_DOWNLOAD_URL || exit 1
-        popd || exit
+        popd
     fi
 
     FOCAL_OS_QCOW2_IMAGE_BACKING_FILE_NAME="focal-server-cloudimg-arm64-custom-20210929-0-backing.qcow2"
     FOCAL_OS_QCOW2_BACKING_FILE_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_QCOW2_IMAGE_BACKING_FILE_NAME"
     if [ ! -f "$FOCAL_OS_QCOW2_BACKING_FILE_IMAGE" ]; then
-        pushd "$WORKLOADS_DIR" || exit
+        pushd $WORKLOADS_DIR
-        time qemu-img create -f qcow2 -b "$FOCAL_OS_QCOW2_UNCOMPRESSED_IMAGE" -F qcow2 $FOCAL_OS_QCOW2_IMAGE_BACKING_FILE_NAME
+        time qemu-img create -f qcow2 -b $FOCAL_OS_QCOW2_UNCOMPRESSED_IMAGE -F qcow2 $FOCAL_OS_QCOW2_IMAGE_BACKING_FILE_NAME
-        popd || exit
+        popd
     fi
 
     JAMMY_OS_RAW_IMAGE_NAME="jammy-server-cloudimg-arm64-custom-20220329-0.raw"
     JAMMY_OS_RAW_IMAGE_DOWNLOAD_URL="https://cloud-hypervisor.azureedge.net/$JAMMY_OS_RAW_IMAGE_NAME"
     JAMMY_OS_RAW_IMAGE="$WORKLOADS_DIR/$JAMMY_OS_RAW_IMAGE_NAME"
     if [ ! -f "$JAMMY_OS_RAW_IMAGE" ]; then
-        pushd "$WORKLOADS_DIR" || exit
+        pushd $WORKLOADS_DIR
         time wget --quiet $JAMMY_OS_RAW_IMAGE_DOWNLOAD_URL || exit 1
-        popd || exit
+        popd
     fi
 
     JAMMY_OS_QCOW2_IMAGE_UNCOMPRESSED_NAME="jammy-server-cloudimg-arm64-custom-20220329-0.qcow2"
     JAMMY_OS_QCOW2_IMAGE_UNCOMPRESSED_DOWNLOAD_URL="https://cloud-hypervisor.azureedge.net/$JAMMY_OS_QCOW2_IMAGE_UNCOMPRESSED_NAME"
     JAMMY_OS_QCOW2_UNCOMPRESSED_IMAGE="$WORKLOADS_DIR/$JAMMY_OS_QCOW2_IMAGE_UNCOMPRESSED_NAME"
     if [ ! -f "$JAMMY_OS_QCOW2_UNCOMPRESSED_IMAGE" ]; then
-        pushd "$WORKLOADS_DIR" || exit
+        pushd $WORKLOADS_DIR
         time wget --quiet $JAMMY_OS_QCOW2_IMAGE_UNCOMPRESSED_DOWNLOAD_URL || exit 1
-        popd || exit
+        popd
     fi
 
     ALPINE_MINIROOTFS_URL="http://dl-cdn.alpinelinux.org/alpine/v3.11/releases/aarch64/alpine-minirootfs-3.11.3-aarch64.tar.gz"
     ALPINE_MINIROOTFS_TARBALL="$WORKLOADS_DIR/alpine-minirootfs-aarch64.tar.gz"
     if [ ! -f "$ALPINE_MINIROOTFS_TARBALL" ]; then
-        pushd "$WORKLOADS_DIR" || exit
+        pushd $WORKLOADS_DIR
-        time wget --quiet $ALPINE_MINIROOTFS_URL -O "$ALPINE_MINIROOTFS_TARBALL" || exit 1
+        time wget --quiet $ALPINE_MINIROOTFS_URL -O $ALPINE_MINIROOTFS_TARBALL || exit 1
-        popd || exit
+        popd
     fi
 
     ALPINE_INITRAMFS_IMAGE="$WORKLOADS_DIR/alpine_initramfs.img"
     if [ ! -f "$ALPINE_INITRAMFS_IMAGE" ]; then
-        pushd "$WORKLOADS_DIR" || exit
+        pushd $WORKLOADS_DIR
         mkdir alpine-minirootfs
         tar xf "$ALPINE_MINIROOTFS_TARBALL" -C alpine-minirootfs
-        cat >alpine-minirootfs/init <<-EOF
+        cat > alpine-minirootfs/init <<-EOF
 			#! /bin/sh
 			mount -t devtmpfs dev /dev
 			echo \$TEST_STRING > /dev/console
 			poweroff -f
 		EOF
         chmod +x alpine-minirootfs/init
-        cd alpine-minirootfs || exit
+        cd alpine-minirootfs
         find . -print0 |
-            cpio --null --create --verbose --owner root:root --format=newc >"$ALPINE_INITRAMFS_IMAGE"
+            cpio --null --create --verbose --owner root:root --format=newc > "$ALPINE_INITRAMFS_IMAGE"
-        popd || exit
+        popd
     fi
 
-    pushd "$WORKLOADS_DIR" || exit
+    pushd $WORKLOADS_DIR
-
+    sha1sum sha1sums-aarch64 --check
-    if ! sha1sum sha1sums-aarch64 --check; then
+    if [ $? -ne 0 ]; then
         echo "sha1sum validation of images failed, remove invalid images to fix the issue."
         exit 1
     fi
-    popd || exit
+    popd
 
     # Download Cloud Hypervisor binary from its last stable release
     LAST_RELEASE_VERSION="v36.0"
     CH_RELEASE_URL="https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/$LAST_RELEASE_VERSION/cloud-hypervisor-static-aarch64"
     CH_RELEASE_NAME="cloud-hypervisor-static-aarch64"
-    pushd "$WORKLOADS_DIR" || exit
+    pushd $WORKLOADS_DIR
     # Repeat a few times to workaround a random wget failure
     WGET_RETRY_MAX=10
     wget_retry=0
 
-    until [ "$wget_retry" -ge "$WGET_RETRY_MAX" ]; do
+    until [ "$wget_retry" -ge "$WGET_RETRY_MAX" ]
+    do
         time wget $CH_RELEASE_URL -O "$CH_RELEASE_NAME" && break
-        wget_retry=$((wget_retry + 1))
+        wget_retry=$((wget_retry+1))
     done
 
     if [ $wget_retry -ge "$WGET_RETRY_MAX" ]; then
@@ -179,7 +178,7 @@ update_workloads() {
     else
         chmod +x $CH_RELEASE_NAME
     fi
-    popd || exit
+    popd
 
     # Build custom kernel for guest VMs
     build_custom_linux
@@ -200,22 +199,22 @@ update_workloads() {
     BLK_IMAGE="$WORKLOADS_DIR/blk.img"
     MNT_DIR="mount_image"
     if [ ! -f "$BLK_IMAGE" ]; then
-        pushd "$WORKLOADS_DIR" || exit
+        pushd $WORKLOADS_DIR
-        fallocate -l 16M "$BLK_IMAGE"
+        fallocate -l 16M $BLK_IMAGE
-        mkfs.ext4 -j "$BLK_IMAGE"
+        mkfs.ext4 -j $BLK_IMAGE
         mkdir $MNT_DIR
-        sudo mount -t ext4 "$BLK_IMAGE" $MNT_DIR
+        sudo mount -t ext4 $BLK_IMAGE $MNT_DIR
         sudo bash -c "echo bar > $MNT_DIR/foo" || exit 1
-        sudo umount "$BLK_IMAGE"
+        sudo umount $BLK_IMAGE
         rm -r $MNT_DIR
-        popd || exit
+        popd
     fi
 
     SHARED_DIR="$WORKLOADS_DIR/shared_dir"
     if [ ! -d "$SHARED_DIR" ]; then
-        mkdir -p "$SHARED_DIR"
+        mkdir -p $SHARED_DIR
-        echo "foo" >"$SHARED_DIR/file1"
+        echo "foo" > "$SHARED_DIR/file1"
-        echo "bar" >"$SHARED_DIR/file3" || exit 1
+        echo "bar" > "$SHARED_DIR/file3" || exit 1
     fi
 
     # Checkout and build SPDK NVMe
@@ -233,11 +232,12 @@ if [[ "$hypervisor" = "mshv" ]]; then
     exit 1
 fi
 
+
 # lock the workloads folder to avoid parallel updating by different containers
 (
     echo "try to lock $WORKLOADS_DIR folder and update"
     flock -x 12 && update_workloads
-) 12>"$WORKLOADS_LOCK"
+) 12>$WORKLOADS_LOCK
 
 # Check if there is any error in the execution of `update_workloads`.
 # If there is any error, then kill the shell. Otherwise the script will continue
@@ -249,7 +249,7 @@ fi
 
 export RUST_BACKTRACE=1
 
-cargo build --all --release --target "$BUILD_TARGET"
+cargo build --all --release --target $BUILD_TARGET
 
 # Enable KSM with some reasonable parameters so that it won't take too long
 # for the memory to be merged between two processes.
@@ -258,19 +258,19 @@ sudo bash -c "echo 10 > /sys/kernel/mm/ksm/sleep_millisecs"
 sudo bash -c "echo 1 > /sys/kernel/mm/ksm/run"
 
 # Both test_vfio and ovs-dpdk rely on hugepages
-HUGEPAGESIZE=$(grep Hugepagesize /proc/meminfo | awk '{print $2}')
+HUGEPAGESIZE=`grep Hugepagesize /proc/meminfo | awk '{print $2}'`
-PAGE_NUM=$((12288 * 1024 / HUGEPAGESIZE))
+PAGE_NUM=`echo $((12288 * 1024 / $HUGEPAGESIZE))`
-echo "$PAGE_NUM" | sudo tee /proc/sys/vm/nr_hugepages
+echo $PAGE_NUM | sudo tee /proc/sys/vm/nr_hugepages
 sudo chmod a+rwX /dev/hugepages
 
 # Run all direct kernel boot (Device Tree) test cases in mod `parallel`
-time cargo test "common_parallel::$test_filter" --target "$BUILD_TARGET" -- ${test_binary_args[*]}
+time cargo test "common_parallel::$test_filter" --target $BUILD_TARGET -- ${test_binary_args[*]}
 RES=$?
 
 # Run some tests in sequence since the result could be affected by other tests
 # running in parallel.
 if [ $RES -eq 0 ]; then
-    time cargo test "common_sequential::$test_filter" --target "$BUILD_TARGET" -- --test-threads=1 ${test_binary_args[*]}
+    time cargo test "common_sequential::$test_filter" --target $BUILD_TARGET -- --test-threads=1 ${test_binary_args[*]}
     RES=$?
 else
     exit $RES
@@ -278,7 +278,7 @@ fi
 
 # Run all ACPI test cases
 if [ $RES -eq 0 ]; then
-    time cargo test "aarch64_acpi::$test_filter" --target "$BUILD_TARGET" -- ${test_binary_args[*]}
+    time cargo test "aarch64_acpi::$test_filter" --target $BUILD_TARGET -- ${test_binary_args[*]}
     RES=$?
 else
     exit $RES
@@ -286,14 +286,14 @@ fi
 
 # Run all test cases related to live migration
 if [ $RES -eq 0 ]; then
-    time cargo test "live_migration_parallel::$test_filter" --target "$BUILD_TARGET" -- ${test_binary_args[*]}
+    time cargo test "live_migration_parallel::$test_filter" --target $BUILD_TARGET -- ${test_binary_args[*]}
     RES=$?
 else
     exit $RES
 fi
 
 if [ $RES -eq 0 ]; then
-    time cargo test "live_migration_sequential::$test_filter" --target "$BUILD_TARGET" -- --test-threads=1 ${test_binary_args[*]}
+    time cargo test "live_migration_sequential::$test_filter" --target $BUILD_TARGET -- --test-threads=1 ${test_binary_args[*]}
     RES=$?
 else
     exit $RES
@@ -301,9 +301,9 @@ fi
 
 # Run tests on dbus_api
 if [ $RES -eq 0 ]; then
-    cargo build --features "dbus_api" --all --release --target "$BUILD_TARGET"
+    cargo build --features "dbus_api" --all --release --target $BUILD_TARGET
     export RUST_BACKTRACE=1
-    time cargo test "dbus_api::$test_filter" --target "$BUILD_TARGET" -- ${test_binary_args[*]}
+    time cargo test "dbus_api::$test_filter" --target $BUILD_TARGET -- ${test_binary_args[*]}
     RES=$?
 fi
 

scripts/run_integration_tests_live_migration.sh

@@ -1,10 +1,8 @@
-#!/usr/bin/env bash
+#!/bin/bash
-# shellcheck disable=SC2048,SC2086
 set -x
 
-# shellcheck source=/dev/null
+source $HOME/.cargo/env
-source "$HOME"/.cargo/env
+source $(dirname "$0")/test-util.sh
-source "$(dirname "$0")"/test-util.sh
 
 WORKLOADS_DIR="$HOME/workloads"
 mkdir -p "$WORKLOADS_DIR"
@@ -14,44 +12,45 @@ process_common_args "$@"
 # For now these values are default for kvm
 test_features=""
 
-if [ "$hypervisor" = "mshv" ]; then
+if [ "$hypervisor" = "mshv" ] ;  then
     test_features="--features mshv"
 fi
 
-cp scripts/sha1sums-x86_64 "$WORKLOADS_DIR"
+cp scripts/sha1sums-x86_64 $WORKLOADS_DIR
 
 FOCAL_OS_IMAGE_NAME="focal-server-cloudimg-amd64-custom-20210609-0.qcow2"
 FOCAL_OS_IMAGE_URL="https://cloud-hypervisor.azureedge.net/$FOCAL_OS_IMAGE_NAME"
 FOCAL_OS_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_IMAGE_NAME"
 if [ ! -f "$FOCAL_OS_IMAGE" ]; then
-    pushd "$WORKLOADS_DIR" || exit
+    pushd $WORKLOADS_DIR
     time wget --quiet $FOCAL_OS_IMAGE_URL || exit 1
-    popd || exit
+    popd
 fi
 
 FOCAL_OS_RAW_IMAGE_NAME="focal-server-cloudimg-amd64-custom-20210609-0.raw"
 FOCAL_OS_RAW_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_RAW_IMAGE_NAME"
 if [ ! -f "$FOCAL_OS_RAW_IMAGE" ]; then
-    pushd "$WORKLOADS_DIR" || exit
+    pushd $WORKLOADS_DIR
     time qemu-img convert -p -f qcow2 -O raw $FOCAL_OS_IMAGE_NAME $FOCAL_OS_RAW_IMAGE_NAME || exit 1
-    popd || exit
+    popd
 fi
 
-pushd "$WORKLOADS_DIR" || exit
+pushd $WORKLOADS_DIR
-if ! grep focal sha1sums-x86_64 | sha1sum --check; then
+grep focal sha1sums-x86_64 | sha1sum --check
+if [ $? -ne 0 ]; then
     echo "sha1sum validation of images failed, remove invalid images to fix the issue."
     exit 1
 fi
-popd || exit
+popd
 
 # Download Cloud Hypervisor binary from its last stable release
 LAST_RELEASE_VERSION="v36.0"
 CH_RELEASE_URL="https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/$LAST_RELEASE_VERSION/cloud-hypervisor-static"
 CH_RELEASE_NAME="cloud-hypervisor-static"
-pushd "$WORKLOADS_DIR" || exit
+pushd $WORKLOADS_DIR
 time wget --quiet $CH_RELEASE_URL -O "$CH_RELEASE_NAME" || exit 1
 chmod +x $CH_RELEASE_NAME
-popd || exit
+popd
 
 # Build custom kernel based on virtio-pmem and virtio-fs upstream patches
 VMLINUX_IMAGE="$WORKLOADS_DIR/vmlinux"
@@ -61,16 +60,15 @@ fi
 
 CFLAGS=""
 if [[ "${BUILD_TARGET}" == "x86_64-unknown-linux-musl" ]]; then
-    # shellcheck disable=SC2034
     CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/"
 fi
 
-cargo build --features mshv --all --release --target "$BUILD_TARGET"
+cargo build --features mshv --all --release --target $BUILD_TARGET
 
 # Test ovs-dpdk relies on hugepages
-HUGEPAGESIZE=$(grep Hugepagesize /proc/meminfo | awk '{print $2}')
+HUGEPAGESIZE=`grep Hugepagesize /proc/meminfo | awk '{print $2}'`
-PAGE_NUM=$((12288 * 1024 / HUGEPAGESIZE))
+PAGE_NUM=`echo $((12288 * 1024 / $HUGEPAGESIZE))`
-echo "$PAGE_NUM" | sudo tee /proc/sys/vm/nr_hugepages
+echo $PAGE_NUM | sudo tee /proc/sys/vm/nr_hugepages
 sudo chmod a+rwX /dev/hugepages
 
 export RUST_BACKTRACE=1

scripts/run_integration_tests_rate_limiter.sh

@@ -1,10 +1,8 @@
-#!/usr/bin/env bash
+#!/bin/bash
-# shellcheck disable=SC2048,SC2086
 set -x
 
-# shellcheck source=/dev/null
+source $HOME/.cargo/env
-source "$HOME"/.cargo/env
+source $(dirname "$0")/test-util.sh
-source "$(dirname "$0")"/test-util.sh
 
 WORKLOADS_DIR="$HOME/workloads"
 mkdir -p "$WORKLOADS_DIR"
@@ -14,45 +12,45 @@ process_common_args "$@"
 # For now these values are default for kvm
 test_features=""
 
-if [ "$hypervisor" = "mshv" ]; then
+if [ "$hypervisor" = "mshv" ] ;  then
     test_features="--features mshv"
 fi
 
-cp scripts/sha1sums-x86_64 "$WORKLOADS_DIR"
+cp scripts/sha1sums-x86_64 $WORKLOADS_DIR
 
 FOCAL_OS_IMAGE_NAME="focal-server-cloudimg-amd64-custom-20210609-0.qcow2"
 FOCAL_OS_IMAGE_URL="https://cloud-hypervisor.azureedge.net/$FOCAL_OS_IMAGE_NAME"
 FOCAL_OS_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_IMAGE_NAME"
 if [ ! -f "$FOCAL_OS_IMAGE" ]; then
-    pushd "$WORKLOADS_DIR" || exit
+    pushd $WORKLOADS_DIR
     time wget --quiet $FOCAL_OS_IMAGE_URL || exit 1
-    popd || exit
+    popd
 fi
 
 FOCAL_OS_RAW_IMAGE_NAME="focal-server-cloudimg-amd64-custom-20210609-0.raw"
 FOCAL_OS_RAW_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_RAW_IMAGE_NAME"
 if [ ! -f "$FOCAL_OS_RAW_IMAGE" ]; then
-    pushd "$WORKLOADS_DIR" || exit
+    pushd $WORKLOADS_DIR
     time qemu-img convert -p -f qcow2 -O raw $FOCAL_OS_IMAGE_NAME $FOCAL_OS_RAW_IMAGE_NAME || exit 1
-    popd || exit
+    popd
 fi
 
-pushd "$WORKLOADS_DIR" || exit
+pushd $WORKLOADS_DIR
-if ! grep focal sha1sums-x86_64 | sha1sum --check; then
+grep focal sha1sums-x86_64 | sha1sum --check
+if [ $? -ne 0 ]; then
     echo "sha1sum validation of images failed, remove invalid images to fix the issue."
     exit 1
 fi
-popd || exit
+popd
 
 build_custom_linux
 
 CFLAGS=""
 if [[ "${BUILD_TARGET}" == "x86_64-unknown-linux-musl" ]]; then
-    # shellcheck disable=SC2034
     CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/"
 fi
 
-cargo build --features mshv --all --release --target "$BUILD_TARGET"
+cargo build --features mshv --all --release --target $BUILD_TARGET
 
 export RUST_BACKTRACE=1
 time cargo test $test_features "rate_limiter::$test_filter" -- --test-threads=1 ${test_binary_args[*]}

scripts/run_integration_tests_sgx.sh

@@ -1,10 +1,8 @@
-#!/usr/bin/env bash
+#!/bin/bash
-# shellcheck disable=SC2048,SC2086
 set -x
 
-# shellcheck source=/dev/null
+source $HOME/.cargo/env
-source "$HOME"/.cargo/env
+source $(dirname "$0")/test-util.sh
-source "$(dirname "$0")"/test-util.sh
 
 process_common_args "$@"
 
@@ -16,32 +14,36 @@ fi
 WORKLOADS_DIR="$HOME/workloads"
 mkdir -p "$WORKLOADS_DIR"
 
-download_hypervisor_fw
+FW_URL=$(curl --silent https://api.github.com/repos/cloud-hypervisor/rust-hypervisor-firmware/releases/latest | grep "browser_download_url" | grep -o 'https://.*[^ "]')
+FW="$WORKLOADS_DIR/hypervisor-fw"
+pushd $WORKLOADS_DIR
+rm -f $FW
+time wget --quiet $FW_URL || exit 1
+popd
 
 JAMMY_OS_IMAGE_NAME="jammy-server-cloudimg-amd64-custom-20230119-0.qcow2"
 JAMMY_OS_IMAGE_URL="https://cloud-hypervisor.azureedge.net/$JAMMY_OS_IMAGE_NAME"
 JAMMY_OS_IMAGE="$WORKLOADS_DIR/$JAMMY_OS_IMAGE_NAME"
 if [ ! -f "$JAMMY_OS_IMAGE" ]; then
-    pushd "$WORKLOADS_DIR" || exit
+    pushd $WORKLOADS_DIR
     time wget --quiet $JAMMY_OS_IMAGE_URL || exit 1
-    popd || exit
+    popd
 fi
 
 JAMMY_OS_RAW_IMAGE_NAME="jammy-server-cloudimg-amd64-custom-20230119-0.raw"
 JAMMY_OS_RAW_IMAGE="$WORKLOADS_DIR/$JAMMY_OS_RAW_IMAGE_NAME"
 if [ ! -f "$JAMMY_OS_RAW_IMAGE" ]; then
-    pushd "$WORKLOADS_DIR" || exit
+    pushd $WORKLOADS_DIR
     time qemu-img convert -p -f qcow2 -O raw $JAMMY_OS_IMAGE_NAME $JAMMY_OS_RAW_IMAGE_NAME || exit 1
-    popd || exit
+    popd
 fi
 
 CFLAGS=""
 if [[ "${BUILD_TARGET}" == "x86_64-unknown-linux-musl" ]]; then
-    # shellcheck disable=SC2034
     CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/"
 fi
 
-cargo build --features mshv --all --release --target "$BUILD_TARGET"
+cargo build --features mshv --all --release --target $BUILD_TARGET
 
 export RUST_BACKTRACE=1
 

scripts/run_integration_tests_vfio.sh

@@ -1,5 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
-# shellcheck disable=SC2048,SC2086
 set -x
 
 # This set of vfio tests require to be ran on a specific machine with
@@ -8,23 +7,25 @@ set -x
 # out of the scope of this script, including the custom guest image with
 # Nvidia drivers installed, and properly configured Nvidia Tesla T4 card.
 
-# shellcheck source=/dev/null
+source $HOME/.cargo/env
-source "$HOME"/.cargo/env
+source $(dirname "$0")/test-util.sh
-source "$(dirname "$0")"/test-util.sh
 
 process_common_args "$@"
 
 WORKLOADS_DIR="$HOME/workloads"
 
-download_hypervisor_fw
+# Always download the latest "hypervisor-fw"
+FW_URL=$(curl --silent https://api.github.com/repos/cloud-hypervisor/rust-hypervisor-firmware/releases/latest | grep "browser_download_url" | grep -o 'https://.*[^ "]')
+pushd $WORKLOADS_DIR
+time wget --quiet $FW_URL -O hypervisor-fw || exit 1
+popd
 
 CFLAGS=""
 if [[ "${BUILD_TARGET}" == "x86_64-unknown-linux-musl" ]]; then
-    # shellcheck disable=SC2034
     CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/"
 fi
 
-cargo build --features mshv --all --release --target "$BUILD_TARGET"
+cargo build --features mshv --all --release --target $BUILD_TARGET
 
 export RUST_BACKTRACE=1
 time cargo test "vfio::test_nvidia" -- --test-threads=1 ${test_binary_args[*]}

scripts/run_integration_tests_windows_aarch64.sh

@@ -1,11 +1,9 @@
-#!/usr/bin/env bash
+#!/bin/bash
-# shellcheck disable=SC2048,SC2086
 set -x
 
-# shellcheck source=/dev/null
+source $HOME/.cargo/env
-source "$HOME"/.cargo/env
+source $(dirname "$0")/test-util.sh
-source "$(dirname "$0")"/test-util.sh
+source $(dirname "$0")/common-aarch64.sh
-source "$(dirname "$0")"/common-aarch64.sh
 
 process_common_args "$@"
 
@@ -29,8 +27,8 @@ if [[ ! -f ${WIN_IMAGE_FILE} || ! -f ${OVMF_FW} ]]; then
 fi
 
 # Use device mapper to create a snapshot of the Windows image
-img_blk_size=$(du -b -B 512 "${WIN_IMAGE_FILE}" | awk '{print $1;}')
+img_blk_size=$(du -b -B 512 ${WIN_IMAGE_FILE} | awk '{print $1;}')
-loop_device=$(losetup --find --show --read-only "${WIN_IMAGE_FILE}")
+loop_device=$(losetup --find --show --read-only ${WIN_IMAGE_FILE})
 dmsetup create windows-base --table "0 $img_blk_size linear $loop_device 0"
 dmsetup mknodes
 dmsetup create windows-snapshot-base --table "0 $img_blk_size snapshot-origin /dev/mapper/windows-base"
@@ -38,11 +36,11 @@ dmsetup mknodes
 
 export RUST_BACKTRACE=1
 
-cargo build --all --release --target "$BUILD_TARGET"
+cargo build --all --release --target $BUILD_TARGET
 
 # Only run with 1 thread to avoid tests interfering with one another because
 # Windows has a static IP configured
-time cargo test "windows::$test_filter" --target "$BUILD_TARGET" -- ${test_binary_args[*]}
+time cargo test "windows::$test_filter" --target $BUILD_TARGET -- ${test_binary_args[*]}
 RES=$?
 
 dmsetup remove_all -f

scripts/run_integration_tests_windows_x86_64.sh

@@ -1,27 +1,29 @@
-#!/usr/bin/env bash
+#!/bin/bash
-# shellcheck disable=SC2048,SC2086
 set -x
 
-# shellcheck source=/dev/null
+source $HOME/.cargo/env
-source "$HOME"/.cargo/env
+source $(dirname "$0")/test-util.sh
-source "$(dirname "$0")"/test-util.sh
 
 process_common_args "$@"
 # For now these values are default for kvm
 test_features=""
 
-if [ "$hypervisor" = "mshv" ]; then
+if [ "$hypervisor" = "mshv" ] ;  then
     test_features="--features mshv"
 fi
 WIN_IMAGE_FILE="/root/workloads/windows-server-2022-amd64-2.raw"
 
 WORKLOADS_DIR="/root/workloads"
-
+OVMF_FW_URL=$(curl --silent https://api.github.com/repos/cloud-hypervisor/edk2/releases/latest | grep "browser_download_url" | grep -o 'https://.*[^ "]')
-download_ovmf
+OVMF_FW="$WORKLOADS_DIR/CLOUDHV.fd"
+if [ ! -f "$OVMF_FW" ]; then
+    pushd $WORKLOADS_DIR
+    time wget --quiet $OVMF_FW_URL || exit 1
+    popd
+fi
 
 CFLAGS=""
 if [[ "${BUILD_TARGET}" == "x86_64-unknown-linux-musl" ]]; then
-    # shellcheck disable=SC2034
     CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/"
 fi
 
@@ -39,7 +41,7 @@ dmsetup mknodes
 dmsetup create windows-snapshot-base --table "0 $img_blk_size snapshot-origin /dev/mapper/windows-base"
 dmsetup mknodes
 
-cargo build --features mshv --all --release --target "$BUILD_TARGET"
+cargo build --features mshv --all --release --target $BUILD_TARGET
 
 export RUST_BACKTRACE=1
 

scripts/run_integration_tests_x86_64.sh

@@ -1,10 +1,8 @@
-#!/usr/bin/env bash
+#!/bin/bash
-# shellcheck disable=SC2048,SC2086
 set -x
 
-# shellcheck source=/dev/null
+source $HOME/.cargo/env
-source "$HOME"/.cargo/env
+source $(dirname "$0")/test-util.sh
-source "$(dirname "$0")"/test-util.sh
 
 WORKLOADS_DIR="$HOME/workloads"
 mkdir -p "$WORKLOADS_DIR"
@@ -14,90 +12,103 @@ process_common_args "$@"
 # For now these values are default for kvm
 test_features=""
 
-if [ "$hypervisor" = "mshv" ]; then
+if [ "$hypervisor" = "mshv" ] ;  then
     test_features="--features mshv"
 fi
 
-cp scripts/sha1sums-x86_64 "$WORKLOADS_DIR"
+cp scripts/sha1sums-x86_64 $WORKLOADS_DIR
 
-download_hypervisor_fw
+FW_URL=$(curl --silent https://api.github.com/repos/cloud-hypervisor/rust-hypervisor-firmware/releases/latest | grep "browser_download_url" | grep -o 'https://.*[^ "]')
+FW="$WORKLOADS_DIR/hypervisor-fw"
+if [ ! -f "$FW" ]; then
+    pushd $WORKLOADS_DIR
+    time wget --quiet $FW_URL || exit 1
+    popd
+fi
 
-download_ovmf
+OVMF_FW_URL=$(curl --silent https://api.github.com/repos/cloud-hypervisor/edk2/releases/latest | grep "browser_download_url" | grep -o 'https://.*[^ "]')
+OVMF_FW="$WORKLOADS_DIR/CLOUDHV.fd"
+if [ ! -f "$OVMF_FW" ]; then
+    pushd $WORKLOADS_DIR
+    time wget --quiet $OVMF_FW_URL || exit 1
+    popd
+fi
 
 FOCAL_OS_IMAGE_NAME="focal-server-cloudimg-amd64-custom-20210609-0.qcow2"
 FOCAL_OS_IMAGE_URL="https://cloud-hypervisor.azureedge.net/$FOCAL_OS_IMAGE_NAME"
 FOCAL_OS_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_IMAGE_NAME"
 if [ ! -f "$FOCAL_OS_IMAGE" ]; then
-    pushd "$WORKLOADS_DIR" || exit
+    pushd $WORKLOADS_DIR
     time wget --quiet $FOCAL_OS_IMAGE_URL || exit 1
-    popd || exit
+    popd
 fi
 
 FOCAL_OS_RAW_IMAGE_NAME="focal-server-cloudimg-amd64-custom-20210609-0.raw"
 FOCAL_OS_RAW_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_RAW_IMAGE_NAME"
 if [ ! -f "$FOCAL_OS_RAW_IMAGE" ]; then
-    pushd "$WORKLOADS_DIR" || exit
+    pushd $WORKLOADS_DIR
     time qemu-img convert -p -f qcow2 -O raw $FOCAL_OS_IMAGE_NAME $FOCAL_OS_RAW_IMAGE_NAME || exit 1
-    popd || exit
+    popd
 fi
 
 FOCAL_OS_QCOW_BACKING_FILE_IMAGE_NAME="focal-server-cloudimg-amd64-custom-20210609-0-backing.qcow2"
 FOCAL_OS_QCOW_BACKING_FILE_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_QCOW_BACKING_FILE_IMAGE_NAME"
 if [ ! -f "$FOCAL_OS_QCOW_BACKING_FILE_IMAGE" ]; then
-    pushd "$WORKLOADS_DIR" || exit
+    pushd $WORKLOADS_DIR
-    time qemu-img create -f qcow2 -b "$FOCAL_OS_IMAGE" -F qcow2 $FOCAL_OS_QCOW_BACKING_FILE_IMAGE_NAME
+    time qemu-img create -f qcow2 -b $FOCAL_OS_IMAGE -F qcow2 $FOCAL_OS_QCOW_BACKING_FILE_IMAGE_NAME
-    popd || exit
+    popd
 fi
 
 JAMMY_OS_IMAGE_NAME="jammy-server-cloudimg-amd64-custom-20230119-0.qcow2"
 JAMMY_OS_IMAGE_URL="https://cloud-hypervisor.azureedge.net/$JAMMY_OS_IMAGE_NAME"
 JAMMY_OS_IMAGE="$WORKLOADS_DIR/$JAMMY_OS_IMAGE_NAME"
 if [ ! -f "$JAMMY_OS_IMAGE" ]; then
-    pushd "$WORKLOADS_DIR" || exit
+    pushd $WORKLOADS_DIR
     time wget --quiet $JAMMY_OS_IMAGE_URL || exit 1
-    popd || exit
+    popd
 fi
 
 JAMMY_OS_RAW_IMAGE_NAME="jammy-server-cloudimg-amd64-custom-20230119-0.raw"
 JAMMY_OS_RAW_IMAGE="$WORKLOADS_DIR/$JAMMY_OS_RAW_IMAGE_NAME"
 if [ ! -f "$JAMMY_OS_RAW_IMAGE" ]; then
-    pushd "$WORKLOADS_DIR" || exit
+    pushd $WORKLOADS_DIR
     time qemu-img convert -p -f qcow2 -O raw $JAMMY_OS_IMAGE_NAME $JAMMY_OS_RAW_IMAGE_NAME || exit 1
-    popd || exit
+    popd
 fi
 
 ALPINE_MINIROOTFS_URL="http://dl-cdn.alpinelinux.org/alpine/v3.11/releases/x86_64/alpine-minirootfs-3.11.3-x86_64.tar.gz"
 ALPINE_MINIROOTFS_TARBALL="$WORKLOADS_DIR/alpine-minirootfs-x86_64.tar.gz"
 if [ ! -f "$ALPINE_MINIROOTFS_TARBALL" ]; then
-    pushd "$WORKLOADS_DIR" || exit
+    pushd $WORKLOADS_DIR
-    time wget --quiet $ALPINE_MINIROOTFS_URL -O "$ALPINE_MINIROOTFS_TARBALL" || exit 1
+    time wget --quiet $ALPINE_MINIROOTFS_URL -O $ALPINE_MINIROOTFS_TARBALL || exit 1
-    popd || exit
+    popd
 fi
 
 ALPINE_INITRAMFS_IMAGE="$WORKLOADS_DIR/alpine_initramfs.img"
 if [ ! -f "$ALPINE_INITRAMFS_IMAGE" ]; then
-    pushd "$WORKLOADS_DIR" || exit
+    pushd $WORKLOADS_DIR
     mkdir alpine-minirootfs
     tar xf "$ALPINE_MINIROOTFS_TARBALL" -C alpine-minirootfs
-    cat >alpine-minirootfs/init <<-EOF
+    cat > alpine-minirootfs/init <<-EOF
 		#! /bin/sh
 		mount -t devtmpfs dev /dev
 		echo \$TEST_STRING > /dev/console
 		poweroff -f
 	EOF
     chmod +x alpine-minirootfs/init
-    cd alpine-minirootfs || exit
+    cd alpine-minirootfs
     find . -print0 |
-        cpio --null --create --verbose --owner root:root --format=newc >"$ALPINE_INITRAMFS_IMAGE"
+        cpio --null --create --verbose --owner root:root --format=newc > "$ALPINE_INITRAMFS_IMAGE"
-    popd || exit
+    popd
 fi
 
-pushd "$WORKLOADS_DIR" || exit
+pushd $WORKLOADS_DIR
-if ! sha1sum sha1sums-x86_64 --check; then
+sha1sum sha1sums-x86_64 --check
+if [ $? -ne 0 ]; then
     echo "sha1sum validation of images failed, remove invalid images to fix the issue."
     exit 1
 fi
-popd || exit
+popd
 
 # Build custom kernel based on virtio-pmem and virtio-fs upstream patches
 VMLINUX_IMAGE="$WORKLOADS_DIR/vmlinux"
@@ -108,51 +119,52 @@ fi
 VIRTIOFSD="$WORKLOADS_DIR/virtiofsd"
 VIRTIOFSD_DIR="virtiofsd_build"
 if [ ! -f "$VIRTIOFSD" ]; then
-    pushd "$WORKLOADS_DIR" || exit
+    pushd $WORKLOADS_DIR
     git clone "https://gitlab.com/virtio-fs/virtiofsd.git" $VIRTIOFSD_DIR
-    pushd $VIRTIOFSD_DIR || exit
+    pushd $VIRTIOFSD_DIR
     git checkout v1.8.0
     time cargo build --release
-    cp target/release/virtiofsd "$VIRTIOFSD" || exit 1
+    cp target/release/virtiofsd $VIRTIOFSD || exit 1
-    popd || exit
+    popd
     rm -rf $VIRTIOFSD_DIR
-    popd || exit
+    popd
 fi
 
+
 BLK_IMAGE="$WORKLOADS_DIR/blk.img"
 MNT_DIR="mount_image"
 if [ ! -f "$BLK_IMAGE" ]; then
-    pushd "$WORKLOADS_DIR" || exit
+   pushd $WORKLOADS_DIR
-    fallocate -l 16M "$BLK_IMAGE"
+   fallocate -l 16M $BLK_IMAGE
-    mkfs.ext4 -j "$BLK_IMAGE"
+   mkfs.ext4 -j $BLK_IMAGE
-    mkdir $MNT_DIR
+   mkdir $MNT_DIR
-    sudo mount -t ext4 "$BLK_IMAGE" $MNT_DIR
+   sudo mount -t ext4 $BLK_IMAGE $MNT_DIR
-    sudo bash -c "echo bar > $MNT_DIR/foo" || exit 1
+   sudo bash -c "echo bar > $MNT_DIR/foo" || exit 1
-    sudo umount "$BLK_IMAGE"
+   sudo umount $BLK_IMAGE
-    rm -r $MNT_DIR
+   rm -r $MNT_DIR
-    popd || exit
+   popd
 fi
 
 SHARED_DIR="$WORKLOADS_DIR/shared_dir"
 if [ ! -d "$SHARED_DIR" ]; then
-    mkdir -p "$SHARED_DIR"
+    mkdir -p $SHARED_DIR
-    echo "foo" >"$SHARED_DIR/file1"
+    echo "foo" > "$SHARED_DIR/file1"
-    echo "bar" >"$SHARED_DIR/file3" || exit 1
+    echo "bar" > "$SHARED_DIR/file3" || exit 1
 fi
 
 VFIO_DIR="$WORKLOADS_DIR/vfio"
 VFIO_DISK_IMAGE="$WORKLOADS_DIR/vfio.img"
-rm -rf "$VFIO_DIR" "$VFIO_DISK_IMAGE"
+rm -rf $VFIO_DIR $VFIO_DISK_IMAGE
-mkdir -p "$VFIO_DIR"
+mkdir -p $VFIO_DIR
-cp "$FOCAL_OS_RAW_IMAGE" "$VFIO_DIR"
+cp $FOCAL_OS_RAW_IMAGE $VFIO_DIR
-cp "$FW" "$VFIO_DIR"
+cp $FW $VFIO_DIR
-cp "$VMLINUX_IMAGE" "$VFIO_DIR" || exit 1
+cp $VMLINUX_IMAGE $VFIO_DIR || exit 1
 
-cargo build --features mshv --all --release --target "$BUILD_TARGET"
+cargo build --features mshv --all  --release --target $BUILD_TARGET
 
 # We always copy a fresh version of our binary for our L2 guest.
-cp target/"$BUILD_TARGET"/release/cloud-hypervisor "$VFIO_DIR"
+cp target/$BUILD_TARGET/release/cloud-hypervisor $VFIO_DIR
-cp target/"$BUILD_TARGET"/release/ch-remote "$VFIO_DIR"
+cp target/$BUILD_TARGET/release/ch-remote $VFIO_DIR
 
 # Enable KSM with some reasonable parameters so that it won't take too long
 # for the memory to be merged between two processes.
@@ -161,9 +173,9 @@ sudo bash -c "echo 10 > /sys/kernel/mm/ksm/sleep_millisecs"
 sudo bash -c "echo 1 > /sys/kernel/mm/ksm/run"
 
 # Both test_vfio, ovs-dpdk and vDPA tests rely on hugepages
-HUGEPAGESIZE=$(grep Hugepagesize /proc/meminfo | awk '{print $2}')
+HUGEPAGESIZE=`grep Hugepagesize /proc/meminfo | awk '{print $2}'`
-PAGE_NUM=$((12288 * 1024 / HUGEPAGESIZE))
+PAGE_NUM=`echo $((12288 * 1024 / $HUGEPAGESIZE))`
-echo "$PAGE_NUM" | sudo tee /proc/sys/vm/nr_hugepages
+echo $PAGE_NUM | sudo tee /proc/sys/vm/nr_hugepages
 sudo chmod a+rwX /dev/hugepages
 
 # Update max locked memory to 'unlimited' to avoid issues with vDPA
@@ -186,7 +198,7 @@ fi
 
 # Run tests on dbus_api
 if [ $RES -eq 0 ]; then
-    cargo build --features "mshv,dbus_api" --all --release --target "$BUILD_TARGET"
+    cargo build --features "mshv,dbus_api" --all  --release --target $BUILD_TARGET
     export RUST_BACKTRACE=1
     # integration tests now do not reply on build feature "dbus_api"
     time cargo test $test_features "dbus_api::$test_filter" -- ${test_binary_args[*]}

scripts/run_metrics.sh

@@ -1,12 +1,10 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set -x
 
-# shellcheck source=/dev/null
+source $HOME/.cargo/env
-source "$HOME"/.cargo/env
+source $(dirname "$0")/test-util.sh
-source "$(dirname "$0")"/test-util.sh
 
-TEST_ARCH=$(uname -m)
+export TEST_ARCH=$(uname -m)
-export TEST_ARCH
 
 WORKLOADS_DIR="$HOME/workloads"
 mkdir -p "$WORKLOADS_DIR"
@@ -17,34 +15,34 @@ build_fio() {
 
     checkout_repo "$FIO_DIR" "$FIO_REPO" master "1953e1adb5a28ed21370e85991d7f5c3cdc699f3"
     if [ ! -f "$FIO_DIR/.built" ]; then
-        pushd "$FIO_DIR" || exit
+        pushd $FIO_DIR
         ./configure
-        make -j "$(nproc)"
+        make -j `nproc`
         cp fio "$WORKLOADS_DIR/fio"
         touch .built
-        popd || exit
+        popd
     fi
 }
 
 process_common_args "$@"
 
-cp scripts/sha1sums-"${TEST_ARCH}" "$WORKLOADS_DIR"
+cp scripts/sha1sums-${TEST_ARCH} $WORKLOADS_DIR
 
-if [ "${TEST_ARCH}" == "aarch64" ]; then
+if [ ${TEST_ARCH} == "aarch64" ]; then
-    FOCAL_OS_IMAGE_NAME="focal-server-cloudimg-arm64-custom-20210929-0.qcow2"
+     FOCAL_OS_IMAGE_NAME="focal-server-cloudimg-arm64-custom-20210929-0.qcow2"
 else
-    FOCAL_OS_IMAGE_NAME="focal-server-cloudimg-amd64-custom-20210609-0.qcow2"
+     FOCAL_OS_IMAGE_NAME="focal-server-cloudimg-amd64-custom-20210609-0.qcow2"
 fi
 
 FOCAL_OS_IMAGE_URL="https://cloud-hypervisor.azureedge.net/$FOCAL_OS_IMAGE_NAME"
 FOCAL_OS_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_IMAGE_NAME"
 if [ ! -f "$FOCAL_OS_IMAGE" ]; then
-    pushd "$WORKLOADS_DIR" || exit
+    pushd $WORKLOADS_DIR
     time wget --quiet $FOCAL_OS_IMAGE_URL || exit 1
-    popd || exit
+    popd
 fi
 
-if [ "${TEST_ARCH}" == "aarch64" ]; then
+if [ ${TEST_ARCH} == "aarch64" ]; then
     FOCAL_OS_RAW_IMAGE_NAME="focal-server-cloudimg-arm64-custom-20210929-0.raw"
 else
     FOCAL_OS_RAW_IMAGE_NAME="focal-server-cloudimg-amd64-custom-20210609-0.raw"
@@ -52,19 +50,20 @@ fi
 
 FOCAL_OS_RAW_IMAGE="$WORKLOADS_DIR/$FOCAL_OS_RAW_IMAGE_NAME"
 if [ ! -f "$FOCAL_OS_RAW_IMAGE" ]; then
-    pushd "$WORKLOADS_DIR" || exit
+    pushd $WORKLOADS_DIR
     time qemu-img convert -p -f qcow2 -O raw $FOCAL_OS_IMAGE_NAME $FOCAL_OS_RAW_IMAGE_NAME || exit 1
-    popd || exit
+    popd
 fi
 
-pushd "$WORKLOADS_DIR" || exit
+pushd $WORKLOADS_DIR
-if ! grep focal sha1sums-"${TEST_ARCH}" | sha1sum --check; then
+grep focal sha1sums-${TEST_ARCH} | sha1sum --check
+if [ $? -ne 0 ]; then
     echo "sha1sum validation of images failed, remove invalid images to fix the issue."
     exit 1
 fi
-popd || exit
+popd
 
-if [ "${TEST_ARCH}" == "aarch64" ]; then
+if [ ${TEST_ARCH} == "aarch64" ]; then
     build_fio
 
     # Update the fio in the cloud image to use io_uring on AArch64
@@ -85,16 +84,15 @@ build_custom_linux
 
 CFLAGS=""
 if [[ "${BUILD_TARGET}" == "${TEST_ARCH}-unknown-linux-musl" ]]; then
-    # shellcheck disable=SC2034
     CFLAGS="-I /usr/include/${TEST_ARCH}-linux-musl/ -idirafter /usr/include/"
 fi
 
-cargo build --features mshv --all --release --target "$BUILD_TARGET"
+cargo build --features mshv --all --release --target $BUILD_TARGET
 
 # setup hugepages
-HUGEPAGESIZE=$(grep Hugepagesize /proc/meminfo | awk '{print $2}')
+HUGEPAGESIZE=`grep Hugepagesize /proc/meminfo | awk '{print $2}'`
-PAGE_NUM=$((12288 * 1024 / HUGEPAGESIZE))
+PAGE_NUM=`echo $((12288 * 1024 / $HUGEPAGESIZE))`
-echo "$PAGE_NUM" | sudo tee /proc/sys/vm/nr_hugepages
+echo $PAGE_NUM | sudo tee /proc/sys/vm/nr_hugepages
 sudo chmod a+rwX /dev/hugepages
 
 if [ -n "$test_filter" ]; then
@@ -102,16 +100,15 @@ if [ -n "$test_filter" ]; then
 fi
 
 # Ensure that git commands can be run in this directory (for metrics report)
-git config --global --add safe.directory "$PWD"
+git config --global --add safe.directory $PWD
 
-RUST_BACKTRACE_VALUE=$RUST_BACKTRACE
+RUST_BACKTRACE_VALUE=`echo $RUST_BACKTRACE`
-if [ -z "$RUST_BACKTRACE_VALUE" ]; then
+if [ -z $RUST_BACKTRACE_VALUE ];then
-    export RUST_BACKTRACE=1
+	export RUST_BACKTRACE=1
 else
-    echo "RUST_BACKTRACE is set to: $RUST_BACKTRACE_VALUE"
+	echo "RUST_BACKTRACE is set to: $RUST_BACKTRACE_VALUE"
 fi
-# shellcheck disable=SC2048,SC2086
+time target/$BUILD_TARGET/release/performance-metrics ${test_binary_args[*]}
-time target/"$BUILD_TARGET"/release/performance-metrics ${test_binary_args[*]}
 RES=$?
 
 exit $RES

scripts/run_openapi_tests.sh

@@ -1,5 +1,5 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set -e
 set -x
 
-sudo docker run --rm -v "${PWD}":/local openapitools/openapi-generator-cli validate -i /local/vmm/src/api/openapi/cloud-hypervisor.yaml
+sudo docker run --rm -v ${PWD}:/local openapitools/openapi-generator-cli validate -i /local/vmm/src/api/openapi/cloud-hypervisor.yaml

scripts/run_unit_tests.sh

@@ -1,15 +1,12 @@
-#!/usr/bin/env bash
+#!/bin/bash
-# shellcheck disable=SC2068
 
-# shellcheck source=/dev/null
+source $HOME/.cargo/env
-source "$HOME"/.cargo/env
+source $(dirname "$0")/test-util.sh
-source "$(dirname "$0")"/test-util.sh
 
 process_common_args "$@"
 
 cargo_args=("")
 
-# shellcheck disable=SC2154
 if [[ $hypervisor = "mshv" ]]; then
     cargo_args+=("--features $hypervisor")
 elif [[ $(uname -m) = "x86_64" ]]; then
@@ -17,5 +14,5 @@ elif [[ $(uname -m) = "x86_64" ]]; then
 fi
 
 export RUST_BACKTRACE=1
-cargo test --lib --bins --target "$BUILD_TARGET" --workspace ${cargo_args[@]} || exit 1
+cargo test --lib --bins --target $BUILD_TARGET --workspace ${cargo_args[@]} || exit 1
-cargo test --doc --target "$BUILD_TARGET" --workspace ${cargo_args[@]} || exit 1
+cargo test --doc --target $BUILD_TARGET --workspace ${cargo_args[@]} || exit 1

scripts/test-util.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 hypervisor="kvm"
 test_filter=""
 
@@ -18,13 +18,13 @@ checkout_repo() {
     # If commit is not specified, compare local HEAD and remote HEAD.
     # Remove the folder if there is difference.
     if [ -d "$SRC_DIR" ]; then
-        pushd "$SRC_DIR" || exit
+        pushd $SRC_DIR
         git fetch
         SRC_LOCAL_COMMIT=$(git rev-parse HEAD)
         if [ -z "$GIT_COMMIT" ]; then
             GIT_COMMIT=$(git rev-parse remotes/origin/"$GIT_BRANCH")
         fi
-        popd || exit
+        popd
         if [ "$SRC_LOCAL_COMMIT" != "$GIT_COMMIT" ]; then
             rm -rf "$SRC_DIR"
         fi
@@ -34,10 +34,10 @@ checkout_repo() {
     if [ ! -d "$SRC_DIR" ]; then
         git clone --depth 1 "$GIT_URL" -b "$GIT_BRANCH" "$SRC_DIR"
         if [ "$GIT_COMMIT" ]; then
-            pushd "$SRC_DIR" || exit
+            pushd "$SRC_DIR"
             git fetch --depth 1 origin "$GIT_COMMIT"
             git reset --hard FETCH_HEAD
-            popd || exit
+            popd
         fi
     fi
 }
@@ -51,23 +51,23 @@ build_custom_linux() {
 
     checkout_repo "$LINUX_CUSTOM_DIR" "$LINUX_CUSTOM_URL" "$LINUX_CUSTOM_BRANCH"
 
-    cp "$SRCDIR"/resources/linux-config-"${ARCH}" "$LINUX_CUSTOM_DIR"/.config
+    cp $SRCDIR/resources/linux-config-${ARCH} $LINUX_CUSTOM_DIR/.config
 
-    pushd "$LINUX_CUSTOM_DIR" || exit
+    pushd $LINUX_CUSTOM_DIR
-    make -j "$(nproc)"
+    make -j `nproc`
-    if [ "${ARCH}" == "x86_64" ]; then
+    if [ ${ARCH} == "x86_64" ]; then
-        cp vmlinux "$WORKLOADS_DIR/" || exit 1
+       cp vmlinux "$WORKLOADS_DIR/" || exit 1
-    elif [ "${ARCH}" == "aarch64" ]; then
+    elif [ ${ARCH} == "aarch64" ]; then
-        cp arch/arm64/boot/Image "$WORKLOADS_DIR/" || exit 1
+       cp arch/arm64/boot/Image "$WORKLOADS_DIR/" || exit 1
-        cp arch/arm64/boot/Image.gz "$WORKLOADS_DIR/" || exit 1
+       cp arch/arm64/boot/Image.gz "$WORKLOADS_DIR/" || exit 1
     fi
-    popd || exit
+    popd
 }
 
 cmd_help() {
     echo ""
-    echo "Cloud Hypervisor $(basename "$0")"
+    echo "Cloud Hypervisor $(basename $0)"
-    echo "Usage: $(basename "$0") [<args>]"
+    echo "Usage: $(basename $0) [<args>]"
     echo ""
     echo "Available arguments:"
     echo ""
@@ -80,61 +80,30 @@ cmd_help() {
 
 process_common_args() {
     while [ $# -gt 0 ]; do
-        case "$1" in
+	case "$1" in
-        "-h" | "--help") {
+            "-h"|"--help")  { cmd_help; exit 1; } ;;
-            cmd_help
+            "--hypervisor")
-            exit 1
+                shift
-        } ;;
+                hypervisor="$1"
-        "--hypervisor")
+                ;;
-            shift
+            "--test-filter")
-            hypervisor="$1"
+                shift
-            ;;
+                test_filter="$1"
-        "--test-filter")
+                ;;
-            shift
+            "--") {
-            # shellcheck disable=SC2034
+                shift
-            test_filter="$1"
+                break
-            ;;
+            } ;;
-        "--") {
+            *)
-            shift
+                echo "Unknown test scripts argument: $1. Please use '-- --help' for help."
-            break
+                exit
-        } ;;
+                ;;
-        *)
+	esac
-            echo "Unknown test scripts argument: $1. Please use '-- --help' for help."
+	shift
-            exit
-            ;;
-        esac
-        shift
     done
-    if [[ ! ("$hypervisor" = "kvm" || "$hypervisor" = "mshv") ]]; then
+    if [[ ! ("$hypervisor" = "kvm" ||  "$hypervisor" = "mshv") ]]; then
         die "Hypervisor value must be kvm or mshv"
     fi
-    # shellcheck disable=SC2034
-    test_binary_args=("$@")
-}
 
-download_hypervisor_fw() {
+    test_binary_args=($@)
-    if [ -n "$AUTH_DOWNLOAD_TOKEN" ]; then
-        echo "Using authenticated download from GitHub"
-        FW_URL=$(curl --silent https://api.github.com/repos/cloud-hypervisor/rust-hypervisor-firmware/releases/latest \
-            --header "Authorization: Token $AUTH_DOWNLOAD_TOKEN" \
-            --header "X-GitHub-Api-Version: 2022-11-28" | grep "browser_download_url" | grep -o 'https://.*[^ "]')
-    else
-        echo "Using anonymous download from GitHub"
-        FW_URL=$(curl --silent https://api.github.com/repos/cloud-hypervisor/rust-hypervisor-firmware/releases/latest | grep "browser_download_url" | grep -o 'https://.*[^ "]')
-    fi
-    FW="$WORKLOADS_DIR/hypervisor-fw"
-    pushd "$WORKLOADS_DIR" || exit
-    rm -f "$FW"
-    time wget --quiet "$FW_URL" || exit 1
-    popd || exit
-}
-
-download_ovmf() {
-    OVMF_FW_TAG="ch-6624aa331f"
-    OVMF_FW_URL="https://github.com/cloud-hypervisor/edk2/releases/download/$OVMF_FW_TAG/CLOUDHV.fd"
-    OVMF_FW="$WORKLOADS_DIR/CLOUDHV.fd"
-    pushd "$WORKLOADS_DIR" || exit
-    rm -f "$OVMF_FW"
-    time wget --quiet $OVMF_FW_URL || exit 1
-    popd || exit
 }

src/main.rs

@@ -20,7 +20,6 @@ use std::sync::{Arc, Mutex};
 use thiserror::Error;
 #[cfg(feature = "dbus_api")]
 use vmm::api::dbus::{dbus_api_graceful_shutdown, DBusApiOptions};
-use vmm::api::ApiAction;
 use vmm::config;
 use vmm_sys_util::eventfd::EventFd;
 use vmm_sys_util::signal::block_signal;
@@ -241,13 +240,6 @@ fn create_app(default_vcpus: String, default_memory: String, default_rng: String
                 .num_args(1)
                 .group("vm-config"),
         )
-        .arg(
-            Arg::new("rate-limit-group")
-                .long("rate-limit-group")
-                .help(config::RateLimiterGroupConfig::SYNTAX)
-                .num_args(1..)
-                .group("vm-config"),
-        )
         .arg(
             Arg::new("disk")
                 .long("disk")
@@ -418,15 +410,6 @@ fn create_app(default_vcpus: String, default_memory: String, default_rng: String
             .group("vm-config"),
     );
 
-    #[cfg(target_arch = "x86_64")]
-    let app = app.arg(
-        Arg::new("debug-console")
-            .long("debug-console")
-            .help("Debug console: off|pty|tty|file=</path/to/a/file>,iobase=<port in hex>")
-            .default_value("off,iobase=0xe9")
-            .group("vm-config"),
-    );
-
     #[cfg(feature = "guest_debug")]
     let app = app.arg(
         Arg::new("gdb")
@@ -460,14 +443,7 @@ fn create_app(default_vcpus: String, default_memory: String, default_rng: String
                 .num_args(0)
                 .group("vmm-config"),
         );
-    #[cfg(feature = "igvm")]
+
-    let app = app.arg(
-        Arg::new("igvm")
-            .long("igvm")
-            .help("Path to IGVM file to load.")
-            .num_args(1)
-            .group("vm-config"),
-    );
     app.arg(
         Arg::new("version")
             .short('V')
@@ -622,7 +598,6 @@ fn start_vmm(cmd_arguments: ArgMatches) -> Result<Option<String>, Error> {
                     std::fs::OpenOptions::new()
                         .write(true)
                         .create(true)
-                        .truncate(true)
                         .open(parser.get("path").unwrap())
                         .map_err(Error::EventMonitorIo)?,
                 ))
@@ -697,11 +672,6 @@ fn start_vmm(cmd_arguments: ArgMatches) -> Result<Option<String>, Error> {
     .map_err(Error::StartVmmThread)?;
 
     let r: Result<(), Error> = (|| {
-        #[cfg(feature = "igvm")]
-        let payload_present = cmd_arguments.contains_id("kernel")
-            || cmd_arguments.contains_id("firmware")
-            || cmd_arguments.contains_id("igvm");
-        #[cfg(not(feature = "igvm"))]
         let payload_present =
             cmd_arguments.contains_id("kernel") || cmd_arguments.contains_id("firmware");
 
@@ -711,24 +681,22 @@ fn start_vmm(cmd_arguments: ArgMatches) -> Result<Option<String>, Error> {
 
             // Create and boot the VM based off the VM config we just built.
             let sender = api_request_sender.clone();
-            vmm::api::VmCreate
+            vmm::api::vm_create(
-                .send(
+                api_evt.try_clone().unwrap(),
-                    api_evt.try_clone().unwrap(),
+                api_request_sender,
-                    api_request_sender,
+                Arc::new(Mutex::new(vm_config)),
-                    Arc::new(Mutex::new(vm_config)),
+            )
-                )
+            .map_err(Error::VmCreate)?;
-                .map_err(Error::VmCreate)?;
+            vmm::api::vm_boot(api_evt.try_clone().unwrap(), sender).map_err(Error::VmBoot)?;
-            vmm::api::VmBoot
-                .send(api_evt.try_clone().unwrap(), sender, ())
-                .map_err(Error::VmBoot)?;
         } else if let Some(restore_params) = cmd_arguments.get_one::<String>("restore") {
-            vmm::api::VmRestore
+            vmm::api::vm_restore(
-                .send(
+                api_evt.try_clone().unwrap(),
-                    api_evt.try_clone().unwrap(),
+                api_request_sender,
-                    api_request_sender,
+                Arc::new(
                     config::RestoreConfig::parse(restore_params).map_err(Error::ParsingRestore)?,
-                )
+                ),
-                .map_err(Error::VmRestore)?;
+            )
+            .map_err(Error::VmRestore)?;
         }
 
         Ok(())
@@ -758,9 +726,6 @@ fn main() {
     #[cfg(all(feature = "tdx", feature = "sev_snp"))]
     compile_error!("Feature 'tdx' and 'sev_snp' are mutually exclusive.");
 
-    #[cfg(all(feature = "sev_snp", not(target_arch = "x86_64")))]
-    compile_error!("Feature 'sev_snp' needs target 'x86_64'");
-
     #[cfg(feature = "dhat-heap")]
     let _profiler = dhat::Profiler::new_heap();
 
@@ -807,8 +772,6 @@ mod unit_tests {
         ConsoleConfig, ConsoleOutputMode, CpuFeatures, CpusConfig, MemoryConfig, PayloadConfig,
         RngConfig, VmConfig, VmParams,
     };
-    #[cfg(target_arch = "x86_64")]
-    use vmm::vm_config::DebugConsoleConfig;
 
     fn get_vm_config_from_vec(args: &[&str]) -> VmConfig {
         let (default_vcpus, default_memory, default_rng) = prepare_default_values();
@@ -870,13 +833,8 @@ mod unit_tests {
             },
             payload: Some(PayloadConfig {
                 kernel: Some(PathBuf::from("/path/to/kernel")),
-                firmware: None,
+                ..Default::default()
-                cmdline: None,
-                initramfs: None,
-                #[cfg(feature = "igvm")]
-                igvm: None,
             }),
-            rate_limit_groups: None,
             disks: None,
             net: None,
             rng: RngConfig {
@@ -898,8 +856,6 @@ mod unit_tests {
                 iommu: false,
                 socket: None,
             },
-            #[cfg(target_arch = "x86_64")]
-            debug_console: DebugConsoleConfig::default(),
             devices: None,
             user_devices: None,
             vdpa: None,
@@ -1150,29 +1106,6 @@ mod unit_tests {
                 }"#,
                 true,
             ),
-            (
-                vec![
-                    "cloud-hypervisor",
-                    "--kernel",
-                    "/path/to/kernel",
-                    "--disk",
-                    "path=/path/to/disk/1,rate_limit_group=group0",
-                    "path=/path/to/disk/2,rate_limit_group=group0",
-                    "--rate-limit-group",
-                    "id=group0,bw_size=1000,bw_refill_time=100",
-                ],
-                r#"{
-                    "payload": {"kernel": "/path/to/kernel"},
-                    "disks": [
-                        {"path": "/path/to/disk/1", "rate_limit_group": "group0"},
-                        {"path": "/path/to/disk/2", "rate_limit_group": "group0"}
-                    ],
-                    "rate_limit_groups": [
-                        {"id": "group0", "rate_limiter_config": {"bandwidth": {"size": 1000, "one_time_burst": 0, "refill_time": 100}}}
-                    ]
-                }"#,
-                true,
-            ),
         ]
         .iter()
         .for_each(|(cli, openapi, equal)| {
@@ -1531,30 +1464,6 @@ mod unit_tests {
         });
     }
 
-    #[cfg(target_arch = "x86_64")]
-    #[test]
-    fn test_valid_vm_config_debug_console() {
-        [(
-            vec![
-                "cloud-hypervisor",
-                "--kernel",
-                "/path/to/kernel",
-                "--debug-console",
-                "tty,iobase=0xe9",
-            ],
-            // 233 == 0xe9
-            r#"{
-                "payload": {"kernel": "/path/to/kernel" },
-                "debug_console": {"mode": "Tty", "iobase": 233 }
-            }"#,
-            true,
-        )]
-        .iter()
-        .for_each(|(cli, openapi, equal)| {
-            compare_vm_config_cli_vs_json(cli, openapi, *equal);
-        });
-    }
-
     #[test]
     fn test_valid_vm_config_serial_console() {
         [

test_infra/Cargo.toml

@@ -7,10 +7,10 @@ edition = "2021"
 [dependencies]
 dirs = "5.0.0"
 epoll = "4.3.3"
-libc = "0.2.153"
+libc = "0.2.147"
-once_cell = "1.19.0"
+once_cell = "1.18.0"
-serde = { version = "1.0.196", features = ["rc", "derive"] }
+serde = { version = "1.0.168", features = ["rc", "derive"] }
-serde_json = "1.0.109"
+serde_json = "1.0.107"
 ssh2 = { version = "0.9.4", features = ["vendored-openssl"] }
-vmm-sys-util = "0.12.1"
+vmm-sys-util = "0.11.0"
 wait-timeout = "0.2.0"

test_infra/src/lib.rs

@@ -149,13 +149,13 @@ impl GuestNetworkConfig {
             Err(e) => {
                 let duration = start.elapsed();
                 eprintln!(
-                    "\n\n==== Start 'wait_vm_boot' (FAILED) ==== \
+                    "\n\n==== Start 'wait_vm_boot' (FAILED) ====\n\n\
-                    \n\nduration =\"{duration:?}, timeout = {timeout}s\" \
+                 duration =\"{duration:?}, timeout = {timeout}s\"\n\
-                    \nlisten_addr=\"{listen_addr}\" \
+                 listen_addr=\"{listen_addr}\"\n\
-                    \nexpected_guest_addr=\"{expected_guest_addr}\" \
+                 expected_guest_addr=\"{expected_guest_addr}\"\n\
-                    \nmessage=\"{s}\" \
+                 message=\"{s}\"\n\
-                    \nerror=\"{e:?}\" \
+                 error=\"{e:?}\"\n\
-                    \n\n==== End 'wait_vm_boot' outout ====\n\n"
+                 \n==== End 'wait_vm_boot' outout ====\n\n"
                 );
 
                 Err(e)
@@ -724,77 +724,18 @@ pub fn ssh_command_ip(
     )
 }
 
-pub fn exec_host_command_with_retries(command: &str, retries: u32, interval: Duration) -> bool {
-    for _ in 0..retries {
-        let s = exec_host_command_output(command).status;
-        if !s.success() {
-            eprintln!("\n\n==== retrying in {:?} ===\n\n", interval);
-            thread::sleep(interval);
-        } else {
-            return true;
-        }
-    }
-
-    false
-}
-
 pub fn exec_host_command_status(command: &str) -> ExitStatus {
-    exec_host_command_output(command).status
+    std::process::Command::new("bash")
+        .args(["-c", command])
+        .status()
+        .unwrap_or_else(|_| panic!("Expected '{command}' to run"))
 }
 
 pub fn exec_host_command_output(command: &str) -> Output {
-    let output = std::process::Command::new("bash")
+    std::process::Command::new("bash")
         .args(["-c", command])
         .output()
-        .unwrap_or_else(|e| panic!("Expected '{command}' to run. Error: {:?}", e));
+        .unwrap_or_else(|_| panic!("Expected '{command}' to run"))
-
-    if !output.status.success() {
-        let stdout = String::from_utf8_lossy(&output.stdout);
-        let stderr = String::from_utf8_lossy(&output.stderr);
-        eprintln!(
-            "\n\n==== Start 'exec_host_command' failed ==== \
-            \n\n---stdout---\n{stdout}\n---stderr---{stderr} \
-            \n\n==== End 'exec_host_command' failed ====",
-        );
-    }
-
-    output
-}
-
-pub fn check_lines_count(input: &str, line_count: usize) -> bool {
-    if input.lines().count() == line_count {
-        true
-    } else {
-        eprintln!(
-            "\n\n==== Start 'check_lines_count' failed ==== \
-            \n\ninput = {input}\nline_count = {line_count} \
-            \n\n==== End 'check_lines_count' failed ====",
-        );
-
-        false
-    }
-}
-
-pub fn check_matched_lines_count(input: &str, keywords: Vec<&str>, line_count: usize) -> bool {
-    let mut matches = String::new();
-    for line in input.lines() {
-        if keywords.iter().all(|k| line.contains(k)) {
-            matches += line;
-        }
-    }
-
-    if matches.lines().count() == line_count {
-        true
-    } else {
-        eprintln!(
-            "\n\n==== Start 'check_matched_lines_count' failed ==== \
-            \nkeywords = {keywords:?}, line_count = {line_count} \
-            \n\ninput = {input} matches = {matches} \
-            \n\n==== End 'check_matched_lines_count' failed ====",
-        );
-
-        false
-    }
 }
 
 pub const PIPE_SIZE: i32 = 32 << 20;
@@ -1402,7 +1343,7 @@ pub fn parse_iperf3_output(output: &[u8], sender: bool, bandwidth: bool) -> Resu
     })
     .map_err(|_| {
         eprintln!(
-            "==== Start iperf3 output ===\n\n{}\n\n=== End iperf3 output ===\n\n",
+            "=============== iperf3 output ===============\n\n{}\n\n===========end============\n\n",
             String::from_utf8_lossy(output)
         );
         Error::Iperf3Parse
@@ -1480,7 +1421,9 @@ pub fn parse_fio_output(output: &str, fio_ops: &FioOps, num_jobs: u32) -> Result
         total_bps
     })
     .map_err(|_| {
-        eprintln!("=== Start Fio output ===\n\n{output}\n\n=== End Fio output ===\n\n");
+        eprintln!(
+            "=============== Fio output ===============\n\n{output}\n\n===========end============\n\n"
+        );
         Error::FioOutputParse
     })
 }
@@ -1533,7 +1476,9 @@ pub fn parse_fio_output_iops(output: &str, fio_ops: &FioOps, num_jobs: u32) -> R
         total_iops
     })
     .map_err(|_| {
-        eprintln!("=== Start Fio output ===\n\n{output}\n\n=== End Fio output ===\n\n");
+        eprintln!(
+            "=============== Fio output ===============\n\n{output}\n\n===========end============\n\n"
+        );
         Error::FioOutputParse
     })
 }
@@ -1666,7 +1611,7 @@ pub fn parse_ethr_latency_output(output: &[u8]) -> Result<Vec<f64>, Error> {
     })
     .map_err(|_| {
         eprintln!(
-            "=== Start ethr output ===\n\n{}\n\n=== End ethr output ===\n\n",
+            "=============== ethr output ===============\n\n{}\n\n===========end============\n\n",
             String::from_utf8_lossy(output)
         );
         Error::EthrLogParse

tests/integration.rs

@@ -687,8 +687,6 @@ fn resize_command(
                 device_id: None,
             },
         ];
-        // See: #5938
-        thread::sleep(std::time::Duration::new(1, 0));
         assert!(check_latest_events_exact(&latest_events, event_path));
     }
 
@@ -860,7 +858,6 @@ fn fw_path(_fw_type: FwType) -> String {
     fw_path.to_str().unwrap().to_string()
 }
 
-#[derive(Debug)]
 struct MetaEvent {
     event: String,
     device_id: Option<String>,
@@ -913,18 +910,7 @@ fn check_sequential_events(expected_events: &[&MetaEvent], event_file: &str) ->
         }
     }
 
-    let ret = idx == len;
+    idx == len
-
-    if !ret {
-        eprintln!(
-            "\n\n==== Start 'check_sequential_events' failed ==== \
-             \n\nexpected_events={:?}\nactual_events={:?} \
-             \n\n==== End 'check_sequential_events' failed ====",
-            expected_events, json_events,
-        );
-    }
-
-    ret
 }
 
 // Return true if all events from the input 'expected_events' are matched exactly
@@ -936,13 +922,6 @@ fn check_sequential_events_exact(expected_events: &[&MetaEvent], event_file: &st
 
     for (idx, e) in json_events.iter().enumerate() {
         if !expected_events[idx].match_with_json_event(e) {
-            eprintln!(
-                "\n\n==== Start 'check_sequential_events_exact' failed ==== \
-                 \n\nexpected_events={:?}\nactual_events={:?} \
-                 \n\n==== End 'check_sequential_events_exact' failed ====",
-                expected_events, json_events,
-            );
-
             return false;
         }
     }
@@ -959,13 +938,6 @@ fn check_latest_events_exact(latest_events: &[&MetaEvent], event_file: &str) ->
 
     for (idx, e) in json_events.iter().enumerate() {
         if !latest_events[idx].match_with_json_event(e) {
-            eprintln!(
-                "\n\n==== Start 'check_latest_events_exact' failed ==== \
-                 \n\nexpected_events={:?}\nactual_events={:?} \
-                 \n\n==== End 'check_latest_events_exact' failed ====",
-                latest_events, json_events,
-            );
-
             return false;
         }
     }
@@ -1035,40 +1007,6 @@ fn test_cpu_topology(threads_per_core: u8, cores_per_package: u8, packages: u8,
                 .unwrap_or(0),
             packages
         );
-
-        #[cfg(target_arch = "x86_64")]
-        {
-            let mut cpu_id = 0;
-            for package_id in 0..packages {
-                for core_id in 0..cores_per_package {
-                    for _ in 0..threads_per_core {
-                        assert_eq!(
-                            guest
-                                .ssh_command(&format!("cat /sys/devices/system/cpu/cpu{cpu_id}/topology/physical_package_id"))
-                                .unwrap()
-                                .trim()
-                                .parse::<u8>()
-                                .unwrap_or(0),
-                            package_id
-                        );
-
-                        assert_eq!(
-                            guest
-                                .ssh_command(&format!(
-                                    "cat /sys/devices/system/cpu/cpu{cpu_id}/topology/core_id"
-                                ))
-                                .unwrap()
-                                .trim()
-                                .parse::<u8>()
-                                .unwrap_or(0),
-                            core_id
-                        );
-
-                        cpu_id += 1;
-                    }
-                }
-            }
-        }
     });
 
     let _ = child.kill();
@@ -2119,7 +2057,7 @@ fn pty_read(mut pty: std::fs::File) -> Receiver<String> {
         thread::sleep(std::time::Duration::new(1, 0));
         let mut buf = [0; 512];
         match pty.read(&mut buf) {
-            Ok(_bytes) => {
+            Ok(_) => {
                 let output = std::str::from_utf8(&buf).unwrap().to_string();
                 match tx.send(output) {
                     Ok(_) => (),
@@ -2575,63 +2513,7 @@ mod common_parallel {
 
         let _ = child.kill();
         let output = child.wait_with_output().unwrap();
-        handle_child_output(r, &output);
-    }
 
-    #[test]
-    fn test_virtio_queue_affinity() {
-        let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
-        let guest = Guest::new(Box::new(focal));
-
-        // We need the host to have at least 4 CPUs if we want to be able
-        // to run this test.
-        let host_cpus_count = exec_host_command_output("nproc");
-        assert!(
-            String::from_utf8_lossy(&host_cpus_count.stdout)
-                .trim()
-                .parse::<u16>()
-                .unwrap_or(0)
-                >= 4
-        );
-
-        let mut child = GuestCommand::new(&guest)
-            .args(["--cpus", "boot=4"])
-            .args(["--memory", "size=512M"])
-            .args(["--kernel", direct_kernel_boot_path().to_str().unwrap()])
-            .args(["--cmdline", DIRECT_KERNEL_BOOT_CMDLINE])
-            .args([
-                "--disk",
-                format!(
-                    "path={}",
-                    guest.disk_config.disk(DiskType::OperatingSystem).unwrap()
-                )
-                .as_str(),
-                format!(
-                    "path={},num_queues=4,queue_affinity=[0@[0,2],1@[1,3],2@[1],3@[3]]",
-                    guest.disk_config.disk(DiskType::CloudInit).unwrap()
-                )
-                .as_str(),
-            ])
-            .default_net()
-            .capture_output()
-            .spawn()
-            .unwrap();
-
-        let r = std::panic::catch_unwind(|| {
-            guest.wait_vm_boot(None).unwrap();
-            let pid = child.id();
-            let taskset_q0 = exec_host_command_output(format!("taskset -pc $(ps -T -p {pid} | grep disk1_q0 | xargs | cut -f 2 -d \" \") | cut -f 6 -d \" \"").as_str());
-            assert_eq!(String::from_utf8_lossy(&taskset_q0.stdout).trim(), "0,2");
-            let taskset_q1 = exec_host_command_output(format!("taskset -pc $(ps -T -p {pid} | grep disk1_q1 | xargs | cut -f 2 -d \" \") | cut -f 6 -d \" \"").as_str());
-            assert_eq!(String::from_utf8_lossy(&taskset_q1.stdout).trim(), "1,3");
-            let taskset_q2 = exec_host_command_output(format!("taskset -pc $(ps -T -p {pid} | grep disk1_q2 | xargs | cut -f 2 -d \" \") | cut -f 6 -d \" \"").as_str());
-            assert_eq!(String::from_utf8_lossy(&taskset_q2.stdout).trim(), "1");
-            let taskset_q3 = exec_host_command_output(format!("taskset -pc $(ps -T -p {pid} | grep disk1_q3 | xargs | cut -f 2 -d \" \") | cut -f 6 -d \" \"").as_str());
-            assert_eq!(String::from_utf8_lossy(&taskset_q3.stdout).trim(), "3");
-        });
-
-        let _ = child.kill();
-        let output = child.wait_with_output().unwrap();
         handle_child_output(r, &output);
     }
 
@@ -4218,12 +4100,7 @@ mod common_parallel {
 
         let r = std::panic::catch_unwind(|| {
             // Check that the cloud-hypervisor binary actually terminated
-            if !output.status.success() {
+            assert!(output.status.success())
-                panic!(
-                    "Cloud Hypervisor process failed to terminate gracefully: {:?}",
-                    output.status
-                );
-            }
         });
         handle_child_output(r, &output);
     }
@@ -4444,35 +4321,49 @@ mod common_parallel {
             // Let's ssh into it and verify that it's there. If it is it means
             // we're in the right guest (The L2 one) because the QEMU L1 guest
             // does not have this command line tag.
-            assert!(check_matched_lines_count(
+            assert_eq!(
-                guest.ssh_command_l2_1("cat /proc/cmdline").unwrap().trim(),
+                guest
-                vec!["VFIOTAG"],
+                    .ssh_command_l2_1("grep -c VFIOTAG /proc/cmdline")
+                    .unwrap()
+                    .trim()
+                    .parse::<u32>()
+                    .unwrap_or_default(),
                 1
-            ));
+            );
 
             // Let's also verify from the second virtio-net device passed to
             // the L2 VM.
-            assert!(check_matched_lines_count(
+            assert_eq!(
-                guest.ssh_command_l2_2("cat /proc/cmdline").unwrap().trim(),
+                guest
-                vec!["VFIOTAG"],
+                    .ssh_command_l2_2("grep -c VFIOTAG /proc/cmdline")
+                    .unwrap()
+                    .trim()
+                    .parse::<u32>()
+                    .unwrap_or_default(),
                 1
-            ));
+            );
 
             // Check the amount of PCI devices appearing in L2 VM.
-            assert!(check_lines_count(
+            assert_eq!(
                 guest
-                    .ssh_command_l2_1("ls /sys/bus/pci/devices")
+                    .ssh_command_l2_1("ls /sys/bus/pci/devices | wc -l")
                     .unwrap()
-                    .trim(),
+                    .trim()
-                8
+                    .parse::<u32>()
-            ));
+                    .unwrap_or_default(),
+                8,
+            );
 
             // Check both if /dev/vdc exists and if the block size is 16M in L2 VM
-            assert!(check_matched_lines_count(
+            assert_eq!(
-                guest.ssh_command_l2_1("lsblk").unwrap().trim(),
+                guest
-                vec!["vdc", "16M"],
+                    .ssh_command_l2_1("lsblk | grep vdc | grep -c 16M")
+                    .unwrap()
+                    .trim()
+                    .parse::<u32>()
+                    .unwrap_or_default(),
                 1
-            ));
+            );
 
             // Hotplug an extra virtio-net device through L2 VM.
             guest
@@ -4490,33 +4381,35 @@ mod common_parallel {
                  add-device path=/sys/bus/pci/devices/0000:00:09.0,id=vfio123",
                 )
                 .unwrap();
-            assert!(check_matched_lines_count(
+            assert!(vfio_hotplug_output.contains("{\"id\":\"vfio123\",\"bdf\":\"0000:00:08.0\"}"));
-                vfio_hotplug_output.trim(),
-                vec!["{\"id\":\"vfio123\",\"bdf\":\"0000:00:08.0\"}"],
-                1
-            ));
 
             thread::sleep(std::time::Duration::new(10, 0));
 
             // Let's also verify from the third virtio-net device passed to
             // the L2 VM. This third device has been hotplugged through the L2
             // VM, so this is our way to validate hotplug works for VFIO PCI.
-            assert!(check_matched_lines_count(
+            assert_eq!(
-                guest.ssh_command_l2_3("cat /proc/cmdline").unwrap().trim(),
+                guest
-                vec!["VFIOTAG"],
+                    .ssh_command_l2_3("grep -c VFIOTAG /proc/cmdline")
+                    .unwrap()
+                    .trim()
+                    .parse::<u32>()
+                    .unwrap_or_default(),
                 1
-            ));
+            );
 
             // Check the amount of PCI devices appearing in L2 VM.
             // There should be one more device than before, raising the count
             // up to 9 PCI devices.
-            assert!(check_lines_count(
+            assert_eq!(
                 guest
-                    .ssh_command_l2_1("ls /sys/bus/pci/devices")
+                    .ssh_command_l2_1("ls /sys/bus/pci/devices | wc -l")
                     .unwrap()
-                    .trim(),
+                    .trim()
-                9
+                    .parse::<u32>()
-            ));
+                    .unwrap_or_default(),
+                9,
+            );
 
             // Let's now verify that we can correctly remove the virtio-net
             // device through the "remove-device" command responsible for
@@ -4532,13 +4425,15 @@ mod common_parallel {
 
             // Check the amount of PCI devices appearing in L2 VM is back down
             // to 8 devices.
-            assert!(check_lines_count(
+            assert_eq!(
                 guest
-                    .ssh_command_l2_1("ls /sys/bus/pci/devices")
+                    .ssh_command_l2_1("ls /sys/bus/pci/devices | wc -l")
                     .unwrap()
-                    .trim(),
+                    .trim()
-                8
+                    .parse::<u32>()
-            ));
+                    .unwrap_or_default(),
+                8,
+            );
 
             // Perform memory hotplug in L2 and validate the memory is showing
             // up as expected. In order to check, we will use the virtio-net
@@ -5898,7 +5793,7 @@ mod common_parallel {
         #[cfg(target_arch = "x86_64")]
         let mut kernels = vec![direct_kernel_boot_path()];
         #[cfg(target_arch = "aarch64")]
-        let kernels = [direct_kernel_boot_path()];
+        let kernels = vec![direct_kernel_boot_path()];
 
         #[cfg(target_arch = "x86_64")]
         {
@@ -6057,8 +5952,6 @@ mod common_parallel {
                     event: "device-removed".to_string(),
                     device_id: Some(net_id.to_string()),
                 }];
-                // See: #5938
-                thread::sleep(std::time::Duration::new(1, 0));
                 assert!(check_latest_events_exact(&latest_events, &event_path));
 
                 // Plug the virtio-net device again
@@ -6082,8 +5975,6 @@ mod common_parallel {
                     device_id: None,
                 },
             ];
-            // See: #5938
-            thread::sleep(std::time::Duration::new(1, 0));
             assert!(check_latest_events_exact(&latest_events, &event_path));
 
             // Take a snapshot from the VM
@@ -6106,8 +5997,6 @@ mod common_parallel {
                     device_id: None,
                 },
             ];
-            // See: #5938
-            thread::sleep(std::time::Duration::new(1, 0));
             assert!(check_latest_events_exact(&latest_events, &event_path));
         });
 
@@ -6183,12 +6072,6 @@ mod common_parallel {
         let r = std::panic::catch_unwind(|| {
             // Resume the VM
             assert!(remote_command(&api_socket_restored, "resume", None));
-            // There is no way that we can ensure the 'write()' to the
-            // event file is completed when the 'resume' request is
-            // returned successfully, because the 'write()' was done
-            // asynchronously from a different thread of Cloud
-            // Hypervisor (e.g. the event-monitor thread).
-            thread::sleep(std::time::Duration::new(1, 0));
             let latest_events = [
                 &MetaEvent {
                     event: "resuming".to_string(),
@@ -6368,7 +6251,6 @@ mod common_parallel {
         let api_socket = temp_api_path(&guest.tmp_dir);
 
         let kernel_path = direct_kernel_boot_path();
-        let event_path = temp_event_monitor_path(&guest.tmp_dir);
 
         let mut cmd = GuestCommand::new(&guest);
         cmd.args(["--cpus", "boot=1"])
@@ -6379,7 +6261,6 @@ mod common_parallel {
             .args(["--net", guest.default_net_string().as_str()])
             .args(["--watchdog"])
             .args(["--api-socket", &api_socket])
-            .args(["--event-monitor", format!("path={event_path}").as_str()])
             .capture_output();
 
         let mut child = cmd.spawn().unwrap();
@@ -6424,17 +6305,7 @@ mod common_parallel {
             {
                 // Now pause the VM and remain offline for 30s
                 assert!(remote_command(&api_socket, "pause", None));
-                let latest_events = [
+                thread::sleep(std::time::Duration::new(30, 0));
-                    &MetaEvent {
-                        event: "pausing".to_string(),
-                        device_id: None,
-                    },
-                    &MetaEvent {
-                        event: "paused".to_string(),
-                        device_id: None,
-                    },
-                ];
-                assert!(check_latest_events_exact(&latest_events, &event_path));
                 assert!(remote_command(&api_socket, "resume", None));
 
                 // Check no reboot
@@ -6866,11 +6737,10 @@ mod common_parallel {
             .unwrap();
         thread::sleep(std::time::Duration::new(2, 0));
 
-        assert!(exec_host_command_with_retries(
+        assert!(exec_host_command_status(
-            "/usr/local/bin/spdk-nvme/rpc.py nvmf_create_transport -t VFIOUSER",
+            "/usr/local/bin/spdk-nvme/rpc.py nvmf_create_transport -t VFIOUSER"
-            3,
+        )
-            std::time::Duration::new(5, 0),
+        .success());
-        ));
         assert!(exec_host_command_status(&format!(
             "/usr/local/bin/spdk-nvme/rpc.py bdev_aio_create {} test 512",
             nvme_dir.join("test-disk.raw").to_str().unwrap()
@@ -6985,7 +6855,9 @@ mod common_parallel {
     #[cfg(target_arch = "x86_64")]
     fn test_vdpa_block() {
         // Before trying to run the test, verify the vdpa_sim_blk module is correctly loaded.
-        assert!(exec_host_command_status("lsmod | grep vdpa_sim_blk").success());
+        if !exec_host_command_status("lsmod | grep vdpa_sim_blk").success() {
+            return;
+        }
 
         let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
         let guest = Guest::new(Box::new(focal));
@@ -7224,58 +7096,6 @@ mod common_parallel {
 
         handle_child_output(r, &output);
     }
-
-    #[test]
-    #[cfg(target_arch = "x86_64")]
-    fn test_double_tty() {
-        let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
-        let guest = Guest::new(Box::new(focal));
-        let mut cmd = GuestCommand::new(&guest);
-        let api_socket = temp_api_path(&guest.tmp_dir);
-        let tty_str: &str = "console=hvc0 earlyprintk=ttyS0 ";
-        // linux printk module enable console log.
-        let con_dis_str: &str = "console [hvc0] enabled";
-        // linux printk module disable console log.
-        let con_enb_str: &str = "bootconsole [earlyser0] disabled";
-
-        let kernel_path = direct_kernel_boot_path();
-
-        cmd.args(["--cpus", "boot=1"])
-            .args(["--memory", "size=512M"])
-            .args(["--kernel", kernel_path.to_str().unwrap()])
-            .args([
-                "--cmdline",
-                DIRECT_KERNEL_BOOT_CMDLINE
-                    .replace("console=hvc0 ", tty_str)
-                    .as_str(),
-            ])
-            .capture_output()
-            .default_disks()
-            .default_net()
-            .args(["--serial", "tty"])
-            .args(["--console", "tty"])
-            .args(["--api-socket", &api_socket]);
-
-        let mut child = cmd.spawn().unwrap();
-
-        let mut r = std::panic::catch_unwind(|| {
-            guest.wait_vm_boot(None).unwrap();
-        });
-
-        let _ = child.kill();
-        let output = child.wait_with_output().unwrap();
-
-        if r.is_ok() {
-            r = std::panic::catch_unwind(|| {
-                let s = String::from_utf8_lossy(&output.stdout);
-                assert!(s.contains(tty_str));
-                assert!(s.contains(con_dis_str));
-                assert!(s.contains(con_enb_str));
-            });
-        }
-
-        handle_child_output(r, &output);
-    }
 }
 
 mod dbus_api {
@@ -8632,13 +8452,8 @@ mod live_migration {
         if !send_success {
             let _ = send_migration.kill();
             let output = send_migration.wait_with_output().unwrap();
-            eprintln!(
+            eprintln!("\n\n==== Start 'send_migration' output ====\n\n---stdout---\n{}\n\n---stderr---\n{}\n\n==== End 'send_migration' output ====\n\n",
-                "\n\n==== Start 'send_migration' output ==== \
+                    String::from_utf8_lossy(&output.stdout), String::from_utf8_lossy(&output.stderr));
-                \n\n---stdout---\n{}\n\n---stderr---\n{} \
-                \n\n==== End 'send_migration' output ====\n\n",
-                String::from_utf8_lossy(&output.stdout),
-                String::from_utf8_lossy(&output.stderr)
-            );
         }
 
         // The 'receive-migration' command should be executed successfully within the given timeout
@@ -8654,13 +8469,8 @@ mod live_migration {
         if !receive_success {
             let _ = receive_migration.kill();
             let output = receive_migration.wait_with_output().unwrap();
-            eprintln!(
+            eprintln!("\n\n==== Start 'receive_migration' output ====\n\n---stdout---\n{}\n\n---stderr---\n{}\n\n==== End 'receive_migration' output ====\n\n",
-                "\n\n==== Start 'receive_migration' output ==== \
+                    String::from_utf8_lossy(&output.stdout), String::from_utf8_lossy(&output.stderr));
-                \n\n---stdout---\n{}\n\n---stderr---\n{} \
-                \n\n==== End 'receive_migration' output ====\n\n",
-                String::from_utf8_lossy(&output.stdout),
-                String::from_utf8_lossy(&output.stderr)
-            );
         }
 
         send_success && receive_success
@@ -9653,51 +9463,43 @@ mod live_migration {
         }
 
         #[test]
-        #[ignore = "See #6134"]
         fn test_live_upgrade_basic() {
             _test_live_migration(true, false)
         }
 
         #[test]
-        #[ignore = "See #6134"]
         fn test_live_upgrade_local() {
             _test_live_migration(true, true)
         }
 
         #[test]
-        #[ignore = "See #6134"]
         #[cfg(not(feature = "mshv"))]
         fn test_live_upgrade_numa() {
             _test_live_migration_numa(true, false)
         }
 
         #[test]
-        #[ignore = "See #6134"]
         #[cfg(not(feature = "mshv"))]
         fn test_live_upgrade_numa_local() {
             _test_live_migration_numa(true, true)
         }
 
         #[test]
-        #[ignore = "See #6134"]
         fn test_live_upgrade_watchdog() {
             _test_live_migration_watchdog(true, false)
         }
 
         #[test]
-        #[ignore = "See #6134"]
         fn test_live_upgrade_watchdog_local() {
             _test_live_migration_watchdog(true, true)
         }
 
         #[test]
-        #[ignore = "See #6134"]
         fn test_live_upgrade_balloon() {
             _test_live_migration_balloon(true, false)
         }
 
         #[test]
-        #[ignore = "See #6134"]
         fn test_live_upgrade_balloon_local() {
             _test_live_migration_balloon(true, true)
         }
@@ -9733,7 +9535,6 @@ mod live_migration {
         }
 
         #[test]
-        #[ignore = "See #5532"]
         #[cfg(target_arch = "x86_64")]
         #[cfg(not(feature = "mshv"))]
         fn test_live_upgrade_ovs_dpdk_local() {
@@ -9824,9 +9625,7 @@ mod rate_limiter {
         }
 
         eprintln!(
-            "\n\n==== Start 'check_rate_limit' failed ==== \
+            "\n\n==== check_rate_limit failed! ====\n\nmeasured={measured}, , lower_limit={lower_limit}, upper_limit={upper_limit}\n\n"
-            \n\nmeasured={measured}, , lower_limit={lower_limit}, upper_limit={upper_limit} \
-            \n\n==== End 'check_rate_limit' failed ====\n\n"
         );
 
         false
@@ -9887,8 +9686,9 @@ mod rate_limiter {
         _test_rate_limiter_net(false);
     }
 
-    fn _test_rate_limiter_block(bandwidth: bool, num_queues: u32) {
+    fn _test_rate_limiter_block(bandwidth: bool) {
         let test_timeout = 10;
+        let num_queues = 1;
         let fio_ops = FioOps::RandRW;
 
         let bw_size = if bandwidth {
@@ -9915,11 +9715,11 @@ mod rate_limiter {
 
         let test_blk_params = if bandwidth {
             format!(
-                "path={blk_rate_limiter_test_img},num_queues={num_queues},bw_size={bw_size},bw_refill_time={bw_refill_time}"
+                "path={blk_rate_limiter_test_img},bw_size={bw_size},bw_refill_time={bw_refill_time}"
             )
         } else {
             format!(
-                "path={blk_rate_limiter_test_img},num_queues={num_queues},ops_size={bw_size},ops_refill_time={bw_refill_time}"
+                "path={blk_rate_limiter_test_img},ops_size={bw_size},ops_refill_time={bw_refill_time}"
             )
         };
 
@@ -9972,137 +9772,13 @@ mod rate_limiter {
         handle_child_output(r, &output);
     }
 
-    fn _test_rate_limiter_group_block(bandwidth: bool, num_queues: u32, num_disks: u32) {
-        let test_timeout = 10;
-        let fio_ops = FioOps::RandRW;
-
-        let bw_size = if bandwidth {
-            10485760_u64 // bytes
-        } else {
-            100_u64 // I/O
-        };
-        let bw_refill_time = 100; // ms
-        let limit_rate = (bw_size * 1000) as f64 / bw_refill_time as f64;
-
-        let focal = UbuntuDiskConfig::new(FOCAL_IMAGE_NAME.to_string());
-        let guest = Guest::new(Box::new(focal));
-        let api_socket = temp_api_path(&guest.tmp_dir);
-        let test_img_dir = TempDir::new_with_prefix("/var/tmp/ch").unwrap();
-
-        let rate_limit_group_arg = if bandwidth {
-            format!("id=group0,bw_size={bw_size},bw_refill_time={bw_refill_time}")
-        } else {
-            format!("id=group0,ops_size={bw_size},ops_refill_time={bw_refill_time}")
-        };
-
-        let mut disk_args = vec![
-            "--disk".to_string(),
-            format!(
-                "path={}",
-                guest.disk_config.disk(DiskType::OperatingSystem).unwrap()
-            ),
-            format!(
-                "path={}",
-                guest.disk_config.disk(DiskType::CloudInit).unwrap()
-            ),
-        ];
-
-        for i in 0..num_disks {
-            let test_img_path = String::from(
-                test_img_dir
-                    .as_path()
-                    .join(format!("blk{}.img", i))
-                    .to_str()
-                    .unwrap(),
-            );
-
-            assert!(exec_host_command_output(&format!(
-                "dd if=/dev/zero of={test_img_path} bs=1M count=1024"
-            ))
-            .status
-            .success());
-
-            disk_args.push(format!(
-                "path={test_img_path},num_queues={num_queues},rate_limit_group=group0"
-            ));
-        }
-
-        let mut child = GuestCommand::new(&guest)
-            .args(["--cpus", &format!("boot={}", num_queues * num_disks)])
-            .args(["--memory", "size=4G"])
-            .args(["--kernel", direct_kernel_boot_path().to_str().unwrap()])
-            .args(["--cmdline", DIRECT_KERNEL_BOOT_CMDLINE])
-            .args(["--rate-limit-group", &rate_limit_group_arg])
-            .args(disk_args)
-            .default_net()
-            .args(["--api-socket", &api_socket])
-            .capture_output()
-            .spawn()
-            .unwrap();
-
-        let r = std::panic::catch_unwind(|| {
-            guest.wait_vm_boot(None).unwrap();
-
-            let mut fio_command = format!(
-                "sudo fio --name=global --output-format=json \
-                --direct=1 --bs=4k --ioengine=io_uring --iodepth=64 \
-                --rw={fio_ops} --runtime={test_timeout} --numjobs={num_queues}"
-            );
-
-            // Generate additional argument for each disk:
-            // --name=job0 --filename=/dev/vdc \
-            // --name=job1 --filename=/dev/vdd \
-            // --name=job2 --filename=/dev/vde \
-            // ...
-            for i in 0..num_disks {
-                let c: char = 'c';
-                let arg = format!(
-                    " --name=job{i} --filename=/dev/vd{}",
-                    char::from_u32((c as u32) + i).unwrap()
-                );
-                fio_command += &arg;
-            }
-            let output = guest.ssh_command(&fio_command).unwrap();
-
-            // Parse fio output
-            let measured_rate = if bandwidth {
-                parse_fio_output(&output, &fio_ops, num_queues * num_disks).unwrap()
-            } else {
-                parse_fio_output_iops(&output, &fio_ops, num_queues * num_disks).unwrap()
-            };
-            assert!(check_rate_limit(measured_rate, limit_rate, 0.1));
-        });
-
-        let _ = child.kill();
-        let output = child.wait_with_output().unwrap();
-        handle_child_output(r, &output);
-    }
-
     #[test]
     fn test_rate_limiter_block_bandwidth() {
-        _test_rate_limiter_block(true, 1);
+        _test_rate_limiter_block(true)
-        _test_rate_limiter_block(true, 2)
-    }
-
-    #[test]
-    fn test_rate_limiter_group_block_bandwidth() {
-        _test_rate_limiter_group_block(true, 1, 1);
-        _test_rate_limiter_group_block(true, 2, 1);
-        _test_rate_limiter_group_block(true, 1, 2);
-        _test_rate_limiter_group_block(true, 2, 2);
     }
 
     #[test]
     fn test_rate_limiter_block_iops() {
-        _test_rate_limiter_block(false, 1);
+        _test_rate_limiter_block(false)
-        _test_rate_limiter_block(false, 2);
-    }
-
-    #[test]
-    fn test_rate_limiter_group_block_iops() {
-        _test_rate_limiter_group_block(false, 1, 1);
-        _test_rate_limiter_group_block(false, 2, 1);
-        _test_rate_limiter_group_block(false, 1, 2);
-        _test_rate_limiter_group_block(false, 2, 2);
     }
 }

tpm/Cargo.toml

@@ -12,4 +12,4 @@ libc = "0.2.138"
 log = "0.4.17"
 net_gen = { path = "../net_gen" }
 thiserror = "1.0.37"
-vmm-sys-util = "0.12.1"
+vmm-sys-util = "0.11.0"

tracer/Cargo.toml

@@ -5,11 +5,11 @@ authors = ["The Cloud Hypervisor Authors"]
 edition = "2021"
 
 [dependencies]
-libc = "0.2.153"
+libc = "0.2.147"
-log = "0.4.20"
+log = "0.4.17"
-once_cell = "1.19.0"
+once_cell = "1.18.0"
-serde = { version = "1.0.196", features = ["rc", "derive"] }
+serde = { version = "1.0.168", features = ["rc", "derive"] }
-serde_json = "1.0.109"
+serde_json = "1.0.107"
 
 [features]
 tracing = []

vhost_user_block/Cargo.toml

@@ -6,16 +6,17 @@ edition = "2021"
 build = "../build.rs"
 
 [dependencies]
-clap = { version = "4.4.7", features = ["wrap_help","cargo"] }
+clap = { version = "4.3.11", features = ["wrap_help","cargo"] }
 block = { path = "../block" }
-env_logger = "0.10.1"
+env_logger = "0.10.0"
 epoll = "4.3.3"
-libc = "0.2.153"
+libc = "0.2.147"
-log = "0.4.20"
+log = "0.4.17"
 option_parser = { path = "../option_parser" }
-vhost = { version = "0.10.0", features = ["vhost-user-backend"] }
+vhost = { version = "0.8.1", features = ["vhost-user-slave"] }
-vhost-user-backend = "0.13.1"
+vhost-user-backend = "0.10.1"
 virtio-bindings = "0.2.0"
-virtio-queue = "0.11.0"
+virtio-queue = "0.9.0"
-vm-memory = "0.14.0"
+vm-memory = "0.12.2"
-vmm-sys-util = "0.12.1"
+vmm-sys-util = "0.11.0"
+

vhost_user_block/src/lib.rs

@@ -58,7 +58,6 @@ impl<D: Read + Seek + Write + Send> DiskFile for D {}
 type Result<T> = std::result::Result<T, Error>;
 type VhostUserBackendResult<T> = std::result::Result<T, std::io::Error>;
 
-#[allow(dead_code)]
 #[derive(Debug)]
 enum Error {
     /// Failed to create kill eventfd
@@ -300,10 +299,9 @@ impl VhostUserBlkBackend {
     }
 }
 
-impl VhostUserBackendMut for VhostUserBlkBackend {
+impl VhostUserBackendMut<VringRwLock<GuestMemoryAtomic<GuestMemoryMmap>>, AtomicBitmap>
-    type Bitmap = AtomicBitmap;
+    for VhostUserBlkBackend
-    type Vring = VringRwLock<GuestMemoryAtomic<GuestMemoryMmap>>;
+{
-
     fn num_queues(&self) -> usize {
         self.config.num_queues as usize
     }
@@ -352,7 +350,7 @@ impl VhostUserBackendMut for VhostUserBlkBackend {
         evset: EventSet,
         vrings: &[VringRwLock<GuestMemoryAtomic<GuestMemoryMmap>>],
         thread_id: usize,
-    ) -> VhostUserBackendResult<()> {
+    ) -> VhostUserBackendResult<bool> {
         if evset != EventSet::IN {
             return Err(Error::HandleEventNotEpollIn.into());
         }
@@ -396,7 +394,7 @@ impl VhostUserBackendMut for VhostUserBlkBackend {
                     thread.process_queue(&mut vring);
                 }
 
-                Ok(())
+                Ok(false)
             }
             _ => Err(Error::HandleEventUnknownEvent.into()),
         }

vhost_user_net/Cargo.toml

@@ -6,15 +6,16 @@ edition = "2021"
 build = "../build.rs"
 
 [dependencies]
-clap = { version = "4.4.7", features = ["wrap_help","cargo"] }
+clap = { version = "4.3.11", features = ["wrap_help","cargo"] }
-env_logger = "0.10.1"
+env_logger = "0.10.0"
 epoll = "4.3.3"
-libc = "0.2.153"
+libc = "0.2.147"
-log = "0.4.20"
+log = "0.4.17"
 net_util = { path = "../net_util" }
 option_parser = { path = "../option_parser" }
-vhost = { version = "0.10.0", features = ["vhost-user-backend"] }
+vhost = { version = "0.8.1", features = ["vhost-user-slave"] }
-vhost-user-backend = "0.13.1"
+vhost-user-backend = "0.10.1"
 virtio-bindings = "0.2.0"
-vm-memory = "0.14.0"
+vm-memory = "0.12.2"
-vmm-sys-util = "0.12.1"
+vmm-sys-util = "0.11.0"
+

vhost_user_net/src/lib.rs

@@ -158,10 +158,9 @@ impl VhostUserNetBackend {
     }
 }
 
-impl VhostUserBackendMut for VhostUserNetBackend {
+impl VhostUserBackendMut<VringRwLock<GuestMemoryAtomic<GuestMemoryMmap>>, AtomicBitmap>
-    type Bitmap = AtomicBitmap;
+    for VhostUserNetBackend
-    type Vring = VringRwLock<GuestMemoryAtomic<GuestMemoryMmap>>;
+{
-
     fn num_queues(&self) -> usize {
         self.num_queues
     }
@@ -204,7 +203,7 @@ impl VhostUserBackendMut for VhostUserNetBackend {
         _evset: EventSet,
         vrings: &[VringRwLock<GuestMemoryAtomic<GuestMemoryMmap>>],
         thread_id: usize,
-    ) -> VhostUserBackendResult<()> {
+    ) -> VhostUserBackendResult<bool> {
         let mut thread = self.threads[thread_id].lock().unwrap();
         match device_event {
             0 => {
@@ -246,7 +245,7 @@ impl VhostUserBackendMut for VhostUserNetBackend {
             _ => return Err(Error::HandleEventUnknownEvent.into()),
         }
 
-        Ok(())
+        Ok(false)
     }
 
     fn exit_event(&self, thread_index: usize) -> Option<EventFd> {

virtio-devices/Cargo.toml

@@ -8,31 +8,31 @@ edition = "2021"
 default = []
 
 [dependencies]
-anyhow = "1.0.79"
+anyhow = "1.0.75"
 arc-swap = "1.5.1"
 block = { path = "../block" }
 byteorder = "1.4.3"
 epoll = "4.3.3"
 event_monitor = { path = "../event_monitor" }
-libc = "0.2.153"
+libc = "0.2.147"
-log = "0.4.20"
+log = "0.4.17"
 net_gen = { path = "../net_gen" }
 net_util = { path = "../net_util" }
 pci = { path = "../pci" }
 rate_limiter = { path = "../rate_limiter" }
 seccompiler = "0.4.0"
-serde = { version = "1.0.196", features = ["derive"] }
+serde = { version = "1.0.168", features = ["derive"] }
-serde_json = "1.0.109"
+serde_json = "1.0.107"
 serial_buffer = { path = "../serial_buffer" }
-thiserror = "1.0.52"
+thiserror = "1.0.40"
-versionize = "0.2.0"
+versionize = "0.1.10"
-versionize_derive = "0.1.6"
+versionize_derive = "0.1.4"
-vhost = { version = "0.10.0", features = ["vhost-user-frontend", "vhost-user-backend", "vhost-kern", "vhost-vdpa"] }
+vhost = { version = "0.8.1", features = ["vhost-user-master", "vhost-user-slave", "vhost-kern", "vhost-vdpa"] }
 virtio-bindings = { version = "0.2.0", features = ["virtio-v5_0_0"] }
-virtio-queue = "0.11.0"
+virtio-queue = "0.9.0"
 vm-allocator = { path = "../vm-allocator" }
 vm-device = { path = "../vm-device" }
-vm-memory = { version = "0.14.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
+vm-memory = { version = "0.12.2", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
 vm-migration = { path = "../vm-migration" }
 vm-virtio = { path = "../vm-virtio" }
-vmm-sys-util = "0.12.1"
+vmm-sys-util = "0.11.0"

virtio-devices/src/block.rs

@@ -10,8 +10,9 @@
 
 use super::Error as DeviceError;
 use super::{
-    ActivateError, ActivateResult, EpollHelper, EpollHelperError, EpollHelperHandler, VirtioCommon,
+    ActivateError, ActivateResult, EpollHelper, EpollHelperError, EpollHelperHandler,
-    VirtioDevice, VirtioDeviceType, VirtioInterruptType, EPOLL_HELPER_EVENT_LAST,
+    RateLimiterConfig, VirtioCommon, VirtioDevice, VirtioDeviceType, VirtioInterruptType,
+    EPOLL_HELPER_EVENT_LAST,
 };
 use crate::seccomp_filters::Thread;
 use crate::thread_helper::spawn_virtio_thread;
@@ -22,10 +23,8 @@ use block::{
     async_io::AsyncIo, async_io::AsyncIoError, async_io::DiskFile, build_serial, Request,
     RequestType, VirtioBlockConfig,
 };
-use rate_limiter::group::{RateLimiterGroup, RateLimiterGroupHandle};
+use rate_limiter::{RateLimiter, TokenType};
-use rate_limiter::TokenType;
 use seccompiler::SeccompAction;
-use std::collections::BTreeMap;
 use std::collections::VecDeque;
 use std::io;
 use std::num::Wrapping;
@@ -132,10 +131,9 @@ struct BlockEpollHandler {
     counters: BlockCounters,
     queue_evt: EventFd,
     inflight_requests: VecDeque<(u16, Request)>,
-    rate_limiter: Option<RateLimiterGroupHandle>,
+    rate_limiter: Option<RateLimiter>,
     access_platform: Option<Arc<dyn AccessPlatform>>,
     read_only: bool,
-    host_cpus: Option<Vec<usize>>,
 }
 
 impl BlockEpollHandler {
@@ -410,41 +408,6 @@ impl BlockEpollHandler {
             })
     }
 
-    fn set_queue_thread_affinity(&self) {
-        // Prepare the CPU set the current queue thread is expected to run onto.
-        let cpuset = self.host_cpus.as_ref().map(|host_cpus| {
-            // SAFETY: all zeros is a valid pattern
-            let mut cpuset: libc::cpu_set_t = unsafe { std::mem::zeroed() };
-            // SAFETY: FFI call, trivially safe
-            unsafe { libc::CPU_ZERO(&mut cpuset) };
-            for host_cpu in host_cpus {
-                // SAFETY: FFI call, trivially safe
-                unsafe { libc::CPU_SET(*host_cpu, &mut cpuset) };
-            }
-            cpuset
-        });
-
-        // Schedule the thread to run on the expected CPU set
-        if let Some(cpuset) = cpuset.as_ref() {
-            // SAFETY: FFI call with correct arguments
-            let ret = unsafe {
-                libc::sched_setaffinity(
-                    0,
-                    std::mem::size_of::<libc::cpu_set_t>(),
-                    cpuset as *const libc::cpu_set_t,
-                )
-            };
-
-            if ret != 0 {
-                error!(
-                    "Failed scheduling the virtqueue thread {} on the expected CPU set: {}",
-                    self.queue_index,
-                    io::Error::last_os_error()
-                )
-            }
-        }
-    }
-
     fn run(
         &mut self,
         paused: Arc<AtomicBool>,
@@ -456,7 +419,6 @@ impl BlockEpollHandler {
         if let Some(rate_limiter) = &self.rate_limiter {
             helper.add_event(rate_limiter.as_raw_fd(), RATE_LIMITER_EVENT)?;
         }
-        self.set_queue_thread_affinity();
         helper.run(paused, paused_sync, self)?;
 
         Ok(())
@@ -545,11 +507,10 @@ pub struct Block {
     writeback: Arc<AtomicBool>,
     counters: BlockCounters,
     seccomp_action: SeccompAction,
-    rate_limiter: Option<Arc<RateLimiterGroup>>,
+    rate_limiter_config: Option<RateLimiterConfig>,
     exit_evt: EventFd,
     read_only: bool,
     serial: Vec<u8>,
-    queue_affinity: BTreeMap<u16, Vec<usize>>,
 }
 
 #[derive(Versionize)]
@@ -576,10 +537,9 @@ impl Block {
         queue_size: u16,
         serial: Option<String>,
         seccomp_action: SeccompAction,
-        rate_limiter: Option<Arc<RateLimiterGroup>>,
+        rate_limiter_config: Option<RateLimiterConfig>,
         exit_evt: EventFd,
         state: Option<BlockState>,
-        queue_affinity: BTreeMap<u16, Vec<usize>>,
     ) -> io::Result<Self> {
         let (disk_nsectors, avail_features, acked_features, config, paused) =
             if let Some(state) = state {
@@ -679,11 +639,10 @@ impl Block {
             writeback: Arc::new(AtomicBool::new(true)),
             counters: BlockCounters::default(),
             seccomp_action,
-            rate_limiter,
+            rate_limiter_config,
             exit_evt,
             read_only,
             serial,
-            queue_affinity,
         })
     }
 
@@ -787,10 +746,15 @@ impl VirtioDevice for Block {
             let (_, queue, queue_evt) = queues.remove(0);
             let queue_size = queue.size();
             let (kill_evt, pause_evt) = self.common.dup_eventfds();
-            let queue_idx = i as u16;
+
+            let rate_limiter: Option<RateLimiter> = self
+                .rate_limiter_config
+                .map(RateLimiterConfig::try_into)
+                .transpose()
+                .map_err(ActivateError::CreateRateLimiter)?;
 
             let mut handler = BlockEpollHandler {
-                queue_index: queue_idx,
+                queue_index: i as u16,
                 queue,
                 mem: mem.clone(),
                 disk_image: self
@@ -812,15 +776,9 @@ impl VirtioDevice for Block {
                 // This gives head room for systems with slower I/O without
                 // compromising the cost of the reallocation or memory overhead
                 inflight_requests: VecDeque::with_capacity(64),
-                rate_limiter: self
+                rate_limiter,
-                    .rate_limiter
-                    .as_ref()
-                    .map(|r| r.new_handle())
-                    .transpose()
-                    .unwrap(),
                 access_platform: self.common.access_platform.clone(),
                 read_only: self.read_only,
-                host_cpus: self.queue_affinity.get(&queue_idx).cloned(),
             };
 
             let paused = self.common.paused.clone();