build: Release v37.1 (bug fix release)

Signed-off-by: Bo Chen <chen.bo@intel.com>
tests: Run "test_live_upgrade_numa" on aarch64 only
2026-08-05 02:19:16 +00:00 · 2024-03-14 20:39:27 -07:00 · 2024-03-14 19:52:57 -07:00 · 2024-03-14 19:52:57 -07:00 · 2024-03-14 19:52:57 -07:00 · 2024-03-14 19:52:57 -07:00
232 changed files with 6422 additions and 14639 deletions
--- a/.github/workflows/audit.yaml
+++ b/.github/workflows/audit.yaml
@@ -11,6 +11,6 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/audit@v1
+      - uses: actions-rs/audit-check@v1
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -15,7 +15,7 @@ jobs:
          - stable
          - beta
          - nightly
-          - "1.77.0"
+          - "1.70"
        target:
          - x86_64-unknown-linux-gnu
          - x86_64-unknown-linux-musl
@@ -29,10 +29,11 @@ jobs:
        run: sudo apt install -y musl-tools

      - name: Install Rust toolchain (${{ matrix.rust }})
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions-rs/toolchain@v1
        with:
          toolchain: ${{ matrix.rust }}
          target: ${{ matrix.target }}
+          override: true

      - name: Build (default features)
        run: cargo rustc --locked --bin cloud-hypervisor -- -D warnings -D clippy::undocumented_unsafe_blocks
@@ -49,9 +50,6 @@ jobs:
      - name: Build (default features + guest_debug)
        run: cargo rustc --locked --bin cloud-hypervisor --features "guest_debug" -- -D warnings -D clippy::undocumented_unsafe_blocks

-      - name: Build (default features + pvmemcontrol)
-        run: cargo rustc --locked --bin cloud-hypervisor --features "pvmemcontrol" -- -D warnings -D clippy::undocumented_unsafe_blocks
-
      - name: Build (mshv)
        run: cargo rustc --locked --bin cloud-hypervisor --no-default-features --features "mshv"  -- -D warnings -D clippy::undocumented_unsafe_blocks

--- a/.github/workflows/docker-image.yaml
+++ b/.github/workflows/docker-image.yaml
@@ -41,7 +41,7 @@ jobs:
          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
          # generate Docker tags based on the following events/attributes
          tags: |
-            type=raw,value=20240507-0
+            type=raw,value={{date 'YYYYMMDD'}}-0
            type=sha

      - name: Build and push
--- a/.github/workflows/fuzz-build.yaml
+++ b/.github/workflows/fuzz-build.yaml
@@ -14,19 +14,18 @@ jobs:
          - nightly
        target:
          - x86_64-unknown-linux-gnu
-    env:
-      RUSTFLAGS: -D warnings
    steps:
      - name: Code checkout
        uses: actions/checkout@v4
      - name: Install Rust toolchain (${{ matrix.rust }})
-        uses: dtolnay/rust-toolchain@stable
+        uses: actions-rs/toolchain@v1
        with:
            toolchain: ${{ matrix.rust }}
            target: ${{ matrix.target }}
+            override: true
      - name: Install Cargo fuzz
-        run: cargo install cargo-fuzz
-      - name: Fuzz Build
+        # Temporary fix for cargo-fuzz on latest nightly: https://github.com/rust-fuzz/cargo-fuzz/issues/276
+        #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
--- a/.github/workflows/quality.yaml
+++ b/.github/workflows/quality.yaml
@@ -80,13 +80,6 @@ jobs:
          command: clippy
          args: --target=${{ matrix.target }} --locked --all --all-targets --tests --examples --features "guest_debug" -- -D warnings -D clippy::undocumented_unsafe_blocks

-      - name: Clippy (default features + pvmemcontrol)
-        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 --tests --examples --features "pvmemcontrol" -- -D warnings -D clippy::undocumented_unsafe_blocks
-
      - name: Clippy (default features + tracing)
        uses: actions-rs/cargo@v1
        with:
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -3,67 +3,135 @@ on: [create, merge_group]
 concurrency:
  group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }}
  cancel-in-progress: true
-env:
-  GITHUB_TOKEN: ${{ github.token }}

 jobs:
  release:
    if: (github.event_name == 'create' && github.event.ref_type == 'tag') || github.event_name == 'merge_group'
-    name: Release ${{ matrix.platform.target }}
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-        - target: x86_64-unknown-linux-gnu
-          args: --all --release --features mshv
-          name_ch: cloud-hypervisor
-          name_ch_remote: ch-remote
-        - target: x86_64-unknown-linux-musl
-          args: --all --release --features mshv
-          name_ch: cloud-hypervisor-static
-          name_ch_remote: ch-remote-static
-        - target: aarch64-unknown-linux-musl
-          args:  --all --release
-          name_ch: cloud-hypervisor-static-aarch64
-          name_ch_remote: ch-remote-static-aarch64
+    name: Release
    runs-on: ubuntu-latest
    steps:
      - name: Code checkout
        uses: actions/checkout@v4
      - name: Install musl-gcc
-        if: contains(matrix.platform.target, 'musl')
        run: sudo apt install -y musl-tools
      - name: Create release directory
-        if: |
-          github.event_name == 'create' && github.event.ref_type == 'tag' &&
-          matrix.platform.target == 'x86_64-unknown-linux-gnu'
        run: rsync -rv --exclude=.git . ../cloud-hypervisor-${{ github.event.ref }}
-      - name: Build ${{ matrix.platform.target }}
-        uses: houseabsolute/actions-rust-cross@v0
+      - name: Install Rust toolchain (x86_64-unknown-linux-gnu)
+        uses: actions-rs/toolchain@v1
        with:
+          toolchain: "1.70"
+          target: x86_64-unknown-linux-gnu
+      - name: Install Rust toolchain (x86_64-unknown-linux-musl)
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: "1.70"
+          target: x86_64-unknown-linux-musl
+      - name: Build
+        uses: actions-rs/cargo@v1
+        with:
+          toolchain: "1.70"
          command: build
-          target: ${{ matrix.platform.target }}
-          args: ${{ matrix.platform.args  }}
-          strip: true
-          toolchain: "1.77.0"
-      - name: Copy Release Binaries
-        if: github.event_name == 'create' && github.event.ref_type == 'tag'
-        shell: bash
-        run: |
-          cp target/${{ matrix.platform.target }}/release/cloud-hypervisor ./${{ matrix.platform.name_ch }}
-          cp target/${{ matrix.platform.target }}/release/ch-remote ./${{ matrix.platform.name_ch_remote }}
-      - name: Upload Release Artifacts
-        if: github.event_name == 'create' && github.event.ref_type == 'tag'
-        uses: actions/upload-artifact@v3
+          args: --all --release --features mshv --target=x86_64-unknown-linux-gnu
+      - name: Static Build
+        uses: actions-rs/cargo@v1
        with:
-          name: Artifacts for ${{ matrix.platform.target }}
-          path: |
-            ./${{ matrix.platform.name_ch }}
-            ./${{ matrix.platform.name_ch_remote }}
+          toolchain: "1.70"
+          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"
+          target: aarch64-unknown-linux-musl
+          override: true
+      - name: Create Release
+        if: github.event_name == 'create' && github.event.ref_type == 'tag'
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          draft: true
+          prerelease: true
+      - name: Upload cloud-hypervisor
+        if: github.event_name == 'create' && github.event.ref_type == 'tag'
+        id: upload-release-cloud-hypervisor
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: target/x86_64-unknown-linux-gnu/release/cloud-hypervisor
+          asset_name: cloud-hypervisor
+          asset_content_type: application/octet-stream
+      - name: Upload static cloud-hypervisor
+        if: github.event_name == 'create' && github.event.ref_type == 'tag'
+        id: upload-release-static-cloud-hypervisor
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: target/x86_64-unknown-linux-musl/release/cloud-hypervisor
+          asset_name: cloud-hypervisor-static
+          asset_content_type: application/octet-stream
+      - name: Upload ch-remote
+        if: github.event_name == 'create' && github.event.ref_type == 'tag'
+        id: upload-release-ch-remote
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: target/x86_64-unknown-linux-gnu/release/ch-remote
+          asset_name: ch-remote
+          asset_content_type: application/octet-stream
+      - name: Upload static-ch-remote
+        if: github.event_name == 'create' && github.event.ref_type == 'tag'
+        id: upload-release-static-ch-remote
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: target/x86_64-unknown-linux-musl/release/ch-remote
+          asset_name: ch-remote-static
+          asset_content_type: application/octet-stream
+      - name: Clean build tree ahead of cross build
+        uses: actions-rs/cargo@v1
+        with:
+          command: clean
+      - name: Static Build (AArch64)
+        uses: actions-rs/cargo@v1
+        with:
+          use-cross: true
+          command: build
+          args: --all --release --target=aarch64-unknown-linux-musl
+      - name: Upload static AArch64 cloud-hypervisor
+        if: github.event_name == 'create' && github.event.ref_type == 'tag'
+        id: upload-release-static-aarch64-cloud-hypervisor
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: target/aarch64-unknown-linux-musl/release/cloud-hypervisor
+          asset_name: cloud-hypervisor-static-aarch64
+          asset_content_type: application/octet-stream
+      - name: Upload static AArch64 ch-remote
+        if: github.event_name == 'create' && github.event.ref_type == 'tag'
+        id: upload-release-static-aarch64-ch-remote
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: target/aarch64-unknown-linux-musl/release/ch-remote
+          asset_name: ch-remote-static-aarch64
+          asset_content_type: application/octet-stream
      - name: Vendor
-        if: |
-          github.event_name == 'create' && github.event.ref_type == 'tag' &&
-          matrix.platform.target == 'x86_64-unknown-linux-gnu'
        working-directory: ../cloud-hypervisor-${{ github.event.ref }}
        run: |
          mkdir ../vendor-cargo-home
@@ -71,25 +139,16 @@ jobs:
          mkdir .cargo
          cargo vendor > .cargo/config.toml
      - name: Create vendored source archive
-        if: |
-          github.event_name == 'create' && github.event.ref_type == 'tag' &&
-          matrix.platform.target == 'x86_64-unknown-linux-gnu'
-        run: tar cJf cloud-hypervisor-${{ github.event.ref }}.tar.xz ../cloud-hypervisor-${{ github.event.ref }}
+        working-directory: ../
+        run: tar cJf cloud-hypervisor-${{ github.event.ref }}.tar.xz cloud-hypervisor-${{ github.event.ref }}
      - name: Upload cloud-hypervisor vendored source archive
-        if: |
-          github.event_name == 'create' && github.event.ref_type == 'tag' &&
-          matrix.platform.target == 'x86_64-unknown-linux-gnu'
-        id: upload-release-cloud-hypervisor-vendored-sources
-        uses: actions/upload-artifact@v3
-        with:
-          path: cloud-hypervisor-${{ github.event.ref }}.tar.xz
-          name: cloud-hypervisor-${{ github.event.ref }}.tar.xz
-      - name: Create GitHub Release
        if: github.event_name == 'create' && github.event.ref_type == 'tag'
-        uses: softprops/action-gh-release@v1
+        id: upload-release-cloud-hypervisor-vendored-sources
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
-          draft: true
-          files: |
-            ./${{ matrix.platform.name_ch }}
-            ./${{ matrix.platform.name_ch_remote }}
-            ./cloud-hypervisor-${{ github.event.ref }}.tar.xz
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ../cloud-hypervisor-${{ github.event.ref }}.tar.xz
+          asset_name: cloud-hypervisor-${{ github.event.ref }}.tar.xz
+          asset_content_type: application/x-xz
--- a/.github/workflows/reuse.yaml
+++ b/.github/workflows/reuse.yaml
@@ -1,12 +0,0 @@
-name: REUSE Compliance Check
-
-on: [push, pull_request]
-
-jobs:
-  reuse:
-    name: REUSE Compliance Check
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: REUSE Compliance Check
-      uses: fsfe/reuse-action@v3
--- a/.github/workflows/shlint.yaml
+++ b/.github/workflows/shlint.yaml
@@ -1,20 +0,0 @@
-name: Shell scripts check
-on:
-  pull_request:
-  merge_group:
-  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
--- a/.github/workflows/taplo.yaml
+++ b/.github/workflows/taplo.yaml
@@ -1,21 +0,0 @@
-name: Cargo.toml Formatting (taplo)
-on:
-  pull_request:
-    paths: 
-      - '**/Cargo.toml'
-
-jobs:
-  cargo_toml_format:
-    name: Cargo.toml Formatting
-    runs-on: ubuntu-latest
-    steps:
-      - name: Code checkout
-        uses: actions/checkout@v4
-      - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
-      - name: Install build dependencies
-        run: sudo apt-get update && sudo apt-get -yqq install build-essential libssl-dev
-      - name: Install taplo
-        run: cargo install taplo-cli --locked
-      - name: Check formatting
-        run: taplo fmt --check
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,3 @@
 **/rusty-tags.vi
 /rpm/SOURCES
 /.vscode
-/vendor
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -1,12 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: cloud-hypervisor
-Upstream-Contact:  <>
-Source: https://www.cloudhypervisor.org
-
-Files: docs/*.md *.md
-Copyright: 2024
-License: CC-BY-4.0
-
-Files: scripts/* test_data/* *.toml .git* fuzz/Cargo.lock fuzz/.gitignore resources/linux-config-* vmm/src/api/openapi/cloud-hypervisor.yaml CODEOWNERS Cargo.lock
-Copyright: 2024
-License: Apache-2.0
--- a/.taplo.toml
+++ b/.taplo.toml
@@ -1,5 +0,0 @@
-include = ["**/Cargo.toml"]
-
-[formatting]
-reorder_arrays = true
-reorder_keys = true
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -112,5 +112,5 @@ Fixes #88
 Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
 ```

-Then, after the corresponding PR is merged, GitHub will automatically close that issue when parsing the
+Then, after the corresponding PR is merged, Github will automatically close that issue when parsing the
 [commit message](https://help.github.com/articles/closing-issues-via-commit-messages/).
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
-authors = ["The Cloud Hypervisor Authors"]
-build = "build.rs"
-default-run = "cloud-hypervisor"
-description = "Open source Virtual Machine Monitor (VMM) that runs on top of KVM & MSHV"
-edition = "2021"
-homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor"
-license = "Apache-2.0 AND BSD-3-Clause"
 name = "cloud-hypervisor"
-version = "41.0.0"
+version = "37.1.0"
+authors = ["The Cloud Hypervisor Authors"]
+edition = "2021"
+default-run = "cloud-hypervisor"
+build = "build.rs"
+license = "LICENSE-APACHE & LICENSE-BSD-3-Clause"
+description = "Open source Virtual Machine Monitor (VMM) that runs on top of KVM"
+homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor"
 # Minimum buildable version:
 # Keep in sync with version in .github/workflows/build.yaml
 # Policy on MSRV (see #4318):
@@ -15,88 +15,92 @@ version = "41.0.0"
 # 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.77.0"
+rust-version = "1.70"

 [profile.release]
-codegen-units = 1
 lto = true
+codegen-units = 1
 opt-level = "s"
 strip = true

 [profile.profiling]
-debug = true
 inherits = "release"
 strip = false
+debug = true

 [dependencies]
-anyhow = "1.0.86"
+anyhow = "1.0.75"
 api_client = { path = "api_client" }
-clap = { version = "4.5.4", features = ["string"] }
-dhat = { version = "0.3.3", optional = true }
+clap = { version = "4.4.7", features = ["string"] }
+dhat = { version = "0.3.2", optional = true }
 epoll = "4.3.3"
 event_monitor = { path = "event_monitor" }
 hypervisor = { path = "hypervisor" }
-libc = "0.2.155"
-log = { version = "0.4.22", features = ["std"] }
+libc = "0.2.147"
+log = { version = "0.4.20", features = ["std"] }
 option_parser = { path = "option_parser" }
 seccompiler = "0.4.0"
-serde_json = "1.0.120"
+serde_json = "1.0.107"
 signal-hook = "0.3.17"
-thiserror = "1.0.62"
-tpm = { path = "tpm" }
+thiserror = "1.0.40"
+tpm = { path = "tpm"}
 tracer = { path = "tracer" }
-vm-memory = "0.14.1"
 vmm = { path = "vmm" }
 vmm-sys-util = "0.12.1"
-zbus = { version = "4.1.2", optional = true }
+vm-memory = "0.14.0"
+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-live-upgrade-stable-37.x" }
+versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch-0.1.6" }

 [dev-dependencies]
-dirs = "5.0.1"
+dirs = "5.0.0"
 net_util = { path = "net_util" }
-once_cell = "1.19.0"
-serde_json = "1.0.120"
+once_cell = "1.18.0"
+serde_json = "1.0.107"
 test_infra = { path = "test_infra" }
 wait-timeout = "0.2.0"

 # Please adjust `vmm::feature_list()` accordingly when changing the
 # feature list below
 [features]
-dbus_api = ["vmm/dbus_api", "zbus"]
-default = ["io_uring", "kvm"]
-dhat-heap = ["dhat", "vmm/dhat-heap"]       # For heap profiling
+default = ["kvm", "io_uring"]
+dbus_api = ["zbus", "vmm/dbus_api"]
+dhat-heap = ["dhat"] # For heap profiling
 guest_debug = ["vmm/guest_debug"]
-igvm = ["mshv", "vmm/igvm"]
+igvm = ["vmm/igvm", "mshv"]
 io_uring = ["vmm/io_uring"]
 kvm = ["vmm/kvm"]
 mshv = ["vmm/mshv"]
-pvmemcontrol = ["vmm/pvmemcontrol"]
-sev_snp = ["igvm", "mshv", "vmm/sev_snp"]
+sev_snp = ["igvm", "vmm/sev_snp", "mshv"]
 tdx = ["vmm/tdx"]
-tracing = ["tracer/tracing", "vmm/tracing"]
+tracing = ["vmm/tracing", "tracer/tracing"]

 [workspace]
 members = [
-  "api_client",
-  "arch",
-  "block",
-  "devices",
-  "event_monitor",
-  "hypervisor",
-  "net_gen",
-  "net_util",
-  "option_parser",
-  "pci",
-  "performance-metrics",
-  "rate_limiter",
-  "serial_buffer",
-  "test_infra",
-  "tracer",
-  "vhost_user_block",
-  "vhost_user_net",
-  "virtio-devices",
-  "vm-allocator",
-  "vm-device",
-  "vm-migration",
-  "vm-virtio",
-  "vmm",
+    "api_client",
+    "arch",
+    "block",
+    "devices",
+    "event_monitor",
+    "hypervisor",
+    "net_gen",
+    "net_util",
+    "option_parser",
+    "pci",
+    "performance-metrics",
+    "rate_limiter",
+    "serial_buffer",
+    "test_infra",
+    "tracer",
+    "vhost_user_block",
+    "vhost_user_net",
+    "virtio-devices",
+    "vmm",
+    "vm-allocator",
+    "vm-device",
+    "vm-migration",
+    "vm-virtio"
 ]
--- a/LICENSES/Apache-2.0.txt
+++ b/LICENSES/Apache-2.0.txt
--- a/LICENSES/BSD-3-Clause.txt
+++ b/LICENSES/BSD-3-Clause.txt
--- a/README.md
+++ b/README.md
@@ -108,7 +108,7 @@ do not wish to use the pre-built binaries.
 ## Booting Linux

 Cloud Hypervisor supports direct kernel boot (the x86-64 kernel requires the kernel
-built with PVH support or a bzImage) or booting via a firmware (either [Rust Hypervisor
+built with PVH support) or booting via a firmware (either [Rust Hypervisor
 Firmware](https://github.com/cloud-hypervisor/rust-hypervisor-firmware) or an
 edk2 UEFI firmware called `CLOUDHV` / `CLOUDHV_EFI`.)

@@ -175,7 +175,7 @@ $ ./cloud-hypervisor \

 #### Building your Kernel

-Cloud Hypervisor also supports direct kernel boot. For x86-64, a `vmlinux` ELF kernel (compiled with PVH support) or a regular bzImage are supported. In order to support development there is a custom branch; however provided the required options are enabled any recent kernel will suffice.
+Cloud Hypervisor also supports direct kernel boot. For x86-64, a `vmlinux` ELF kernel (compiled with PVH support) is needed. In order to support development there is a custom branch; however provided the required options are enabled any recent kernel will suffice.

 To build the kernel:

--- a/api_client/Cargo.toml
+++ b/api_client/Cargo.toml
@@ -1,9 +1,8 @@
 [package]
-authors = ["The Cloud Hypervisor Authors"]
-edition = "2021"
 name = "api_client"
 version = "0.1.0"
+authors = ["The Cloud Hypervisor Authors"]
+edition = "2021"

 [dependencies]
-thiserror = "1.0.62"
 vmm-sys-util = "0.12.1"
--- a/api_client/src/lib.rs
+++ b/api_client/src/lib.rs
@@ -3,27 +3,41 @@
 // SPDX-License-Identifier: Apache-2.0
 //

+use std::fmt;
 use std::io::{Read, Write};
 use std::os::unix::io::RawFd;
-use thiserror::Error;
 use vmm_sys_util::sock_ctrl_msg::ScmSocket;

-#[derive(Debug, Error)]
+#[derive(Debug)]
 pub enum Error {
-    #[error("Error writing to or reading from HTTP socket: {0}")]
    Socket(std::io::Error),
-    #[error("Error sending file descriptors: {0}")]
    SocketSendFds(vmm_sys_util::errno::Error),
-    #[error("Error parsing HTTP status code: {0}")]
    StatusCodeParsing(std::num::ParseIntError),
-    #[error("HTTP output is missing protocol statement")]
    MissingProtocol,
-    #[error("Error parsing HTTP Content-Length field: {0}")]
    ContentLengthParsing(std::num::ParseIntError),
-    #[error("Server responded with an error: {0:?}")]
    ServerResponse(StatusCode, Option<String>),
 }

+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        use Error::*;
+        match self {
+            Socket(e) => write!(f, "Error writing to or reading from HTTP socket: {e}"),
+            SocketSendFds(e) => write!(f, "Error writing to or reading from HTTP socket: {e}"),
+            StatusCodeParsing(e) => write!(f, "Error parsing HTTP status code: {e}"),
+            MissingProtocol => write!(f, "HTTP output is missing protocol statement"),
+            ContentLengthParsing(e) => write!(f, "Error parsing HTTP Content-Length field: {e}"),
+            ServerResponse(s, o) => {
+                if let Some(o) = o {
+                    write!(f, "Server responded with an error: {s:?}: {o}")
+                } else {
+                    write!(f, "Server responded with an error: {s:?}")
+                }
+            }
+        }
+    }
+}
+
 #[derive(Clone, Copy, Debug)]
 pub enum StatusCode {
    Continue,
--- a/arch/Cargo.toml
+++ b/arch/Cargo.toml
@@ -1,32 +1,30 @@
 [package]
-authors = ["The Chromium OS Authors"]
-edition = "2021"
 name = "arch"
 version = "0.1.0"
+authors = ["The Chromium OS Authors"]
+edition = "2021"

 [features]
 default = []
-kvm = []
 sev_snp = []
 tdx = []

 [dependencies]
-anyhow = "1.0.86"
-byteorder = "1.5.0"
+anyhow = "1.0.75"
+byteorder = "1.4.3"
 hypervisor = { path = "../hypervisor" }
-libc = "0.2.155"
-linux-loader = { version = "0.11.0", features = ["bzimage", "elf", "pe"] }
-log = "0.4.22"
-serde = { version = "1.0.197", features = ["derive", "rc"] }
-thiserror = "1.0.62"
-uuid = "1.8.0"
-vm-memory = { version = "0.14.1", features = [
-  "backend-bitmap",
-  "backend-mmap",
-] }
+libc = "0.2.147"
+linux-loader = { version = "0.11.0", features = ["elf", "bzimage", "pe"] }
+log = "0.4.20"
+serde = { version = "1.0.168", features = ["rc", "derive"] }
+thiserror = "1.0.40"
+uuid = "1.3.4"
+versionize = "0.2.0"
+versionize_derive = "0.1.6"
+vm-memory = { version = "0.14.0", features = ["backend-mmap", "backend-bitmap"] }
 vm-migration = { path = "../vm-migration" }
 vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }

 [target.'cfg(target_arch = "aarch64")'.dependencies]
-fdt_parser = { version = "0.1.5", package = "fdt" }
+fdt_parser = { version = "0.1.4", package = "fdt" }
 vm-fdt = { git = "https://github.com/rust-vmm/vm-fdt", branch = "main" }
--- a/arch/src/aarch64/fdt.rs
+++ b/arch/src/aarch64/fdt.rs
@@ -26,7 +26,6 @@ use super::layout::{
 };
 use std::fs;
 use std::path::Path;
-use thiserror::Error;
 use vm_fdt::{FdtWriter, FdtWriterResult};
 use vm_memory::{Address, Bytes, GuestMemory, GuestMemoryError, GuestMemoryRegion};

@@ -81,10 +80,9 @@ pub trait DeviceInfoForFdt {
 }

 /// Errors thrown while configuring the Flattened Device Tree for aarch64.
-#[derive(Debug, Error)]
+#[derive(Debug)]
 pub enum Error {
    /// Failure in writing FDT in memory.
-    #[error("Failure in writing FDT in memory: {0}")]
    WriteFdtToMemory(GuestMemoryError),
 }
 type Result<T> = result::Result<T, Error>;
@@ -525,7 +523,7 @@ fn create_memory_node(
                let memory_region_size: u64 = memory_region.size() as u64;
                mem_reg_prop.push(memory_region_start_addr);
                mem_reg_prop.push(memory_region_size);
-                // Set the node address the first non-zero region address
+                // Set the node address the first non-zero regison address
                if node_memory_addr == 0 {
                    node_memory_addr = memory_region_start_addr;
                }
@@ -571,7 +569,7 @@ fn create_memory_node(

        if ram_regions.len() > 2 {
            panic!(
-                "There should be up to two non-continuous regions, divided by the
+                "There should be up to two non-continuous regions, devidided by the
                    gap at the end of 32bit address space."
            );
        }
@@ -896,7 +894,7 @@ fn create_pci_nodes(
    for pci_device_info_elem in pci_device_info.iter() {
        // EDK2 requires the PCIe high space above 4G address.
        // The actual space in CLH follows the RAM. If the RAM space is small, the PCIe high space
-        // could fall below 4G.
+        // could fall bellow 4G.
        // Here we cut off PCI device space below 8G in FDT to workaround the EDK2 check.
        // But the address written in ACPI is not impacted.
        let (pci_device_base_64bit, pci_device_size_64bit) =
--- a/arch/src/aarch64/layout.rs
+++ b/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
--- a/arch/src/aarch64/mod.rs
+++ b/arch/src/aarch64/mod.rs
@@ -16,42 +16,35 @@ use crate::{DeviceType, GuestMemoryMmap, NumaNodes, PciSpaceInfo, RegionType};
 use hypervisor::arch::aarch64::gic::Vgic;
 use log::{log_enabled, Level};
 use std::collections::HashMap;
+use std::convert::TryInto;
 use std::fmt::Debug;
 use std::sync::{Arc, Mutex};
-use thiserror::Error;
 use vm_memory::{Address, GuestAddress, GuestMemory, GuestMemoryAtomic};

 pub const _NSIG: i32 = 65;

 /// Errors thrown while configuring aarch64 system.
-#[derive(Debug, Error)]
+#[derive(Debug)]
 pub enum Error {
    /// Failed to create a FDT.
-    #[error("Failed to create a FDT")]
    SetupFdt,

    /// Failed to write FDT to memory.
-    #[error("Failed to write FDT to memory: {0}")]
    WriteFdtToMemory(fdt::Error),

    /// Failed to create a GIC.
-    #[error("Failed to create a GIC")]
    SetupGic,

    /// Failed to compute the initramfs address.
-    #[error("Failed to compute the initramfs address")]
    InitramfsAddress,

    /// Error configuring the general purpose registers
-    #[error("Error configuring the general purpose registers: {0}")]
    RegsConfiguration(hypervisor::HypervisorCpuError),

    /// Error configuring the MPIDR register
-    #[error("Error configuring the MPIDR register: {0}")]
    VcpuRegMpidr(hypervisor::HypervisorCpuError),

    /// Error initializing PMU for vcpu
-    #[error("Error initializing PMU for vcpu")]
    VcpuInitPmu,
 }

--- a/arch/src/aarch64/uefi.rs
+++ b/arch/src/aarch64/uefi.rs
@@ -1,27 +1,20 @@
 // Copyright 2020 Arm Limited (or its affiliates). All rights reserved.
-//
-// SPDX-License-Identifier: Apache-2.0

 use std::io::{Read, Seek, SeekFrom};
 use std::os::fd::AsFd;
 use std::result;
-use thiserror::Error;
 use vm_memory::{GuestAddress, GuestMemory};

 /// Errors thrown while loading UEFI binary
-#[derive(Debug, Error)]
+#[derive(Debug)]
 pub enum Error {
    /// Unable to seek to UEFI image start.
-    #[error("Unable to seek to UEFI image start")]
    SeekUefiStart,
    /// Unable to seek to UEFI image end.
-    #[error("Unable to seek to UEFI image end")]
    SeekUefiEnd,
    /// UEFI image too big.
-    #[error("UEFI image too big")]
    UefiTooBig,
    /// Unable to read UEFI image
-    #[error("Unable to read UEFI image")]
    ReadUefiImage,
 }
 type Result<T> = result::Result<T, Error>;
--- a/arch/src/lib.rs
+++ b/arch/src/lib.rs
@@ -18,6 +18,9 @@ use std::fmt;
 use std::result;
 use std::sync::Arc;
 use thiserror::Error;
+use versionize::{VersionMap, Versionize, VersionizeError, VersionizeResult};
+use versionize_derive::Versionize;
+use vm_migration::VersionMapped;

 type GuestMemoryMmap = vm_memory::GuestMemoryMmap<vm_memory::bitmap::AtomicBitmap>;
 type GuestRegionMmap = vm_memory::GuestRegionMmap<vm_memory::bitmap::AtomicBitmap>;
@@ -45,17 +48,13 @@ pub enum Error {
    ModlistSetup(#[source] vm_memory::GuestMemoryError),
    #[error("RSDP extends past the end of guest memory")]
    RsdpPastRamEnd,
-    #[error("Failed to setup Zero Page for bzImage")]
-    ZeroPageSetup(#[source] vm_memory::GuestMemoryError),
-    #[error("Zero Page for bzImage past RAM end")]
-    ZeroPagePastRamEnd,
 }

 /// Type for returning public functions outcome.
 pub type Result<T> = result::Result<T, Error>;

 /// Type for memory region types.
-#[derive(Clone, Copy, PartialEq, Eq, Debug, Serialize, Deserialize)]
+#[derive(Clone, Copy, PartialEq, Eq, Debug, Serialize, Deserialize, Versionize)]
 pub enum RegionType {
    /// RAM type
    Ram,
@@ -73,6 +72,8 @@ pub enum RegionType {
    Reserved,
 }

+impl VersionMapped for RegionType {}
+
 /// Module for aarch64 related functionality.
 #[cfg(target_arch = "aarch64")]
 pub mod aarch64;
--- a/arch/src/x86_64/mod.rs
+++ b/arch/src/x86_64/mod.rs
@@ -17,13 +17,11 @@ 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, setup_header};
 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 thiserror::Error;
 use vm_memory::{
    Address, Bytes, GuestAddress, GuestAddressSpace, GuestMemory, GuestMemoryAtomic,
    GuestMemoryRegion, GuestUsize,
@@ -34,7 +32,6 @@ use std::arch::x86_64;
 pub mod tdx;

 // CPUID feature bits
-#[cfg(feature = "kvm")]
 const TSC_DEADLINE_TIMER_ECX_BIT: u8 = 24; // tsc deadline timer ecx bit.
 const HYPERVISOR_ECX_BIT: u8 = 31; // Hypervisor ecx bit.
 const MTRR_EDX_BIT: u8 = 12; // Hypervisor ecx bit.
@@ -66,8 +63,6 @@ pub const _NSIG: i32 = 65;
 pub struct EntryPoint {
    /// Address in guest memory where the guest must start execution
    pub entry_addr: GuestAddress,
-    /// This field is used for bzImage to fill the zero page
-    pub setup_header: Option<setup_header>,
 }

 const E820_RAM: u32 = 1;
@@ -129,84 +124,62 @@ pub struct CpuidConfig {
    pub amx: bool,
 }

-#[derive(Debug, Error)]
+#[derive(Debug)]
 pub enum Error {
    /// Error writing MP table to memory.
-    #[error("Error writing MP table to memory: {0}")]
    MpTableSetup(mptable::Error),

    /// Error configuring the general purpose registers
-    #[error("Error configuring the general purpose registers: {0}")]
    RegsConfiguration(regs::Error),

    /// Error configuring the special registers
-    #[error("Error configuring the special registers: {0}")]
    SregsConfiguration(regs::Error),

    /// Error configuring the floating point related registers
-    #[error("Error configuring the floating point related registers: {0}")]
    FpuConfiguration(regs::Error),

    /// Error configuring the MSR registers
-    #[error("Error configuring the MSR registers: {0}")]
    MsrsConfiguration(regs::Error),

    /// Failed to set supported CPUs.
-    #[error("Failed to set supported CPUs: {0}")]
    SetSupportedCpusFailed(anyhow::Error),

    /// Cannot set the local interruption due to bad configuration.
-    #[error("Cannot set the local interruption due to bad configuration: {0}")]
    LocalIntConfiguration(anyhow::Error),

    /// Error setting up SMBIOS table
-    #[error("Error setting up SMBIOS table: {0}")]
    SmbiosSetup(smbios::Error),

    /// Could not find any SGX EPC section
-    #[error("Could not find any SGX EPC section")]
    NoSgxEpcSection,

    /// Missing SGX CPU feature
-    #[error("Missing SGX CPU feature")]
    MissingSgxFeature,

    /// Missing SGX_LC CPU feature
-    #[error("Missing SGX_LC CPU feature")]
    MissingSgxLaunchControlFeature,

    /// Error getting supported CPUID through the hypervisor (kvm/mshv) API
-    #[error("Error getting supported CPUID through the hypervisor API: {0}")]
    CpuidGetSupported(HypervisorError),

    /// Error populating CPUID with KVM HyperV emulation details
-    #[error("Error populating CPUID with KVM HyperV emulation details: {0}")]
    CpuidKvmHyperV(vmm_sys_util::fam::Error),

    /// Error populating CPUID with CPU identification
-    #[error("Error populating CPUID with CPU identification: {0}")]
    CpuidIdentification(vmm_sys_util::fam::Error),

    /// Error checking CPUID compatibility
-    #[error("Error checking CPUID compatibility")]
    CpuidCheckCompatibility,

    // Error writing EBDA address
-    #[error("Error writing EBDA address: {0}")]
    EbdaSetup(vm_memory::GuestMemoryError),

    // Error getting CPU TSC frequency
-    #[error("Error getting CPU TSC frequency: {0}")]
    GetTscFrequency(HypervisorCpuError),

    /// Error retrieving TDX capabilities through the hypervisor (kvm/mshv) API
    #[cfg(feature = "tdx")]
-    #[error("Error retrieving TDX capabilities through the hypervisor API: {0}")]
    TdxCapabilities(HypervisorError),
-
-    /// Failed to configure E820 map for bzImage
-    #[error("Failed to configure E820 map for bzImage")]
-    E820Configuration,
 }

 impl From<Error> for super::Error {
@@ -578,7 +551,7 @@ impl CpuidFeatureEntry {
            if !entry_compatible {
                error!(
                    "Detected incompatible CPUID entry: leaf={:#02x} (subleaf={:#02x}), register='{:?}', \
-                    compatible_check='{:?}', source VM feature='{:#04x}', destination VM feature'{:#04x}'.",
+                    compatilbe_check='{:?}', source VM feature='{:#04x}', destination VM feature'{:#04x}'.",
                    entry.function, entry.index, entry.feature_reg,
                    entry.compatible_check, src_vm_feature, dest_vm_feature
                    );
@@ -620,8 +593,17 @@ pub fn generate_common_cpuid(
        "Generating guest CPUID for with physical address size: {}",
        config.phys_bits
    );
-    #[allow(unused_mut)]
-    let mut cpuid_patches = vec![
+    let cpuid_patches = vec![
+        // Patch tsc deadline timer bit
+        CpuidPatch {
+            function: 1,
+            index: 0,
+            flags_bit: None,
+            eax_bit: None,
+            ebx_bit: None,
+            ecx_bit: Some(TSC_DEADLINE_TIMER_ECX_BIT),
+            edx_bit: None,
+        },
        // Patch hypervisor bit
        CpuidPatch {
            function: 1,
@@ -644,23 +626,6 @@ pub fn generate_common_cpuid(
        },
    ];

-    #[cfg(feature = "kvm")]
-    if matches!(
-        hypervisor.hypervisor_type(),
-        hypervisor::HypervisorType::Kvm
-    ) {
-        // Patch tsc deadline timer bit
-        cpuid_patches.push(CpuidPatch {
-            function: 1,
-            index: 0,
-            flags_bit: None,
-            eax_bit: None,
-            ebx_bit: None,
-            ecx_bit: Some(TSC_DEADLINE_TIMER_ECX_BIT),
-            edx_bit: None,
-        });
-    }
-
    // Supported CPUID
    let mut cpuid = hypervisor
        .get_supported_cpuid()
@@ -711,20 +676,6 @@ pub fn generate_common_cpuid(
                    }
                }
            }
-            // Copy host L1 cache details if not populated by KVM
-            0x8000_0005 => {
-                if entry.eax == 0 && entry.ebx == 0 && entry.ecx == 0 && entry.edx == 0 {
-                    // SAFETY: cpuid called with valid leaves
-                    if unsafe { std::arch::x86_64::__cpuid(0x8000_0000).eax } >= 0x8000_0005 {
-                        // SAFETY: cpuid called with valid leaves
-                        let leaf = unsafe { std::arch::x86_64::__cpuid(0x8000_0005) };
-                        entry.eax = leaf.eax;
-                        entry.ebx = leaf.ebx;
-                        entry.ecx = leaf.ecx;
-                        entry.edx = leaf.edx;
-                    }
-                }
-            }
            // Copy host L2 cache details if not populated by KVM
            0x8000_0006 => {
                if entry.eax == 0 && entry.ebx == 0 && entry.ecx == 0 && entry.edx == 0 {
@@ -843,17 +794,12 @@ pub fn configure_vcpu(
        CpuidPatch::set_cpuid_reg(&mut cpuid, 0x8000_001e, Some(0), CpuidReg::EAX, x2apic_id);
    }

-    // Set ApicId in cpuid for each vcpu - found in cpuid ebx when eax = 1
-    let mut apic_id_patched = false;
-    for entry in &mut cpuid {
-        if entry.function == 1 {
-            entry.ebx &= 0xffffff;
-            entry.ebx |= x2apic_id << 24;
-            apic_id_patched = true;
-            break;
-        }
-    }
-    assert!(apic_id_patched);
+    // 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;
+    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);
@@ -896,7 +842,8 @@ pub fn configure_vcpu(

    regs::setup_msrs(vcpu).map_err(Error::MsrsConfiguration)?;
    if let Some((kernel_entry_point, guest_memory)) = boot_setup {
-        regs::setup_regs(vcpu, kernel_entry_point).map_err(Error::RegsConfiguration)?;
+        regs::setup_regs(vcpu, kernel_entry_point.entry_addr.raw_value())
+            .map_err(Error::RegsConfiguration)?;
        regs::setup_fpu(vcpu).map_err(Error::FpuConfiguration)?;
        regs::setup_sregs(&guest_memory.memory(), vcpu).map_err(Error::SregsConfiguration)?;
    }
@@ -945,10 +892,8 @@ pub fn arch_memory_regions() -> Vec<(GuestAddress, usize, RegionType)> {
 pub fn configure_system(
    guest_mem: &GuestMemoryMmap,
    cmdline_addr: GuestAddress,
-    cmdline_size: usize,
    initramfs: &Option<InitramfsConfig>,
    _num_cpus: u8,
-    setup_header: Option<setup_header>,
    rsdp_addr: Option<GuestAddress>,
    sgx_epc_region: Option<SgxEpcRegion>,
    serial_number: Option<&str>,
@@ -976,31 +921,25 @@ pub fn configure_system(
        }
    }

-    match setup_header {
-        Some(hdr) => configure_32bit_entry(
-            guest_mem,
-            cmdline_addr,
-            cmdline_size,
-            initramfs,
-            hdr,
-            rsdp_addr,
-            sgx_epc_region,
-        ),
-        None => configure_pvh(
-            guest_mem,
-            cmdline_addr,
-            initramfs,
-            rsdp_addr,
-            sgx_epc_region,
-        ),
-    }
+    configure_pvh(
+        guest_mem,
+        cmdline_addr,
+        initramfs,
+        rsdp_addr,
+        sgx_epc_region,
+    )
 }

 type RamRange = (u64, u64);

 /// 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>> {
+///
+/// There are up to two usable physical memory ranges,
+/// divided by the gap at the end of 32bit address space.
+pub fn generate_ram_ranges(
+    guest_mem: &GuestMemoryMmap,
+) -> super::Result<(RamRange, Option<RamRange>)> {
    // Merge continuous memory regions into one region.
    // Note: memory regions from "GuestMemory" are sorted and non-zero sized.
    let ram_regions = {
@@ -1033,11 +972,15 @@ 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
-    let mut ram_ranges = vec![];
+    if ram_regions.len() > 2 {
+        error!(
+            "There should be up to two usable physical memory ranges, 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
-    // should only report memory above 1MiB.
+    // Generate the first usable physical memory range before the gap
    let first_ram_range = {
        let (first_region_start, first_region_end) =
            ram_regions.first().ok_or(super::Error::MemmapTableSetup)?;
@@ -1064,19 +1007,33 @@ pub fn generate_ram_ranges(guest_mem: &GuestMemoryMmap) -> super::Result<Vec<Ram

        (high_ram_start, *first_region_end)
    };
-    ram_ranges.push(first_ram_range);

-    // Generate additional usable physical memory range after the gap if any.
-    for ram_region in ram_regions.iter().skip(1) {
+    // Generate the second usable physical memory range after the gap if any
+    let second_ram_range = if let Some((second_region_start, second_region_end)) =
+        ram_regions.get(1)
+    {
+        let ram_64bit_start = layout::RAM_64BIT_START.raw_value();
+
+        if second_region_start != &ram_64bit_start {
+            error!(
+                "Unexpected second memory region layout: start: 0x{:08x}, ram_64bit_start: 0x{:08x}",
+                second_region_start, ram_64bit_start
+            );
+
+            return Err(super::Error::MemmapTableSetup);
+        }
+
        info!(
-            "found usable physical memory range, start: 0x{:08x}, end: 0x{:08x}",
-            ram_region.0, ram_region.1
+            "Second usable physical memory range, start: 0x{:08x}, end: 0x{:08x}",
+            ram_64bit_start, second_region_end
        );

-        ram_ranges.push(*ram_region);
-    }
+        Some((ram_64bit_start, *second_region_end))
+    } else {
+        None
+    };

-    Ok(ram_ranges)
+    Ok((first_ram_range, second_ram_range))
 }

 fn configure_pvh(
@@ -1127,18 +1084,30 @@ fn configure_pvh(
    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)?;
+    let (first_ram_range, second_ram_range) = generate_ram_ranges(guest_mem)?;

-    // Create e820 memory map entries
-    for ram_range in ram_ranges {
+    // Create e820 memory map entry before the gap
+    info!(
+        "create_memmap_entry, start: 0x{:08x}, end: 0x{:08x}",
+        first_ram_range.0, first_ram_range.1
+    );
+    add_memmap_entry(
+        &mut memmap,
+        first_ram_range.0,
+        first_ram_range.1 - first_ram_range.0,
+        E820_RAM,
+    );
+
+    // Create e820 memory map after the gap if any
+    if let Some(second_ram_range) = second_ram_range {
        info!(
            "create_memmap_entry, start: 0x{:08x}, end: 0x{:08x}",
-            ram_range.0, ram_range.1
+            second_ram_range.0, second_ram_range.1
        );
        add_memmap_entry(
            &mut memmap,
-            ram_range.0,
-            ram_range.1 - ram_range.0,
+            second_ram_range.0,
+            second_ram_range.1 - second_ram_range.0,
            E820_RAM,
        );
    }
@@ -1198,113 +1167,6 @@ fn configure_pvh(
    Ok(())
 }

-fn configure_32bit_entry(
-    guest_mem: &GuestMemoryMmap,
-    cmdline_addr: GuestAddress,
-    cmdline_size: usize,
-    initramfs: &Option<InitramfsConfig>,
-    setup_hdr: setup_header,
-    rsdp_addr: Option<GuestAddress>,
-    sgx_epc_region: Option<SgxEpcRegion>,
-) -> super::Result<()> {
-    const KERNEL_LOADER_OTHER: u8 = 0xff;
-
-    // Use the provided setup header
-    let mut params = boot_params {
-        hdr: setup_hdr,
-        ..Default::default()
-    };
-
-    // Common bootparams settings
-    if params.hdr.type_of_loader == 0 {
-        params.hdr.type_of_loader = KERNEL_LOADER_OTHER;
-    }
-    params.hdr.cmd_line_ptr = cmdline_addr.raw_value() as u32;
-    params.hdr.cmdline_size = cmdline_size as u32;
-
-    if let Some(initramfs_config) = initramfs {
-        params.hdr.ramdisk_image = initramfs_config.address.raw_value() as u32;
-        params.hdr.ramdisk_size = initramfs_config.size as u32;
-    }
-
-    add_e820_entry(&mut params, 0, layout::EBDA_START.raw_value(), E820_RAM)?;
-
-    let mem_end = guest_mem.last_addr();
-    if mem_end < layout::MEM_32BIT_RESERVED_START {
-        add_e820_entry(
-            &mut params,
-            layout::HIGH_RAM_START.raw_value(),
-            mem_end.unchecked_offset_from(layout::HIGH_RAM_START) + 1,
-            E820_RAM,
-        )?;
-    } else {
-        add_e820_entry(
-            &mut params,
-            layout::HIGH_RAM_START.raw_value(),
-            layout::MEM_32BIT_RESERVED_START.unchecked_offset_from(layout::HIGH_RAM_START),
-            E820_RAM,
-        )?;
-        if mem_end > layout::RAM_64BIT_START {
-            add_e820_entry(
-                &mut params,
-                layout::RAM_64BIT_START.raw_value(),
-                mem_end.unchecked_offset_from(layout::RAM_64BIT_START) + 1,
-                E820_RAM,
-            )?;
-        }
-    }
-
-    add_e820_entry(
-        &mut params,
-        layout::PCI_MMCONFIG_START.0,
-        layout::PCI_MMCONFIG_SIZE,
-        E820_RESERVED,
-    )?;
-
-    if let Some(sgx_epc_region) = sgx_epc_region {
-        add_e820_entry(
-            &mut params,
-            sgx_epc_region.start().raw_value(),
-            sgx_epc_region.size(),
-            E820_RESERVED,
-        )?;
-    }
-
-    if let Some(rsdp_addr) = rsdp_addr {
-        params.acpi_rsdp_addr = rsdp_addr.0;
-    }
-
-    let zero_page_addr = layout::ZERO_PAGE_START;
-    guest_mem
-        .checked_offset(zero_page_addr, mem::size_of::<boot_params>())
-        .ok_or(super::Error::ZeroPagePastRamEnd)?;
-    guest_mem
-        .write_obj(params, zero_page_addr)
-        .map_err(super::Error::ZeroPageSetup)?;
-
-    Ok(())
-}
-
-/// Add an e820 region to the e820 map.
-/// Returns Ok(()) if successful, or an error if there is no space left in the map.
-fn add_e820_entry(
-    params: &mut boot_params,
-    addr: u64,
-    size: u64,
-    mem_type: u32,
-) -> Result<(), Error> {
-    if params.e820_entries >= params.e820_table.len() as u8 {
-        return Err(Error::E820Configuration);
-    }
-
-    params.e820_table[params.e820_entries as usize].addr = addr;
-    params.e820_table[params.e820_entries as usize].size = size;
-    params.e820_table[params.e820_entries as usize].type_ = mem_type;
-    params.e820_entries += 1;
-
-    Ok(())
-}
-
 fn add_memmap_entry(memmap: &mut Vec<hvm_memmap_table_entry>, addr: u64, size: u64, mem_type: u32) {
    // Add the table entry to the vector
    memmap.push(hvm_memmap_table_entry {
@@ -1551,7 +1413,6 @@ fn update_cpuid_sgx(
 #[cfg(test)]
 mod tests {
    use super::*;
-    use linux_loader::loader::bootparam::boot_e820_entry;

    #[test]
    fn regions_base_addr() {
@@ -1568,10 +1429,8 @@ mod tests {
        let config_err = configure_system(
            &gm,
            GuestAddress(0),
-            0,
            &None,
            1,
-            None,
            Some(layout::RSDP_POINTER),
            None,
            None,
@@ -1593,7 +1452,6 @@ mod tests {
        configure_system(
            &gm,
            GuestAddress(0),
-            0,
            &None,
            no_vcpus,
            None,
@@ -1602,7 +1460,6 @@ mod tests {
            None,
            None,
            None,
-            None,
        )
        .unwrap();

@@ -1623,7 +1480,6 @@ mod tests {
        configure_system(
            &gm,
            GuestAddress(0),
-            0,
            &None,
            no_vcpus,
            None,
@@ -1632,14 +1488,12 @@ mod tests {
            None,
            None,
            None,
-            None,
        )
        .unwrap();

        configure_system(
            &gm,
            GuestAddress(0),
-            0,
            &None,
            no_vcpus,
            None,
@@ -1648,51 +1502,10 @@ mod tests {
            None,
            None,
            None,
-            None,
        )
        .unwrap();
    }

-    #[test]
-    fn test_add_e820_entry() {
-        let e820_table = [(boot_e820_entry {
-            addr: 0x1,
-            size: 4,
-            type_: 1,
-        }); 128];
-
-        let expected_params = boot_params {
-            e820_table,
-            e820_entries: 1,
-            ..Default::default()
-        };
-
-        let mut params: boot_params = Default::default();
-        add_e820_entry(
-            &mut params,
-            e820_table[0].addr,
-            e820_table[0].size,
-            e820_table[0].type_,
-        )
-        .unwrap();
-        assert_eq!(
-            format!("{:?}", params.e820_table[0]),
-            format!("{:?}", expected_params.e820_table[0])
-        );
-        assert_eq!(params.e820_entries, expected_params.e820_entries);
-
-        // Exercise the scenario where the field storing the length of the e820 entry table is
-        // is bigger than the allocated memory.
-        params.e820_entries = params.e820_table.len() as u8 + 1;
-        assert!(add_e820_entry(
-            &mut params,
-            e820_table[0].addr,
-            e820_table[0].size,
-            e820_table[0].type_
-        )
-        .is_err());
-    }
-
    #[test]
    fn test_add_memmap_entry() {
        let mut memmap: Vec<hvm_memmap_table_entry> = Vec::new();
--- a/arch/src/x86_64/mpspec.rs
+++ b/arch/src/x86_64/mpspec.rs
@@ -1,6 +1,4 @@
 // Copyright 2017 The Chromium OS Authors. All rights reserved.
-//
-// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-BSD-3-Clause file.

@@ -17,7 +15,7 @@ pub const MP_IRQDIR_DEFAULT: ::std::os::raw::c_uint = 0;
 #[repr(C)]
 #[derive(Debug, Default, Copy, Clone)]
 pub struct mpf_intel {
-    pub signature: [::std::os::raw::c_uchar; 4usize],
+    pub signature: [::std::os::raw::c_char; 4usize],
    pub physptr: ::std::os::raw::c_uint,
    pub length: ::std::os::raw::c_uchar,
    pub specification: ::std::os::raw::c_uchar,
@@ -32,12 +30,12 @@ pub struct mpf_intel {
 #[repr(C)]
 #[derive(Debug, Default, Copy, Clone)]
 pub struct mpc_table {
-    pub signature: [::std::os::raw::c_uchar; 4usize],
+    pub signature: [::std::os::raw::c_char; 4usize],
    pub length: ::std::os::raw::c_ushort,
-    pub spec: ::std::os::raw::c_uchar,
-    pub checksum: ::std::os::raw::c_uchar,
-    pub oem: [::std::os::raw::c_uchar; 8usize],
-    pub productid: [::std::os::raw::c_uchar; 12usize],
+    pub spec: ::std::os::raw::c_char,
+    pub checksum: ::std::os::raw::c_char,
+    pub oem: [::std::os::raw::c_char; 8usize],
+    pub productid: [::std::os::raw::c_char; 12usize],
    pub oemptr: ::std::os::raw::c_uint,
    pub oemsize: ::std::os::raw::c_ushort,
    pub oemcount: ::std::os::raw::c_ushort,
@@ -106,9 +104,9 @@ pub struct mpc_lintsrc {
 #[repr(C)]
 #[derive(Debug, Default, Copy, Clone)]
 pub struct mpc_oemtable {
-    pub signature: [::std::os::raw::c_uchar; 4usize],
+    pub signature: [::std::os::raw::c_char; 4usize],
    pub length: ::std::os::raw::c_ushort,
-    pub rev: ::std::os::raw::c_uchar,
-    pub checksum: ::std::os::raw::c_uchar,
-    pub mpc: [::std::os::raw::c_uchar; 8usize],
+    pub rev: ::std::os::raw::c_char,
+    pub checksum: ::std::os::raw::c_char,
+    pub mpc: [::std::os::raw::c_char; 8usize],
 }
--- a/arch/src/x86_64/mptable.rs
+++ b/arch/src/x86_64/mptable.rs
@@ -8,11 +8,10 @@
 use crate::layout::{APIC_START, HIGH_RAM_START, IOAPIC_START};
 use crate::x86_64::{get_x2apic_id, mpspec};
 use crate::GuestMemoryMmap;
-use libc::c_uchar;
+use libc::c_char;
 use std::mem;
 use std::result;
 use std::slice;
-use thiserror::Error;
 use vm_memory::{Address, ByteValued, Bytes, GuestAddress, GuestMemory, GuestMemoryError};

 // This is a workaround to the Rust enforcement specifying that any implementation of a foreign
@@ -50,40 +49,29 @@ unsafe impl ByteValued for MpcLintsrcWrapper {}
 // SAFETY: see above
 unsafe impl ByteValued for MpfIntelWrapper {}

-#[derive(Debug, Error)]
+#[derive(Debug)]
 pub enum Error {
    /// There was too little guest memory to store the entire MP table.
-    #[error("There was too little guest memory to store the entire MP table")]
    NotEnoughMemory,
    /// The MP table has too little address space to be stored.
-    #[error("The MP table has too little address space to be stored")]
    AddressOverflow,
    /// Failure while zeroing out the memory for the MP table.
-    #[error("Failure while zeroing out the memory for the MP table: {0}")]
    Clear(GuestMemoryError),
    /// Number of CPUs exceeds the maximum supported CPUs
-    #[error("Number of CPUs exceeds the maximum supported CPUs")]
    TooManyCpus,
    /// Failure to write the MP floating pointer.
-    #[error("Failure to write the MP floating pointer: {0}")]
    WriteMpfIntel(GuestMemoryError),
    /// Failure to write MP CPU entry.
-    #[error("Failure to write MP CPU entry: {0}")]
    WriteMpcCpu(GuestMemoryError),
    /// Failure to write MP ioapic entry.
-    #[error("Failure to write MP ioapic entry: {0}")]
    WriteMpcIoapic(GuestMemoryError),
    /// Failure to write MP bus entry.
-    #[error("Failure to write MP bus entry: {0}")]
    WriteMpcBus(GuestMemoryError),
    /// Failure to write MP interrupt source entry.
-    #[error("Failure to write MP interrupt source entry: {0}")]
    WriteMpcIntsrc(GuestMemoryError),
    /// Failure to write MP local interrupt source entry.
-    #[error("Failure to write MP local interrupt source entry: {0}")]
    WriteMpcLintsrc(GuestMemoryError),
    /// Failure to write MP table header.
-    #[error("Failure to write MP table header: {0}")]
    WriteMpcTable(GuestMemoryError),
 }

@@ -94,13 +82,18 @@ pub type Result<T> = result::Result<T, Error>;
 // a large number for FC usecases.
 pub const MAX_SUPPORTED_CPUS: u32 = 254;

+// Convenience macro for making arrays of diverse character types.
+macro_rules! char_array {
+    ($t:ty; $( $c:expr ),*) => ( [ $( $c as $t ),* ] )
+}
+
 // Most of these variables are sourced from the Intel MP Spec 1.4.
-const SMP_MAGIC_IDENT: &[c_uchar; 4] = b"_MP_";
-const MPC_SIGNATURE: &[c_uchar; 4] = b"PCMP";
-const MPC_SPEC: u8 = 4;
-const MPC_OEM: &[c_uchar; 8] = b"FC      ";
-const MPC_PRODUCT_ID: &[c_uchar; 12] = &[b'0'; 12];
-const BUS_TYPE_ISA: &[c_uchar; 6] = b"ISA   ";
+const SMP_MAGIC_IDENT: [c_char; 4] = char_array!(c_char; '_', 'M', 'P', '_');
+const MPC_SIGNATURE: [c_char; 4] = char_array!(c_char; 'P', 'C', 'M', 'P');
+const MPC_SPEC: i8 = 4;
+const MPC_OEM: [c_char; 8] = char_array!(c_char; 'F', 'C', ' ', ' ', ' ', ' ', ' ', ' ');
+const MPC_PRODUCT_ID: [c_char; 12] = ['0' as c_char; 12];
+const BUS_TYPE_ISA: [u8; 6] = char_array!(u8; 'I', 'S', 'A', ' ', ' ', ' ');
 const APIC_VERSION: u8 = 0x14;
 const CPU_STEPPING: u32 = 0x600;
 const CPU_FEATURE_APIC: u32 = 0x200;
@@ -175,7 +168,7 @@ pub fn setup_mptable(
    {
        let mut mpf_intel = MpfIntelWrapper(mpspec::mpf_intel::default());
        let size = mem::size_of::<MpfIntelWrapper>() as u64;
-        mpf_intel.0.signature = *SMP_MAGIC_IDENT;
+        mpf_intel.0.signature = SMP_MAGIC_IDENT;
        mpf_intel.0.length = 1;
        mpf_intel.0.specification = 4;
        mpf_intel.0.physptr = (base_mp.raw_value() + size) as u32;
@@ -216,7 +209,7 @@ pub fn setup_mptable(
        let mut mpc_bus = MpcBusWrapper(mpspec::mpc_bus::default());
        mpc_bus.0.type_ = mpspec::MP_BUS as u8;
        mpc_bus.0.busid = 0;
-        mpc_bus.0.bustype = *BUS_TYPE_ISA;
+        mpc_bus.0.bustype = BUS_TYPE_ISA;
        mem.write_obj(mpc_bus, base_mp)
            .map_err(Error::WriteMpcBus)?;
        base_mp = base_mp.unchecked_add(size as u64);
@@ -287,14 +280,14 @@ pub fn setup_mptable(

    {
        let mut mpc_table = MpcTableWrapper(mpspec::mpc_table::default());
-        mpc_table.0.signature = *MPC_SIGNATURE;
+        mpc_table.0.signature = MPC_SIGNATURE;
        mpc_table.0.length = table_end.unchecked_offset_from(table_base) as u16;
        mpc_table.0.spec = MPC_SPEC;
-        mpc_table.0.oem = *MPC_OEM;
-        mpc_table.0.productid = *MPC_PRODUCT_ID;
+        mpc_table.0.oem = MPC_OEM;
+        mpc_table.0.productid = MPC_PRODUCT_ID;
        mpc_table.0.lapic = APIC_START.0 as u32;
        checksum = checksum.wrapping_add(compute_checksum(&mpc_table.0));
-        mpc_table.0.checksum = (!checksum).wrapping_add(1);
+        mpc_table.0.checksum = (!checksum).wrapping_add(1) as i8;
        mem.write_obj(mpc_table, table_base)
            .map_err(Error::WriteMpcTable)?;
    }
@@ -307,7 +300,8 @@ mod tests {
    use super::*;
    use crate::layout::MPTABLE_START;
    use vm_memory::{
-        bitmap::BitmapSlice, GuestUsize, VolatileMemoryError, VolatileSlice, WriteVolatile,
+        bitmap::BitmapSlice, GuestAddress, GuestUsize, VolatileMemoryError, VolatileSlice,
+        WriteVolatile,
    };

    fn table_entry_size(type_: u8) -> usize {
--- a/arch/src/x86_64/regs.rs
+++ b/arch/src/x86_64/regs.rs
@@ -6,55 +6,40 @@
 // Portions Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-BSD-3-Clause file.
-use crate::layout::{
-    BOOT_GDT_START, BOOT_IDT_START, BOOT_STACK_POINTER, PVH_INFO_START, ZERO_PAGE_START,
-};
-use crate::{EntryPoint, GuestMemoryMmap};
+use crate::layout::{BOOT_GDT_START, BOOT_IDT_START, PVH_INFO_START};
+use crate::GuestMemoryMmap;
 use hypervisor::arch::x86::gdt::{gdt_entry, segment_from_gdt};
 use hypervisor::arch::x86::regs::CR0_PE;
 use hypervisor::arch::x86::{FpuState, SpecialRegisters, StandardRegisters};
 use std::sync::Arc;
 use std::{mem, result};
-use thiserror::Error;
 use vm_memory::{Address, Bytes, GuestMemory, GuestMemoryError};

-#[derive(Debug, Error)]
+#[derive(Debug)]
 pub enum Error {
    /// Failed to get SREGs for this CPU.
-    #[error("Failed to get SREGs for this CPU: {0}")]
    GetStatusRegisters(hypervisor::HypervisorCpuError),
    /// Failed to set base registers for this CPU.
-    #[error("Failed to set base registers for this CPU: {0}")]
    SetBaseRegisters(hypervisor::HypervisorCpuError),
    /// Failed to configure the FPU.
-    #[error("Failed to configure the FPU: {0}")]
    SetFpuRegisters(hypervisor::HypervisorCpuError),
    /// Setting up MSRs failed.
-    #[error("Setting up MSRs failed: {0}")]
    SetModelSpecificRegisters(hypervisor::HypervisorCpuError),
    /// Failed to set SREGs for this CPU.
-    #[error("Failed to set SREGs for this CPU: {0}")]
    SetStatusRegisters(hypervisor::HypervisorCpuError),
    /// Checking the GDT address failed.
-    #[error("Checking the GDT address failed")]
    CheckGdtAddr,
    /// Writing the GDT to RAM failed.
-    #[error("Writing the GDT to RAM failed: {0}")]
    WriteGdt(GuestMemoryError),
    /// Writing the IDT to RAM failed.
-    #[error("Writing the IDT to RAM failed: {0}")]
    WriteIdt(GuestMemoryError),
    /// Writing PDPTE to RAM failed.
-    #[error("Writing PDPTE to RAM failed: {0}")]
    WritePdpteAddress(GuestMemoryError),
    /// Writing PDE to RAM failed.
-    #[error("Writing PDE to RAM failed: {0}")]
    WritePdeAddress(GuestMemoryError),
    /// Writing PML4 to RAM failed.
-    #[error("Writing PML4 to RAM failed: {0}")]
    WritePml4Address(GuestMemoryError),
    /// Writing PML5 to RAM failed.
-    #[error("Writing PML5 to RAM failed: {0}")]
    WritePml5Address(GuestMemoryError),
 }

@@ -92,22 +77,13 @@ pub fn setup_msrs(vcpu: &Arc<dyn hypervisor::Vcpu>) -> Result<()> {
 /// # Arguments
 ///
 /// * `vcpu` - Structure for the VCPU that holds the VCPU's fd.
-/// * `entry_point` - Description of the boot entry to set up.
-pub fn setup_regs(vcpu: &Arc<dyn hypervisor::Vcpu>, entry_point: EntryPoint) -> Result<()> {
-    let regs = match entry_point.setup_header {
-        None => StandardRegisters {
-            rflags: 0x0000000000000002u64,
-            rip: entry_point.entry_addr.raw_value(),
-            rbx: PVH_INFO_START.raw_value(),
-            ..Default::default()
-        },
-        Some(_) => StandardRegisters {
-            rflags: 0x0000000000000002u64,
-            rip: entry_point.entry_addr.raw_value(),
-            rsp: BOOT_STACK_POINTER.raw_value(),
-            rsi: ZERO_PAGE_START.raw_value(),
-            ..Default::default()
-        },
+/// * `boot_ip` - Starting instruction pointer.
+pub fn setup_regs(vcpu: &Arc<dyn hypervisor::Vcpu>, boot_ip: u64) -> Result<()> {
+    let regs = StandardRegisters {
+        rflags: 0x0000000000000002u64,
+        rbx: PVH_INFO_START.raw_value(),
+        rip: boot_ip,
+        ..Default::default()
    };
    vcpu.set_regs(&regs).map_err(Error::SetBaseRegisters)
 }
@@ -188,6 +164,7 @@ pub fn configure_segments_and_sregs(
 #[cfg(test)]
 mod tests {
    use super::*;
+    use crate::GuestMemoryMmap;
    use vm_memory::GuestAddress;

    fn create_guest_mem() -> GuestMemoryMmap {
--- a/arch/src/x86_64/smbios.rs
+++ b/arch/src/x86_64/smbios.rs
@@ -8,36 +8,53 @@

 use crate::layout::SMBIOS_START;
 use crate::GuestMemoryMmap;
+use std::fmt::{self, Display};
 use std::mem;
 use std::result;
 use std::slice;
-use thiserror::Error;
 use uuid::Uuid;
 use vm_memory::ByteValued;
 use vm_memory::{Address, Bytes, GuestAddress};

-#[derive(Debug, Error)]
+#[derive(Debug)]
 pub enum Error {
    /// There was too little guest memory to store the entire SMBIOS table.
-    #[error("There was too little guest memory to store the SMBIOS table")]
    NotEnoughMemory,
    /// The SMBIOS table has too little address space to be stored.
-    #[error("The SMBIOS table has too little address space to be stored")]
    AddressOverflow,
    /// Failure while zeroing out the memory for the SMBIOS table.
-    #[error("Failure while zeroing out the memory for the SMBIOS table")]
    Clear,
    /// Failure to write SMBIOS entrypoint structure
-    #[error("Failure to write SMBIOS entrypoint structure")]
    WriteSmbiosEp,
    /// Failure to write additional data to memory
-    #[error("Failure to write additional data to memory")]
    WriteData,
    /// Failure to parse uuid, uuid format may be error
-    #[error("Failure to parse uuid: {0}")]
    ParseUuid(uuid::Error),
 }

+impl std::error::Error for Error {}
+
+impl Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        use self::Error::*;
+
+        let description = match self {
+            NotEnoughMemory => {
+                "There was too little guest memory to store the SMBIOS table".to_string()
+            }
+            AddressOverflow => {
+                "The SMBIOS table has too little address space to be stored".to_string()
+            }
+            Clear => "Failure while zeroing out the memory for the SMBIOS table".to_string(),
+            WriteSmbiosEp => "Failure to write SMBIOS entrypoint structure".to_string(),
+            WriteData => "Failure to write additional data to memory".to_string(),
+            ParseUuid(e) => format!("Failure to parse uuid: {e}"),
+        };
+
+        write!(f, "SMBIOS error: {description}")
+    }
+}
+
 pub type Result<T> = result::Result<T, Error>;

 // Constants sourced from SMBIOS Spec 3.2.0.
--- a/block/Cargo.toml
+++ b/block/Cargo.toml
@@ -1,30 +1,27 @@
 [package]
-authors = ["The Chromium OS Authors", "The Cloud Hypervisor Authors"]
-edition = "2021"
 name = "block"
 version = "0.1.0"
+edition = "2021"
+authors = ["The Cloud Hypervisor Authors", "The Chromium OS Authors"]

 [features]
 default = []
 io_uring = ["dep:io-uring"]

 [dependencies]
-byteorder = "1.5.0"
+byteorder = "1.4.3"
 crc-any = "2.4.4"
-io-uring = { version = "0.6.3", optional = true }
-libc = "0.2.155"
-log = "0.4.22"
-remain = "0.2.14"
-serde = { version = "1.0.197", features = ["derive"] }
-smallvec = "1.13.2"
-thiserror = "1.0.62"
-uuid = { version = "1.8.0", features = ["v4"] }
-virtio-bindings = { version = "0.2.2", features = ["virtio-v5_0_0"] }
-virtio-queue = "0.12.0"
-vm-memory = { version = "0.14.1", features = [
-  "backend-atomic",
-  "backend-bitmap",
-  "backend-mmap",
-] }
+io-uring = { version = "0.6.2", optional = true }
+libc = "0.2.147"
+log = "0.4.20"
+remain = "0.2.11"
+smallvec = "1.11.0"
+thiserror = "1.0.40"
+uuid = { version = "1.3.4", features = ["v4"] }
+versionize = "0.2.0"
+versionize_derive = "0.1.6"
+virtio-bindings = { version = "0.2.0", features = ["virtio-v5_0_0"] }
+virtio-queue = "0.11.0"
+vm-memory = { version = "0.14.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
 vm-virtio = { path = "../vm-virtio" }
 vmm-sys-util = "0.12.1"
--- a/block/src/lib.rs
+++ b/block/src/lib.rs
@@ -37,11 +37,11 @@ use crate::vhdx::{Vhdx, VhdxError};
 #[cfg(feature = "io_uring")]
 use io_uring::{opcode, IoUring, Probe};
 use libc::{ioctl, S_IFBLK, S_IFMT};
-use serde::{Deserialize, Serialize};
 use smallvec::SmallVec;
 use std::alloc::{alloc_zeroed, dealloc, Layout};
 use std::cmp;
 use std::collections::VecDeque;
+use std::convert::TryInto;
 use std::fmt::Debug;
 use std::fs::File;
 use std::io::{self, IoSlice, IoSliceMut, Read, Seek, SeekFrom, Write};
@@ -53,17 +53,21 @@ use std::sync::Arc;
 use std::sync::MutexGuard;
 use std::time::Instant;
 use thiserror::Error;
+use versionize::{VersionMap, Versionize, VersionizeResult};
+use versionize_derive::Versionize;
 use virtio_bindings::virtio_blk::*;
 use virtio_queue::DescriptorChain;
 use vm_memory::{
-    bitmap::Bitmap, ByteValued, Bytes, GuestAddress, GuestMemory, GuestMemoryError,
-    GuestMemoryLoadGuard,
+    bitmap::AtomicBitmap, bitmap::Bitmap, ByteValued, Bytes, GuestAddress, GuestMemory,
+    GuestMemoryError, GuestMemoryLoadGuard,
 };
 use vm_virtio::{AccessPlatform, Translatable};
 use vmm_sys_util::aio;
 use vmm_sys_util::eventfd::EventFd;
 use vmm_sys_util::{ioctl_io_nr, ioctl_ioc_nr};

+type GuestMemoryMmap = vm_memory::GuestMemoryMmap<AtomicBitmap>;
+
 const SECTOR_SHIFT: u8 = 9;
 pub const SECTOR_SIZE: u64 = 0x01 << SECTOR_SHIFT;

@@ -164,8 +168,8 @@ pub enum ExecuteError {
 }

 impl ExecuteError {
-    pub fn status(&self) -> u8 {
-        let status = match *self {
+    pub fn status(&self) -> u32 {
+        match *self {
            ExecuteError::BadRequest(_) => VIRTIO_BLK_S_IOERR,
            ExecuteError::Flush(_) => VIRTIO_BLK_S_IOERR,
            ExecuteError::Read(_) => VIRTIO_BLK_S_IOERR,
@@ -180,8 +184,7 @@ impl ExecuteError {
            ExecuteError::AsyncWrite(_) => VIRTIO_BLK_S_IOERR,
            ExecuteError::AsyncFlush(_) => VIRTIO_BLK_S_IOERR,
            ExecuteError::TemporaryBufferAllocation(_) => VIRTIO_BLK_S_IOERR,
-        };
-        status as u8
+        }
    }
 }

@@ -194,8 +197,8 @@ pub enum RequestType {
    Unsupported(u32),
 }

-pub fn request_type<B: Bitmap + 'static>(
-    mem: &vm_memory::GuestMemoryMmap<B>,
+pub fn request_type(
+    mem: &GuestMemoryMmap,
    desc_addr: GuestAddress,
 ) -> result::Result<RequestType, Error> {
    let type_ = mem.read_obj(desc_addr).map_err(Error::GuestMemory)?;
@@ -208,10 +211,7 @@ pub fn request_type<B: Bitmap + 'static>(
    }
 }

-fn sector<B: Bitmap + 'static>(
-    mem: &vm_memory::GuestMemoryMmap<B>,
-    desc_addr: GuestAddress,
-) -> result::Result<u64, Error> {
+fn sector(mem: &GuestMemoryMmap, desc_addr: GuestAddress) -> result::Result<u64, Error> {
    const SECTOR_OFFSET: usize = 8;
    let addr = match mem.checked_offset(desc_addr, SECTOR_OFFSET) {
        Some(v) => v,
@@ -241,15 +241,16 @@ pub struct Request {
 }

 impl Request {
-    pub fn parse<B: Bitmap + 'static>(
-        desc_chain: &mut DescriptorChain<GuestMemoryLoadGuard<vm_memory::GuestMemoryMmap<B>>>,
+    pub fn parse(
+        desc_chain: &mut DescriptorChain<GuestMemoryLoadGuard<GuestMemoryMmap>>,
        access_platform: Option<&Arc<dyn AccessPlatform>>,
    ) -> result::Result<Request, Error> {
        let hdr_desc = desc_chain
            .next()
            .ok_or(Error::DescriptorChainTooShort)
-            .inspect_err(|_| {
+            .map_err(|e| {
                error!("Missing head descriptor");
+                e
            })?;

        // The head contains the request type which MUST be readable.
@@ -275,8 +276,9 @@ impl Request {
        let mut desc = desc_chain
            .next()
            .ok_or(Error::DescriptorChainTooShort)
-            .inspect_err(|_| {
+            .map_err(|e| {
                error!("Only head descriptor present: request = {:?}", req);
+                e
            })?;

        if !desc.has_next() {
@@ -307,8 +309,9 @@ impl Request {
                desc = desc_chain
                    .next()
                    .ok_or(Error::DescriptorChainTooShort)
-                    .inspect_err(|_| {
+                    .map_err(|e| {
                        error!("DescriptorChain corrupted: request = {:?}", req);
+                        e
                    })?;
            }
            status_desc = desc;
@@ -330,11 +333,11 @@ impl Request {
        Ok(req)
    }

-    pub fn execute<T: Seek + Read + Write, B: Bitmap + 'static>(
+    pub fn execute<T: Seek + Read + Write>(
        &self,
        disk: &mut T,
        disk_nsectors: u64,
-        mem: &vm_memory::GuestMemoryMmap<B>,
+        mem: &GuestMemoryMmap,
        serial: &[u8],
    ) -> result::Result<u32, ExecuteError> {
        disk.seek(SeekFrom::Start(self.sector << SECTOR_SHIFT))
@@ -387,9 +390,9 @@ impl Request {
        Ok(len)
    }

-    pub fn execute_async<B: Bitmap + 'static>(
+    pub fn execute_async(
        &mut self,
-        mem: &vm_memory::GuestMemoryMmap<B>,
+        mem: &GuestMemoryMmap,
        disk_nsectors: u64,
        disk_image: &mut dyn AsyncIo,
        serial: &[u8],
@@ -542,7 +545,7 @@ impl Request {
    }
 }

-#[derive(Copy, Clone, Debug, Default, Serialize, Deserialize)]
+#[derive(Copy, Clone, Debug, Default, Versionize)]
 #[repr(C, packed)]
 pub struct VirtioBlockConfig {
    pub capacity: u64,
@@ -565,7 +568,7 @@ pub struct VirtioBlockConfig {
    pub write_zeroes_may_unmap: u8,
    pub unused1: [u8; 3],
 }
-#[derive(Copy, Clone, Debug, Default, Serialize, Deserialize)]
+#[derive(Copy, Clone, Debug, Default, Versionize)]
 #[repr(C, packed)]
 pub struct VirtioBlockGeometry {
    pub cylinders: u16,
@@ -657,9 +660,7 @@ where
        let mut slices: SmallVec<[IoSliceMut; 1]> = SmallVec::with_capacity(iovecs.len());
        for iovec in iovecs.iter() {
            // SAFETY: on Linux IoSliceMut wraps around libc::iovec
-            slices.push(IoSliceMut::new(unsafe {
-                std::mem::transmute::<libc::iovec, &mut [u8]>(*iovec)
-            }));
+            slices.push(IoSliceMut::new(unsafe { std::mem::transmute(*iovec) }));
        }

        let result = {
@@ -692,9 +693,7 @@ where
        let mut slices: SmallVec<[IoSlice; 1]> = SmallVec::with_capacity(iovecs.len());
        for iovec in iovecs.iter() {
            // SAFETY: on Linux IoSlice wraps around libc::iovec
-            slices.push(IoSlice::new(unsafe {
-                std::mem::transmute::<libc::iovec, &mut [u8]>(*iovec)
-            }));
+            slices.push(IoSlice::new(unsafe { std::mem::transmute(*iovec) }));
        }

        let result = {
--- a/block/src/qcow/mod.rs
+++ b/block/src/qcow/mod.rs
@@ -1,8 +1,6 @@
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-BSD-3-Clause file.
-//
-// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause

 mod qcow_raw_file;
 mod raw_file;
@@ -19,11 +17,11 @@ use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
 use libc::{EINVAL, ENOSPC, ENOTSUP};
 use remain::sorted;
 use std::cmp::{max, min};
+use std::fmt::{self, Display};
 use std::fs::OpenOptions;
 use std::io::{self, Read, Seek, SeekFrom, Write};
 use std::mem::size_of;
 use std::str;
-use thiserror::Error;
 use vmm_sys_util::{
    file_traits::FileSetLen, file_traits::FileSync, seek_hole::SeekHole, write_zeroes::PunchHole,
    write_zeroes::WriteZeroesAt,
@@ -31,98 +29,106 @@ use vmm_sys_util::{

 pub use crate::qcow::raw_file::RawFile;

-/// Nesting depth limit for disk formats that can open other disk files.
-const MAX_NESTING_DEPTH: u32 = 10;
-
 #[sorted]
-#[derive(Debug, Error)]
+#[derive(Debug)]
 pub enum Error {
-    #[error("Backing file io error: {0}")]
    BackingFileIo(io::Error),
-    #[error("Backing file open error: {0}")]
-    BackingFileOpen(Box<Error>),
-    #[error("Backing file name is too long: {0} bytes over")]
+    BackingFileOpen(Box<crate::Error>),
    BackingFileTooLong(usize),
-    #[error("Compressed blocks not supported")]
    CompressedBlocksNotSupported,
-    #[error("Failed to evict cache: {0}")]
    EvictingCache(io::Error),
-    #[error("File larger than max of {}: {0}", MAX_QCOW_FILE_SIZE)]
    FileTooBig(u64),
-    #[error("Failed to get file size: {0}")]
    GettingFileSize(io::Error),
-    #[error("Failed to get refcount: {0}")]
    GettingRefcount(refcount::Error),
-    #[error("Failed to parse filename: {0}")]
    InvalidBackingFileName(str::Utf8Error),
-    #[error("Invalid cluster index")]
    InvalidClusterIndex,
-    #[error("Invalid cluster size")]
    InvalidClusterSize,
-    #[error("Invalid index")]
    InvalidIndex,
-    #[error("Invalid L1 table offset")]
    InvalidL1TableOffset,
-    #[error("Invalid L1 table size: {0}")]
    InvalidL1TableSize(u32),
-    #[error("Invalid magic")]
    InvalidMagic,
-    #[error("Invalid offset: {0}")]
    InvalidOffset(u64),
-    #[error("Invalid refcount table offset")]
    InvalidRefcountTableOffset,
-    #[error("Invalid refcount table size: {0}")]
    InvalidRefcountTableSize(u64),
-    #[error("Maximum disk nesting depth exceeded")]
-    MaxNestingDepthExceeded,
-    #[error("No free clusters")]
    NoFreeClusters,
-    #[error("No refcount clusters")]
    NoRefcountClusters,
-    #[error("Not enough space for refcounts")]
    NotEnoughSpaceForRefcounts,
-    #[error("Failed to open file {0}")]
    OpeningFile(io::Error),
-    #[error("Failed to read data: {0}")]
    ReadingData(io::Error),
-    #[error("Failed to read header: {0}")]
    ReadingHeader(io::Error),
-    #[error("Failed to read pointers: {0}")]
    ReadingPointers(io::Error),
-    #[error("Failed to read ref count block: {0}")]
    ReadingRefCountBlock(refcount::Error),
-    #[error("Failed to read ref counts: {0}")]
    ReadingRefCounts(io::Error),
-    #[error("Failed to rebuild ref counts: {0}")]
    RebuildingRefCounts(io::Error),
-    #[error("Refcount table offset past file end")]
    RefcountTableOffEnd,
-    #[error("Too many clusters specified for refcount")]
    RefcountTableTooLarge,
-    #[error("Failed to seek file: {0}")]
    SeekingFile(io::Error),
-    #[error("Failed to set file size: {0}")]
    SettingFileSize(io::Error),
-    #[error("Failed to set refcount refcount: {0}")]
    SettingRefcountRefcount(io::Error),
-    #[error("Size too small for number of clusters")]
    SizeTooSmallForNumberOfClusters,
-    #[error("L1 entry table too large: {0}")]
    TooManyL1Entries(u64),
-    #[error("Ref count table too large: {0}")]
    TooManyRefcounts(u64),
-    #[error("Unsupported refcount order")]
    UnsupportedRefcountOrder,
-    #[error("Unsupported version: {0}")]
    UnsupportedVersion(u32),
-    #[error("Failed to write data: {0}")]
    WritingData(io::Error),
-    #[error("Failed to write header: {0}")]
    WritingHeader(io::Error),
 }

 pub type Result<T> = std::result::Result<T, Error>;

+impl Display for Error {
+    #[remain::check]
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        use self::Error::*;
+
+        #[sorted]
+        match self {
+            BackingFileIo(e) => write!(f, "backing file io error: {}", e),
+            BackingFileOpen(e) => write!(f, "backing file open error: {}", *e),
+            BackingFileTooLong(len) => {
+                write!(f, "backing file name is too long: {} bytes over", len)
+            }
+            CompressedBlocksNotSupported => write!(f, "compressed blocks not supported"),
+            EvictingCache(e) => write!(f, "failed to evict cache: {e}"),
+            FileTooBig(size) => write!(f, "file larger than max of {MAX_QCOW_FILE_SIZE}: {size}"),
+            GettingFileSize(e) => write!(f, "failed to get file size: {e}"),
+            GettingRefcount(e) => write!(f, "failed to get refcount: {e}"),
+            InvalidBackingFileName(e) => write!(f, "failed to parse filename: {}", e),
+            InvalidClusterIndex => write!(f, "invalid cluster index"),
+            InvalidClusterSize => write!(f, "invalid cluster size"),
+            InvalidIndex => write!(f, "invalid index"),
+            InvalidL1TableOffset => write!(f, "invalid L1 table offset"),
+            InvalidL1TableSize(size) => write!(f, "invalid L1 table size {size}"),
+            InvalidMagic => write!(f, "invalid magic"),
+            InvalidOffset(_) => write!(f, "invalid offset"),
+            InvalidRefcountTableOffset => write!(f, "invalid refcount table offset"),
+            InvalidRefcountTableSize(size) => write!(f, "invalid refcount table size: {size}"),
+            NoFreeClusters => write!(f, "no free clusters"),
+            NoRefcountClusters => write!(f, "no refcount clusters"),
+            NotEnoughSpaceForRefcounts => write!(f, "not enough space for refcounts"),
+            OpeningFile(e) => write!(f, "failed to open file: {e}"),
+            ReadingData(e) => write!(f, "failed to read data: {e}"),
+            ReadingHeader(e) => write!(f, "failed to read header: {e}"),
+            ReadingPointers(e) => write!(f, "failed to read pointers: {e}"),
+            ReadingRefCountBlock(e) => write!(f, "failed to read ref count block: {e}"),
+            ReadingRefCounts(e) => write!(f, "failed to read ref counts: {e}"),
+            RebuildingRefCounts(e) => write!(f, "failed to rebuild ref counts: {e}"),
+            RefcountTableOffEnd => write!(f, "refcount table offset past file end"),
+            RefcountTableTooLarge => write!(f, "too many clusters specified for refcount table"),
+            SeekingFile(e) => write!(f, "failed to seek file: {e}"),
+            SettingFileSize(e) => write!(f, "failed to set file size: {e}"),
+            SettingRefcountRefcount(e) => write!(f, "failed to set refcount refcount: {e}"),
+            SizeTooSmallForNumberOfClusters => write!(f, "size too small for number of clusters"),
+            TooManyL1Entries(count) => write!(f, "l1 entry table too large: {count}"),
+            TooManyRefcounts(count) => write!(f, "ref count table too large: {count}"),
+            UnsupportedRefcountOrder => write!(f, "unsupported refcount order"),
+            UnsupportedVersion(v) => write!(f, "unsupported version: {v}"),
+            WritingData(e) => write!(f, "failed to write data: {e}"),
+            WritingHeader(e) => write!(f, "failed to write header: {e}"),
+        }
+    }
+}
+
 pub enum ImageType {
    Raw,
    Qcow2,
@@ -439,20 +445,12 @@ pub struct QcowFile {
    // List of unreferenced clusters available to be used. unref clusters become available once the
    // removal of references to them have been synced to disk.
    avail_clusters: Vec<u64>,
-    backing_file: Option<Box<Self>>,
+    backing_file: Option<Box<dyn BlockBackend>>,
 }

 impl QcowFile {
    /// Creates a QcowFile from `file`. File must be a valid qcow2 image.
-    ///
-    /// Additionally, max nesting depth of this qcow2 image will be set to default value 10.
-    pub fn from(file: RawFile) -> Result<QcowFile> {
-        Self::from_with_nesting_depth(file, MAX_NESTING_DEPTH)
-    }
-
-    /// Creates a QcowFile from `file` and with a max nesting depth. File must be a valid qcow2
-    /// image.
-    pub fn from_with_nesting_depth(mut file: RawFile, max_nesting_depth: u32) -> Result<QcowFile> {
+    pub fn from(mut file: RawFile) -> Result<QcowFile> {
        let header = QcowHeader::new(&mut file)?;

        // Only v2 and v3 files are supported.
@@ -479,20 +477,14 @@ impl QcowFile {
        let direct_io = file.is_direct();

        let backing_file = if let Some(backing_file_path) = header.backing_file_path.as_ref() {
-            if max_nesting_depth == 0 {
-                return Err(Error::MaxNestingDepthExceeded);
-            }
            let path = backing_file_path.clone();
            let backing_raw_file = OpenOptions::new()
                .read(true)
                .open(path)
                .map_err(Error::BackingFileIo)?;
-            let backing_file = Self::from_with_nesting_depth(
-                RawFile::new(backing_raw_file, direct_io),
-                max_nesting_depth - 1,
-            )
-            .map_err(|e| Error::BackingFileOpen(Box::new(e)))?;
-            Some(Box::new(backing_file))
+            let backing_file = crate::create_disk_file(backing_raw_file, direct_io)
+                .map_err(|e| Error::BackingFileOpen(Box::new(e)))?;
+            Some(backing_file)
        } else {
            None
        };
@@ -640,22 +632,20 @@ impl QcowFile {
        file: RawFile,
        version: u32,
        backing_file_name: &str,
-        backing_file_max_nesting_depth: u32,
    ) -> Result<QcowFile> {
        let direct_io = file.is_direct();
        let backing_raw_file = OpenOptions::new()
            .read(true)
            .open(backing_file_name)
            .map_err(Error::BackingFileIo)?;
-        let backing_file = Self::from_with_nesting_depth(
-            RawFile::new(backing_raw_file, direct_io),
-            backing_file_max_nesting_depth,
-        )
-        .map_err(|e| Error::BackingFileOpen(Box::new(e)))?;
-        let size = backing_file.virtual_size();
+        let backing_file = crate::create_disk_file(backing_raw_file, direct_io)
+            .map_err(|e| Error::BackingFileOpen(Box::new(e)))?;
+        let size = backing_file
+            .size()
+            .map_err(|e| Error::BackingFileOpen(Box::new(e)))?;
        let header = QcowHeader::create_for_size_and_path(version, size, Some(backing_file_name))?;
        let mut result = QcowFile::new_from_header(file, header)?;
-        result.backing_file = Some(Box::new(backing_file));
+        result.backing_file = Some(backing_file);
        Ok(result)
    }

@@ -683,7 +673,7 @@ impl QcowFile {
        Ok(qcow)
    }

-    pub fn set_backing_file(&mut self, backing: Option<Box<Self>>) {
+    pub fn set_backing_file(&mut self, backing: Option<Box<dyn BlockBackend>>) {
        self.backing_file = backing;
    }

@@ -1221,7 +1211,7 @@ impl QcowFile {
    }

    // Allocate and initialize a new data cluster. Returns the offset of the
-    // cluster into the file on success.
+    // cluster in to the file on success.
    fn append_data_cluster(&mut self, initial_data: Option<Vec<u8>>) -> std::io::Result<u64> {
        let new_addr: u64 = self.get_new_cluster(initial_data)?;
        // The cluster refcount starts at one indicating it is used but doesn't need COW.
@@ -1639,7 +1629,7 @@ impl PunchHole for QcowFile {
        let mut remaining = length;
        let mut offset = offset;
        while remaining > 0 {
-            let chunk_length = min(remaining, usize::MAX as u64) as usize;
+            let chunk_length = min(remaining, std::usize::MAX as u64) as usize;
            self.deallocate_bytes(offset, chunk_length)?;
            remaining -= chunk_length as u64;
            offset += chunk_length as u64;
@@ -1799,17 +1789,11 @@ where
 /// Copy the contents of a disk image in `src_file` into `dst_file`.
 /// The type of `src_file` is automatically detected, and the output file type is
 /// determined by `dst_type`.
-pub fn convert(
-    mut src_file: RawFile,
-    dst_file: RawFile,
-    dst_type: ImageType,
-    src_max_nesting_depth: u32,
-) -> Result<()> {
+pub fn convert(mut src_file: RawFile, dst_file: RawFile, dst_type: ImageType) -> Result<()> {
    let src_type = detect_image_type(&mut src_file)?;
    match src_type {
        ImageType::Qcow2 => {
-            let mut src_reader =
-                QcowFile::from_with_nesting_depth(src_file, src_max_nesting_depth)?;
+            let mut src_reader = QcowFile::from(src_file)?;
            convert_reader(&mut src_reader, dst_file, dst_type)
        }
        ImageType::Raw => {
@@ -1838,9 +1822,7 @@ pub fn detect_image_type(file: &mut RawFile) -> Result<ImageType> {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use std::fs::File;
-    use std::path::Path;
-    use vmm_sys_util::tempdir::TempDir;
+    use std::io::{Read, Seek, SeekFrom, Write};
    use vmm_sys_util::tempfile::TempFile;
    use vmm_sys_util::write_zeroes::WriteZeroes;

@@ -2040,82 +2022,6 @@ mod tests {
        assert_eq!(read_header.backing_file_path, header.backing_file_path);
    }

-    #[test]
-    fn no_backing_file() {
-        // `backing_file` is `None`
-        let header = QcowHeader::create_for_size_and_path(3, 0x10_0000, None)
-            .expect("Failed to create header.");
-        let mut disk_file: RawFile = RawFile::new(TempFile::new().unwrap().into_file(), false);
-        header
-            .write_to(&mut disk_file)
-            .expect("Failed to write header to shm.");
-        disk_file.rewind().unwrap();
-        // The maximum nesting depth is 0, which means backing file is not allowed.
-        let res = QcowFile::from_with_nesting_depth(disk_file, 0);
-        assert!(res.is_ok());
-    }
-
-    #[test]
-    fn disable_backing_file() {
-        // `backing_file` is `Some`
-        let header =
-            QcowHeader::create_for_size_and_path(3, 0x10_0000, Some("/path/to/backing/file"))
-                .expect("Failed to create header.");
-        let mut disk_file: RawFile = RawFile::new(TempFile::new().unwrap().into_file(), false);
-        header
-            .write_to(&mut disk_file)
-            .expect("Failed to write header to shm.");
-        disk_file.rewind().unwrap();
-        // The maximum nesting depth is 0, which means backing file is not allowed.
-        let res = QcowFile::from_with_nesting_depth(disk_file, 0);
-        assert!(res.is_err());
-        assert!(matches!(res.unwrap_err(), Error::MaxNestingDepthExceeded));
-    }
-
-    /// Create a qcow2 file with itself as its backing file.
-    ///
-    /// Without configuration `max_nesting_depth`, this will cause infinite recursion when loading
-    /// the file until stack overflow.
-    fn new_self_referential_qcow(path: &Path) -> Result<()> {
-        let header = QcowHeader::create_for_size_and_path(3, 0x10_0000, path.to_str())?;
-        let mut disk_file = RawFile::new(
-            File::create(path).expect("Failed to create image file."),
-            false,
-        );
-        header.write_to(&mut disk_file)?;
-        Ok(())
-    }
-
-    #[test]
-    fn max_nesting_backing() {
-        let test_dir = TempDir::new_with_prefix("/tmp/ch").unwrap();
-        let img_path = test_dir.as_path().join("test.img");
-
-        new_self_referential_qcow(img_path.as_path()).unwrap();
-
-        let err = QcowFile::from_with_nesting_depth(
-            RawFile::new(
-                File::open(img_path.as_path()).expect("Failed to open qcow image file"),
-                false,
-            ),
-            MAX_NESTING_DEPTH,
-        )
-        .expect_err("Opening qcow file with itself as backing file should fail.");
-
-        // This type of error is complex. For comparing easily, we can check if it contains the
-        // type name after formatting.
-        assert!(format!("{err:?}").contains(&format!("{:?}", Error::MaxNestingDepthExceeded)));
-        // This should recursively call the function ten times before throwing an error, and the
-        // error `BackingFileOpen` should also be repeated ten times.
-        assert_eq!(
-            format!("{err:?}")
-                .matches("BackingFileOpen")
-                .collect::<Vec<_>>()
-                .len() as u32,
-            MAX_NESTING_DEPTH,
-        );
-    }
-
    #[test]
    fn invalid_magic() {
        let invalid_header = vec![0x51u8, 0x46, 0x4a, 0xfb];
--- a/block/src/qcow/qcow_raw_file.rs
+++ b/block/src/qcow/qcow_raw_file.rs
@@ -1,8 +1,6 @@
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-BSD-3-Clause file.
-//
-// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause

 use super::RawFile;
 use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
--- a/block/src/qcow/raw_file.rs
+++ b/block/src/qcow/raw_file.rs
@@ -11,6 +11,7 @@
 use crate::BlockBackend;
 use libc::c_void;
 use std::alloc::{alloc_zeroed, dealloc, Layout};
+use std::convert::TryInto;
 use std::fs::{File, Metadata};
 use std::io::{self, Read, Seek, SeekFrom, Write};
 use std::os::unix::io::{AsRawFd, RawFd};
--- a/block/src/qcow/refcount.rs
+++ b/block/src/qcow/refcount.rs
@@ -1,40 +1,51 @@
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-BSD-3-Clause file.
-//
-// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause

+use std::fmt::{self, Display};
 use std::io;

 use libc::EINVAL;
-use thiserror::Error;

 use crate::qcow::{
    qcow_raw_file::QcowRawFile,
    vec_cache::{CacheMap, Cacheable, VecCache},
 };

-#[derive(Debug, Error)]
+#[derive(Debug)]
 pub enum Error {
    /// `EvictingCache` - Error writing a refblock from the cache to disk.
-    #[error("Failed to write a refblock from the cache to disk: {0}")]
    EvictingRefCounts(io::Error),
    /// `InvalidIndex` - Address requested isn't within the range of the disk.
-    #[error("Address requested is not within the range of the disk")]
    InvalidIndex,
    /// `NeedCluster` - Handle this error by reading the cluster and calling the function again.
-    #[error("Cluster with addr={0} needs to be read")]
    NeedCluster(u64),
    /// `NeedNewCluster` - Handle this error by allocating a cluster and calling the function again.
-    #[error("New cluster needs to be allocated for refcounts")]
    NeedNewCluster,
-    /// `ReadingRefCounts` - Error reading the file into the refcount cache.
-    #[error("Failed to read the file into the refcount cache: {0}")]
+    /// `ReadingRefCounts` - Error reading the file in to the refcount cache.
    ReadingRefCounts(io::Error),
 }

 pub type Result<T> = std::result::Result<T, Error>;

+impl Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        use self::Error::*;
+
+        match self {
+            EvictingRefCounts(e) => {
+                write!(f, "failed to write a refblock from the cache to disk: {e}")
+            }
+            InvalidIndex => write!(f, "address requested is not within the range of the disk"),
+            NeedCluster(addr) => write!(f, "cluster with addr={addr} needs to be read"),
+            NeedNewCluster => write!(f, "new cluster needs to be allocated for refcounts"),
+            ReadingRefCounts(e) => {
+                write!(f, "failed to read the file into the refcount cache: {e}")
+            }
+        }
+    }
+}
+
 /// Represents the refcount entries for an open qcow file.
 #[derive(Clone, Debug)]
 pub struct RefCount {
--- a/block/src/qcow/vec_cache.rs
+++ b/block/src/qcow/vec_cache.rs
@@ -1,8 +1,6 @@
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-BSD-3-Clause file.
-//
-// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause

 use std::collections::hash_map::IterMut;
 use std::collections::HashMap;
--- a/block/src/vhd.rs
+++ b/block/src/vhd.rs
@@ -3,6 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0

 use crate::{read_aligned_block_size, DiskTopology};
+use std::convert::TryInto;
 use std::fs::File;
 use std::io::{Seek, SeekFrom};

--- a/block/src/vhdx/vhdx_header.rs
+++ b/block/src/vhdx/vhdx_header.rs
@@ -7,6 +7,7 @@ extern crate log;
 use byteorder::{ByteOrder, LittleEndian, ReadBytesExt};
 use remain::sorted;
 use std::collections::btree_map::BTreeMap;
+use std::convert::TryInto;
 use std::fs::File;
 use std::io::{self, Read, Seek, SeekFrom, Write};
 use std::mem::size_of;
@@ -90,7 +91,7 @@ pub type Result<T> = std::result::Result<T, VhdxHeaderError>;

 #[derive(Clone, Debug)]
 pub struct FileTypeIdentifier {
-    pub _signature: u64,
+    pub signature: u64,
 }

 impl FileTypeIdentifier {
@@ -98,14 +99,14 @@ impl FileTypeIdentifier {
    pub fn new(f: &mut File) -> Result<FileTypeIdentifier> {
        f.seek(SeekFrom::Start(FILE_START))
            .map_err(VhdxHeaderError::SeekFileTypeIdentifier)?;
-        let _signature = f
+        let signature = f
            .read_u64::<LittleEndian>()
            .map_err(VhdxHeaderError::ReadFileTypeIdentifier)?;
-        if _signature != VHDX_SIGN {
+        if signature != VHDX_SIGN {
            return Err(VhdxHeaderError::InvalidVHDXSign);
        }

-        Ok(FileTypeIdentifier { _signature })
+        Ok(FileTypeIdentifier { signature })
    }
 }

@@ -127,7 +128,7 @@ pub struct Header {
 impl Header {
    /// Reads the Header structure from a reference VHDx file
    pub fn new(f: &mut File, start: u64) -> Result<Header> {
-        // Read the whole header into a buffer. We will need it for
+        // Read the whole header in to a buffer. We will need it for
        // calculating checksum.
        let mut buffer = [0; HEADER_SIZE as usize];
        f.seek(SeekFrom::Start(start))
@@ -352,6 +353,12 @@ impl RegionTableEntry {
    }
 }

+#[derive(Clone, Debug)]
+struct RegionEntry {
+    _start: u64,
+    _end: u64,
+}
+
 enum HeaderNo {
    First,
    Second,
@@ -470,7 +477,7 @@ impl VhdxHeader {
 pub fn calculate_checksum(buffer: &mut [u8], csum_offset: usize) -> Result<u32> {
    // Read the checksum into a mutable slice
    let csum_buf = &mut buffer[csum_offset..csum_offset + 4];
-    // Convert the checksum chunk into a u32 integer
+    // Convert the checksum chunk in to a u32 integer
    let orig_csum = LittleEndian::read_u32(csum_buf);
    // Zero the checksum in the buffer
    LittleEndian::write_u32(csum_buf, 0);
--- a/devices/Cargo.toml
+++ b/devices/Cargo.toml
@@ -1,31 +1,27 @@
 [package]
-authors = ["The Chromium OS Authors"]
-edition = "2021"
 name = "devices"
 version = "0.1.0"
+authors = ["The Chromium OS Authors"]
+edition = "2021"

 [dependencies]
-acpi_tables = { git = "https://github.com/rust-vmm/acpi_tables", branch = "main" }
-anyhow = "1.0.86"
+acpi_tables = { git = "https://github.com/rust-vmm/acpi_tables", branch = "main"  }
+anyhow = "1.0.75"
 arch = { path = "../arch" }
-bitflags = "2.6.0"
-byteorder = "1.5.0"
+bitflags = "2.4.1"
+byteorder = "1.4.3"
 event_monitor = { path = "../event_monitor" }
 hypervisor = { path = "../hypervisor" }
-libc = "0.2.155"
-log = "0.4.22"
-num_enum = "0.7.2"
+libc = "0.2.147"
+log = "0.4.20"
 pci = { path = "../pci" }
-serde = { version = "1.0.197", features = ["derive"] }
-thiserror = "1.0.62"
+thiserror = "1.0.40"
 tpm = { path = "../tpm" }
+versionize = "0.2.0"
+versionize_derive = "0.1.6"
 vm-allocator = { path = "../vm-allocator" }
 vm-device = { path = "../vm-device" }
-vm-memory = { version = "0.14.1", features = [
-  "backend-atomic",
-  "backend-bitmap",
-  "backend-mmap",
-] }
+vm-memory = "0.14.0"
 vm-migration = { path = "../vm-migration" }
 vmm-sys-util = "0.12.1"

@@ -34,4 +30,3 @@ arch = { path = "../arch" }

 [features]
 default = []
-pvmemcontrol = []
--- a/devices/src/debug_console.rs
+++ b/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 {}
--- a/devices/src/interrupt_controller.rs
+++ b/devices/src/interrupt_controller.rs
@@ -4,42 +4,31 @@

 use std::io;
 use std::result;
-use thiserror::Error;
 use vmm_sys_util::eventfd::EventFd;

-#[derive(Debug, Error)]
+#[derive(Debug)]
 pub enum Error {
    /// Invalid trigger mode.
-    #[error("Invalid trigger mode")]
    InvalidTriggerMode,
    /// Invalid delivery mode.
-    #[error("Invalid delivery mode")]
    InvalidDeliveryMode,
    /// Failed creating the interrupt source group.
-    #[error("Failed creating the interrupt source group: {0}")]
    CreateInterruptSourceGroup(io::Error),
    /// Failed triggering the interrupt.
-    #[error("Failed triggering the interrupt: {0}")]
    TriggerInterrupt(io::Error),
    /// Failed masking the interrupt.
-    #[error("Failed masking the interrupt: {0}")]
    MaskInterrupt(io::Error),
    /// Failed unmasking the interrupt.
-    #[error("Failed unmasking the interrupt: {0}")]
    UnmaskInterrupt(io::Error),
    /// Failed updating the interrupt.
-    #[error("Failed updating the interrupt: {0}")]
    UpdateInterrupt(io::Error),
    /// Failed enabling the interrupt.
-    #[error("Failed enabling the interrupt: {0}")]
    EnableInterrupt(io::Error),
    #[cfg(target_arch = "aarch64")]
    /// Failed creating GIC device.
-    #[error("Failed creating GIC device: {0}")]
    CreateGic(hypervisor::HypervisorVmError),
    #[cfg(target_arch = "aarch64")]
    /// Failed restoring GIC device.
-    #[error("Failed restoring GIC device: {0}")]
    RestoreGic(hypervisor::arch::aarch64::gic::Error),
 }

--- a/devices/src/ioapic.rs
+++ b/devices/src/ioapic.rs
@@ -11,16 +11,19 @@

 use super::interrupt_controller::{Error, InterruptController};
 use byteorder::{ByteOrder, LittleEndian};
-use serde::{Deserialize, Serialize};
 use std::result;
 use std::sync::{Arc, Barrier};
+use versionize::{VersionMap, Versionize, VersionizeResult};
+use versionize_derive::Versionize;
 use vm_device::interrupt::{
    InterruptIndex, InterruptManager, InterruptSourceConfig, InterruptSourceGroup,
    MsiIrqGroupConfig, MsiIrqSourceConfig,
 };
 use vm_device::BusDevice;
 use vm_memory::GuestAddress;
-use vm_migration::{Migratable, MigratableError, Pausable, Snapshot, Snapshottable, Transportable};
+use vm_migration::{
+    Migratable, MigratableError, Pausable, Snapshot, Snapshottable, Transportable, VersionMapped,
+};
 use vmm_sys_util::eventfd::EventFd;

 type Result<T> = result::Result<T, Error>;
@@ -133,7 +136,7 @@ pub struct Ioapic {
    interrupt_source_group: Arc<dyn InterruptSourceGroup>,
 }

-#[derive(Serialize, Deserialize)]
+#[derive(Versionize)]
 pub struct IoapicState {
    id_reg: u32,
    reg_sel: u32,
@@ -141,6 +144,7 @@ pub struct IoapicState {
    used_entries: [bool; NUM_IOAPIC_PINS],
    apic_address: u64,
 }
+impl VersionMapped for IoapicState {}

 impl BusDevice for Ioapic {
    fn read(&mut self, _base: u64, offset: u64, data: &mut [u8]) {
@@ -416,7 +420,7 @@ impl InterruptController for Ioapic {
        self.interrupt_source_group
            .trigger(irq as InterruptIndex)
            .map_err(Error::TriggerInterrupt)?;
-        debug!("Interrupt {irq} successfully delivered");
+        debug!("Interrupt successfully delivered");

        // If trigger mode is level sensitive, set the Remote IRR bit.
        // It will be cleared when the EOI is received.
@@ -440,7 +444,7 @@ impl Snapshottable for Ioapic {
    }

    fn snapshot(&mut self) -> std::result::Result<Snapshot, MigratableError> {
-        Snapshot::new_from_state(&self.state())
+        Snapshot::new_from_versioned_state(&self.state())
    }
 }

--- a/devices/src/legacy/cmos.rs
+++ b/devices/src/legacy/cmos.rs
@@ -1,8 +1,6 @@
 // Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-//
-// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause

 use libc::{clock_gettime, gmtime_r, timespec, tm, CLOCK_REALTIME};
 use std::cmp::min;
--- a/devices/src/legacy/gpio_pl061.rs
+++ b/devices/src/legacy/gpio_pl061.rs
@@ -8,14 +8,16 @@
 //!

 use crate::{read_le_u32, write_le_u32};
-use serde::{Deserialize, Serialize};
-use std::io;
 use std::result;
 use std::sync::{Arc, Barrier};
-use thiserror::Error;
+use std::{fmt, io};
+use versionize::{VersionMap, Versionize, VersionizeResult};
+use versionize_derive::Versionize;
 use vm_device::interrupt::InterruptSourceGroup;
 use vm_device::BusDevice;
-use vm_migration::{Migratable, MigratableError, Pausable, Snapshot, Snapshottable, Transportable};
+use vm_migration::{
+    Migratable, MigratableError, Pausable, Snapshot, Snapshottable, Transportable, VersionMapped,
+};

 const OFS_DATA: u64 = 0x400; // Data Register
 const GPIODIR: u64 = 0x400; // Direction Register
@@ -38,18 +40,29 @@ const GPIO_ID_HIGH: u64 = 0x1000;

 const N_GPIOS: u32 = 8;

-#[derive(Debug, Error)]
+#[derive(Debug)]
 pub enum Error {
-    #[error("Bad Write Offset: {0}")]
    BadWriteOffset(u64),
-    #[error("GPIO interrupt disabled by guest driver.")]
    GpioInterruptDisabled,
-    #[error("Could not trigger GPIO interrupt: {0}.")]
    GpioInterruptFailure(io::Error),
-    #[error("Invalid GPIO Input key triggered: {0}.")]
    GpioTriggerKeyFailure(u32),
 }

+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Error::BadWriteOffset(offset) => write!(f, "Bad Write Offset: {offset}"),
+            Error::GpioInterruptDisabled => write!(f, "GPIO interrupt disabled by guest driver.",),
+            Error::GpioInterruptFailure(ref e) => {
+                write!(f, "Could not trigger GPIO interrupt: {e}.")
+            }
+            Error::GpioTriggerKeyFailure(key) => {
+                write!(f, "Invalid GPIO Input key triggered: {key}.")
+            }
+        }
+    }
+}
+
 type Result<T> = result::Result<T, Error>;

 /// A GPIO device following the PL061 specification.
@@ -76,7 +89,7 @@ pub struct Gpio {
    interrupt: Arc<dyn InterruptSourceGroup>,
 }

-#[derive(Serialize, Deserialize)]
+#[derive(Versionize)]
 pub struct GpioState {
    data: u32,
    old_in_data: u32,
@@ -89,6 +102,8 @@ pub struct GpioState {
    afsel: u32,
 }

+impl VersionMapped for GpioState {}
+
 impl Gpio {
    /// Constructs an PL061 GPIO device.
    pub fn new(
@@ -313,7 +328,7 @@ impl Snapshottable for Gpio {
    }

    fn snapshot(&mut self) -> std::result::Result<Snapshot, MigratableError> {
-        Snapshot::new_from_state(&self.state())
+        Snapshot::new_from_versioned_state(&self.state())
    }
 }

@@ -324,6 +339,8 @@ impl Migratable for Gpio {}
 #[cfg(test)]
 mod tests {
    use super::*;
+    use crate::{read_le_u32, write_le_u32};
+    use std::sync::Arc;
    use vm_device::interrupt::{InterruptIndex, InterruptSourceConfig};
    use vmm_sys_util::eventfd::EventFd;

--- a/devices/src/legacy/i8042.rs
+++ b/devices/src/legacy/i8042.rs
@@ -1,8 +1,6 @@
 // Copyright 2017 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-BSD-3-Clause file.
-//
-// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause

 use std::sync::{
    atomic::{AtomicBool, Ordering},
--- a/devices/src/legacy/rtc_pl031.rs
+++ b/devices/src/legacy/rtc_pl031.rs
@@ -9,10 +9,10 @@
 //! a real-time clock input.
 //!
 use crate::{read_le_u32, write_le_u32};
+use std::fmt;
 use std::sync::{Arc, Barrier};
 use std::time::Instant;
 use std::{io, result};
-use thiserror::Error;
 use vm_device::interrupt::InterruptSourceGroup;
 use vm_device::BusDevice;

@@ -39,14 +39,21 @@ const AMBA_ID_HIGH: u64 = 0x1000;
 /// Constant to convert seconds to nanoseconds.
 pub const NANOS_PER_SECOND: u64 = 1_000_000_000;

-#[derive(Debug, Error)]
+#[derive(Debug)]
 pub enum Error {
-    #[error("Bad Write Offset: {0}")]
    BadWriteOffset(u64),
-    #[error("Failed to trigger interrupt: {0}")]
    InterruptFailure(io::Error),
 }

+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Error::BadWriteOffset(offset) => write!(f, "Bad Write Offset: {offset}"),
+            Error::InterruptFailure(e) => write!(f, "Failed to trigger interrupt: {e}"),
+        }
+    }
+}
+
 type Result<T> = result::Result<T, Error>;

 /// Wrapper over `libc::clockid_t` to specify Linux Kernel clock source.
@@ -72,6 +79,98 @@ impl From<ClockType> for libc::clockid_t {
    }
 }

+/// Structure representing the date in local time with nanosecond precision.
+pub struct LocalTime {
+    /// Seconds in current minute.
+    sec: i32,
+    /// Minutes in current hour.
+    min: i32,
+    /// Hours in current day, 24H format.
+    hour: i32,
+    /// Days in current month.
+    mday: i32,
+    /// Months in current year.
+    mon: i32,
+    /// Years passed since 1900 BC.
+    year: i32,
+    /// Nanoseconds in current second.
+    nsec: i64,
+}
+
+impl LocalTime {
+    /// Returns the [LocalTime](struct.LocalTime.html) structure for the calling moment.
+    #[cfg(test)]
+    pub fn now() -> LocalTime {
+        let mut timespec = libc::timespec {
+            tv_sec: 0,
+            tv_nsec: 0,
+        };
+        let mut tm: libc::tm = libc::tm {
+            tm_sec: 0,
+            tm_min: 0,
+            tm_hour: 0,
+            tm_mday: 0,
+            tm_mon: 0,
+            tm_year: 0,
+            tm_wday: 0,
+            tm_yday: 0,
+            tm_isdst: 0,
+            tm_gmtoff: 0,
+            tm_zone: std::ptr::null(),
+        };
+
+        // SAFETY: the parameters are valid.
+        unsafe {
+            libc::clock_gettime(libc::CLOCK_REALTIME, &mut timespec);
+            libc::localtime_r(&timespec.tv_sec, &mut tm);
+        }
+
+        LocalTime {
+            sec: tm.tm_sec,
+            min: tm.tm_min,
+            hour: tm.tm_hour,
+            mday: tm.tm_mday,
+            mon: tm.tm_mon,
+            year: tm.tm_year,
+            nsec: timespec.tv_nsec,
+        }
+    }
+}
+
+impl fmt::Display for LocalTime {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(
+            f,
+            "{}-{:02}-{:02}T{:02}:{:02}:{:02}.{:09}",
+            self.year + 1900,
+            self.mon + 1,
+            self.mday,
+            self.hour,
+            self.min,
+            self.sec,
+            self.nsec
+        )
+    }
+}
+
+/// Holds a micro-second resolution timestamp with both the real time and cpu time.
+#[derive(Clone)]
+pub struct TimestampUs {
+    /// Real time in microseconds.
+    pub time_us: u64,
+    /// Cpu time in microseconds.
+    pub cputime_us: u64,
+}
+
+impl Default for TimestampUs {
+    fn default() -> TimestampUs {
+        TimestampUs {
+            time_us: get_time(ClockType::Monotonic) / 1000,
+            cputime_us: get_time(ClockType::ProcessCpu) / 1000,
+        }
+    }
+}
+
 /// Returns a timestamp in nanoseconds based on the provided clock type.
 ///
 /// # Arguments
@@ -230,78 +329,15 @@ impl BusDevice for Rtc {
 mod tests {
    use super::*;
    use crate::{
-        read_be_u16, read_be_u32, read_le_i32, read_le_u16, read_le_u64, write_be_u16,
-        write_be_u32, write_le_i32, write_le_u16, write_le_u64,
+        read_be_u16, read_be_u32, read_le_i32, read_le_u16, read_le_u32, read_le_u64, write_be_u16,
+        write_be_u32, write_le_i32, write_le_u16, write_le_u32, write_le_u64,
    };
+    use std::sync::Arc;
    use vm_device::interrupt::{InterruptIndex, InterruptSourceConfig};
    use vmm_sys_util::eventfd::EventFd;

    const LEGACY_RTC_MAPPED_IO_START: u64 = 0x0901_0000;

-    struct LocalTime {
-        sec: i32,
-        min: i32,
-        hour: i32,
-        mday: i32,
-        mon: i32,
-        year: i32,
-        nsec: i64,
-    }
-
-    impl LocalTime {
-        fn now() -> LocalTime {
-            let mut timespec = libc::timespec {
-                tv_sec: 0,
-                tv_nsec: 0,
-            };
-            let mut tm: libc::tm = libc::tm {
-                tm_sec: 0,
-                tm_min: 0,
-                tm_hour: 0,
-                tm_mday: 0,
-                tm_mon: 0,
-                tm_year: 0,
-                tm_wday: 0,
-                tm_yday: 0,
-                tm_isdst: 0,
-                tm_gmtoff: 0,
-                tm_zone: std::ptr::null(),
-            };
-
-            // SAFETY: the parameters are valid.
-            unsafe {
-                libc::clock_gettime(libc::CLOCK_REALTIME, &mut timespec);
-                libc::localtime_r(&timespec.tv_sec, &mut tm);
-            }
-
-            LocalTime {
-                sec: tm.tm_sec,
-                min: tm.tm_min,
-                hour: tm.tm_hour,
-                mday: tm.tm_mday,
-                mon: tm.tm_mon,
-                year: tm.tm_year,
-                nsec: timespec.tv_nsec,
-            }
-        }
-    }
-
-    impl std::fmt::Display for LocalTime {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            write!(
-                f,
-                "{}-{:02}-{:02}T{:02}:{:02}:{:02}.{:09}",
-                self.year + 1900,
-                self.mon + 1,
-                self.mday,
-                self.hour,
-                self.min,
-                self.sec,
-                self.nsec
-            )
-        }
-    }
-
    #[test]
    fn test_get_time() {
        for _ in 0..1000 {
--- a/devices/src/legacy/serial.rs
+++ b/devices/src/legacy/serial.rs
@@ -5,13 +5,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-BSD-3-Clause file.

-use serde::{Deserialize, Serialize};
 use std::collections::VecDeque;
 use std::sync::{Arc, Barrier};
 use std::{io, result};
+use versionize::{VersionMap, Versionize, VersionizeResult};
+use versionize_derive::Versionize;
 use vm_device::interrupt::InterruptSourceGroup;
 use vm_device::BusDevice;
-use vm_migration::{Migratable, MigratableError, Pausable, Snapshot, Snapshottable, Transportable};
+use vm_migration::{
+    Migratable, MigratableError, Pausable, Snapshot, Snapshottable, Transportable, VersionMapped,
+};
 use vmm_sys_util::errno::Result;

 const LOOP_SIZE: usize = 0x40;
@@ -71,7 +74,7 @@ pub struct Serial {
    out: Option<Box<dyn io::Write + Send>>,
 }

-#[derive(Serialize, Deserialize)]
+#[derive(Versionize)]
 pub struct SerialState {
    interrupt_enable: u8,
    interrupt_identification: u8,
@@ -83,6 +86,7 @@ pub struct SerialState {
    baud_divisor: u16,
    in_buffer: Vec<u8>,
 }
+impl VersionMapped for SerialState {}

 impl Serial {
    pub fn new(
@@ -330,7 +334,7 @@ impl Snapshottable for Serial {
    }

    fn snapshot(&mut self) -> std::result::Result<Snapshot, MigratableError> {
-        Snapshot::new_from_state(&self.state())
+        Snapshot::new_from_versioned_state(&self.state())
    }
 }

@@ -341,7 +345,8 @@ impl Migratable for Serial {}
 #[cfg(test)]
 mod tests {
    use super::*;
-    use std::sync::Mutex;
+    use std::io;
+    use std::sync::{Arc, Mutex};
    use vm_device::interrupt::{InterruptIndex, InterruptSourceConfig};
    use vmm_sys_util::eventfd::EventFd;

@@ -411,11 +416,14 @@ mod tests {
            None,
        );

-        serial.write(0, DATA as u64, b"xy");
-        serial.write(0, DATA as u64, b"a");
-        serial.write(0, DATA as u64, b"b");
-        serial.write(0, DATA as u64, b"c");
-        assert_eq!(serial_out.buf.lock().unwrap().as_slice(), b"abc");
+        serial.write(0, DATA as u64, &[b'x', b'y']);
+        serial.write(0, DATA as u64, &[b'a']);
+        serial.write(0, DATA as u64, &[b'b']);
+        serial.write(0, DATA as u64, &[b'c']);
+        assert_eq!(
+            serial_out.buf.lock().unwrap().as_slice(),
+            &[b'a', b'b', b'c']
+        );
    }

    #[test]
@@ -433,7 +441,7 @@ mod tests {
        // counter doesn't change (for 0 it blocks)
        assert!(intr_evt.write(1).is_ok());
        serial.write(0, IER as u64, &[IER_RECV_BIT]);
-        serial.queue_input_bytes(b"abc").unwrap();
+        serial.queue_input_bytes(&[b'a', b'b', b'c']).unwrap();

        assert_eq!(intr_evt.read().unwrap(), 2);

@@ -470,7 +478,7 @@ mod tests {
        // counter doesn't change (for 0 it blocks)
        assert!(intr_evt.write(1).is_ok());
        serial.write(0, IER as u64, &[IER_THR_BIT]);
-        serial.write(0, DATA as u64, b"a");
+        serial.write(0, DATA as u64, &[b'a']);

        assert_eq!(intr_evt.read().unwrap(), 2);
        let mut data = [0u8];
@@ -512,9 +520,9 @@ mod tests {
        );

        serial.write(0, MCR as u64, &[MCR_LOOP_BIT]);
-        serial.write(0, DATA as u64, b"a");
-        serial.write(0, DATA as u64, b"b");
-        serial.write(0, DATA as u64, b"c");
+        serial.write(0, DATA as u64, &[b'a']);
+        serial.write(0, DATA as u64, &[b'b']);
+        serial.write(0, DATA as u64, &[b'c']);

        let mut data = [0u8];
        serial.read(0, MSR as u64, &mut data[..]);
--- a/devices/src/legacy/uart_pl011.rs
+++ b/devices/src/legacy/uart_pl011.rs
@@ -7,15 +7,18 @@
 //!

 use crate::{read_le_u32, write_le_u32};
-use serde::{Deserialize, Serialize};
 use std::collections::VecDeque;
+use std::fmt;
 use std::sync::{Arc, Barrier};
 use std::time::Instant;
 use std::{io, result};
-use thiserror::Error;
+use versionize::{VersionMap, Versionize, VersionizeResult};
+use versionize_derive::Versionize;
 use vm_device::interrupt::InterruptSourceGroup;
 use vm_device::BusDevice;
-use vm_migration::{Migratable, MigratableError, Pausable, Snapshot, Snapshottable, Transportable};
+use vm_migration::{
+    Migratable, MigratableError, Pausable, Snapshot, Snapshottable, Transportable, VersionMapped,
+};

 /* Registers */
 const UARTDR: u64 = 0;
@@ -45,20 +48,27 @@ const PL011_ID: [u8; 8] = [0x11, 0x10, 0x14, 0x00, 0x0d, 0xf0, 0x05, 0xb1];
 const AMBA_ID_LOW: u64 = 0x3f8;
 const AMBA_ID_HIGH: u64 = 0x401;

-#[derive(Debug, Error)]
+#[derive(Debug)]
 pub enum Error {
-    #[error("pl011_write: Bad Write Offset: {0}")]
    BadWriteOffset(u64),
-    #[error("pl011: DMA not implemented.")]
    DmaNotImplemented,
-    #[error("Failed to trigger interrupt: {0}")]
    InterruptFailure(io::Error),
-    #[error("Failed to write: {0}")]
    WriteAllFailure(io::Error),
-    #[error("Failed to flush: {0}")]
    FlushFailure(io::Error),
 }

+impl fmt::Display for Error {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        match self {
+            Error::BadWriteOffset(offset) => write!(f, "pl011_write: Bad Write Offset: {offset}"),
+            Error::DmaNotImplemented => write!(f, "pl011: DMA not implemented."),
+            Error::InterruptFailure(e) => write!(f, "Failed to trigger interrupt: {e}"),
+            Error::WriteAllFailure(e) => write!(f, "Failed to write: {e}"),
+            Error::FlushFailure(e) => write!(f, "Failed to flush: {e}"),
+        }
+    }
+}
+
 type Result<T> = result::Result<T, Error>;

 /// A PL011 device following the PL011 specification.
@@ -84,7 +94,7 @@ pub struct Pl011 {
    timestamp: std::time::Instant,
 }

-#[derive(Serialize, Deserialize)]
+#[derive(Versionize)]
 pub struct Pl011State {
    flags: u32,
    lcr: u32,
@@ -103,6 +113,8 @@ pub struct Pl011State {
    read_trigger: u32,
 }

+impl VersionMapped for Pl011State {}
+
 impl Pl011 {
    /// Constructs an AMBA PL011 UART device.
    pub fn new(
@@ -442,7 +454,7 @@ impl Snapshottable for Pl011 {
    }

    fn snapshot(&mut self) -> std::result::Result<Snapshot, MigratableError> {
-        Snapshot::new_from_state(&self.state())
+        Snapshot::new_from_versioned_state(&self.state())
    }
 }

@@ -453,7 +465,8 @@ impl Migratable for Pl011 {}
 #[cfg(test)]
 mod tests {
    use super::*;
-    use std::sync::Mutex;
+    use std::io;
+    use std::sync::{Arc, Mutex};
    use vm_device::interrupt::{InterruptIndex, InterruptSourceConfig};
    use vmm_sys_util::eventfd::EventFd;

@@ -524,11 +537,14 @@ mod tests {
            None,
        );

-        pl011.write(0, UARTDR, b"xy");
-        pl011.write(0, UARTDR, b"a");
-        pl011.write(0, UARTDR, b"b");
-        pl011.write(0, UARTDR, b"c");
-        assert_eq!(pl011_out.buf.lock().unwrap().as_slice(), b"xabc");
+        pl011.write(0, UARTDR, &[b'x', b'y']);
+        pl011.write(0, UARTDR, &[b'a']);
+        pl011.write(0, UARTDR, &[b'b']);
+        pl011.write(0, UARTDR, &[b'c']);
+        assert_eq!(
+            pl011_out.buf.lock().unwrap().as_slice(),
+            &[b'x', b'a', b'b', b'c']
+        );
    }

    #[test]
@@ -546,7 +562,7 @@ mod tests {
        // write 1 to the interrupt event fd, so that read doesn't block in case the event fd
        // counter doesn't change (for 0 it blocks)
        assert!(intr_evt.write(1).is_ok());
-        pl011.queue_input_bytes(b"abc").unwrap();
+        pl011.queue_input_bytes(&[b'a', b'b', b'c']).unwrap();

        assert_eq!(intr_evt.read().unwrap(), 2);

--- a/devices/src/lib.rs
+++ b/devices/src/lib.rs
@@ -15,16 +15,12 @@ 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;
 #[cfg(target_arch = "x86_64")]
 pub mod ioapic;
 pub mod legacy;
-#[cfg(feature = "pvmemcontrol")]
-pub mod pvmemcontrol;
 pub mod pvpanic;
 pub mod tpm;

--- a/devices/src/pvmemcontrol.rs
+++ b/devices/src/pvmemcontrol.rs
@@ -1,819 +0,0 @@
-// Copyright © 2024 Google LLC
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-use num_enum::TryFromPrimitive;
-use pci::{
-    BarReprogrammingParams, PciBarConfiguration, PciBarPrefetchable, PciBarRegionType,
-    PciClassCode, PciConfiguration, PciDevice, PciDeviceError, PciHeaderType, PciSubclass,
-};
-use std::{
-    collections::HashMap,
-    ffi::CString,
-    io, result,
-    sync::{Arc, Barrier, Mutex, RwLock},
-};
-use thiserror::Error;
-use vm_allocator::{page_size::get_page_size, AddressAllocator, SystemAllocator};
-use vm_device::{BusDeviceSync, Resource};
-use vm_memory::{
-    bitmap::AtomicBitmap, Address, ByteValued, Bytes, GuestAddress, GuestAddressSpace, GuestMemory,
-    GuestMemoryAtomic, GuestMemoryError, GuestMemoryMmap, Le32, Le64,
-};
-use vm_migration::{Migratable, MigratableError, Pausable, Snapshot, Snapshottable, Transportable};
-
-const PVMEMCONTROL_VENDOR_ID: u16 = 0x1ae0;
-const PVMEMCONTROL_DEVICE_ID: u16 = 0x0087;
-
-const PVMEMCONTROL_SUBSYSTEM_VENDOR_ID: u16 = 0x1ae0;
-const PVMEMCONTROL_SUBSYSTEM_ID: u16 = 0x011F;
-
-const MAJOR_VERSION: u64 = 1;
-const MINOR_VERSION: u64 = 0;
-
-#[derive(Error, Debug)]
-pub enum Error {
-    // device errors
-    #[error("Guest gave us bad memory addresses: {0}")]
-    GuestMemory(#[source] GuestMemoryError),
-    #[error("Guest sent us invalid request")]
-    InvalidRequest,
-
-    #[error("Guest sent us invalid command: {0}")]
-    InvalidCommand(u32),
-    #[error("Guest sent us invalid connection: {0}")]
-    InvalidConnection(u32),
-
-    // pvmemcontrol errors
-    #[error("Request contains invalid arguments: {0}")]
-    InvalidArgument(u64),
-    #[error("Unknown function code: {0}")]
-    UnknownFunctionCode(u64),
-    #[error("Libc call fail: {0}")]
-    LibcFail(#[source] std::io::Error),
-}
-
-#[derive(Copy, Clone)]
-enum PvmemcontrolSubclass {
-    Other = 0x80,
-}
-
-impl PciSubclass for PvmemcontrolSubclass {
-    fn get_register_value(&self) -> u8 {
-        *self as u8
-    }
-}
-
-/// commands have 0 as the most significant byte
-#[repr(u32)]
-#[derive(PartialEq, Eq, Copy, Clone, TryFromPrimitive)]
-enum PvmemcontrolTransportCommand {
-    Reset = 0x060f_e6d2,
-    Register = 0x0e35_9539,
-    Ready = 0x0ca8_d227,
-    Disconnect = 0x030f_5da0,
-    Ack = 0x03cf_5196,
-    Error = 0x01fb_a249,
-}
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-struct PvmemcontrolTransportRegister {
-    buf_phys_addr: Le64,
-}
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-struct PvmemcontrolTransportRegisterResponse {
-    command: Le32,
-    _padding: u32,
-}
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-union PvmemcontrolTransportUnion {
-    register: PvmemcontrolTransportRegister,
-    register_response: PvmemcontrolTransportRegisterResponse,
-    unit: (),
-}
-
-#[repr(C)]
-#[derive(Copy, Clone)]
-struct PvmemcontrolTransport {
-    payload: PvmemcontrolTransportUnion,
-    command: PvmemcontrolTransportCommand,
-}
-
-const PVMEMCONTROL_DEVICE_MMIO_SIZE: u64 = std::mem::size_of::<PvmemcontrolTransport>() as u64;
-const PVMEMCONTROL_DEVICE_MMIO_ALIGN: u64 = std::mem::align_of::<PvmemcontrolTransport>() as u64;
-
-impl PvmemcontrolTransport {
-    fn ack() -> Self {
-        PvmemcontrolTransport {
-            payload: PvmemcontrolTransportUnion { unit: () },
-            command: PvmemcontrolTransportCommand::Ack,
-        }
-    }
-
-    fn error() -> Self {
-        PvmemcontrolTransport {
-            payload: PvmemcontrolTransportUnion { unit: () },
-            command: PvmemcontrolTransportCommand::Error,
-        }
-    }
-
-    fn register_response(command: u32) -> Self {
-        PvmemcontrolTransport {
-            payload: PvmemcontrolTransportUnion {
-                register_response: PvmemcontrolTransportRegisterResponse {
-                    command: command.into(),
-                    _padding: 0,
-                },
-            },
-            command: PvmemcontrolTransportCommand::Ack,
-        }
-    }
-
-    unsafe fn as_register(self) -> PvmemcontrolTransportRegister {
-        self.payload.register
-    }
-}
-
-// SAFETY: Contains no references and does not have compiler-inserted padding
-unsafe impl ByteValued for PvmemcontrolTransportUnion {}
-// SAFETY: Contains no references and does not have compiler-inserted padding
-unsafe impl ByteValued for PvmemcontrolTransport {}
-
-#[repr(u64)]
-#[derive(Copy, Clone, TryFromPrimitive, Debug)]
-enum FunctionCode {
-    Info = 0,
-    Dontneed = 1,
-    Remove = 2,
-    Free = 3,
-    Pageout = 4,
-    Dontdump = 5,
-    SetVMAAnonName = 6,
-    Mlock = 7,
-    Munlock = 8,
-    MprotectNone = 9,
-    MprotectR = 10,
-    MprotectW = 11,
-    MprotectRW = 12,
-    Mergeable = 13,
-    Unmergeable = 14,
-}
-
-#[repr(C)]
-#[derive(Copy, Clone, Debug, Default)]
-struct PvmemcontrolReq {
-    func_code: Le64,
-    addr: Le64,
-    length: Le64,
-    arg: Le64,
-}
-
-// SAFETY: it only has data and has no implicit padding.
-unsafe impl ByteValued for PvmemcontrolReq {}
-
-#[repr(C)]
-#[derive(Copy, Clone, Default)]
-struct PvmemcontrolResp {
-    ret_errno: Le32,
-    ret_code: Le32,
-    ret_value: Le64,
-    arg0: Le64,
-    arg1: Le64,
-}
-
-impl std::fmt::Debug for PvmemcontrolResp {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let PvmemcontrolResp {
-            ret_errno,
-            ret_code,
-            ..
-        } = self;
-        write!(
-            f,
-            "PvmemcontrolResp {{ ret_errno: {}, ret_code: {}, .. }}",
-            ret_errno.to_native(),
-            ret_code.to_native()
-        )
-    }
-}
-
-// SAFETY: it only has data and has no implicit padding.
-unsafe impl ByteValued for PvmemcontrolResp {}
-
-/// The guest connections start at 0x8000_0000, which has a leading 1 in
-/// the most significant byte, this ensures it does not conflict with
-/// any of the transport commands
-#[derive(Hash, Clone, Copy, PartialEq, Eq, Debug)]
-pub struct GuestConnection {
-    command: u32,
-}
-
-impl Default for GuestConnection {
-    fn default() -> Self {
-        GuestConnection::new(0x8000_0000)
-    }
-}
-
-impl GuestConnection {
-    fn new(command: u32) -> Self {
-        Self { command }
-    }
-
-    fn next(&self) -> Self {
-        let GuestConnection { command } = *self;
-
-        if command == u32::MAX {
-            GuestConnection::default()
-        } else {
-            GuestConnection::new(command + 1)
-        }
-    }
-}
-
-impl TryFrom<u32> for GuestConnection {
-    type Error = Error;
-
-    fn try_from(value: u32) -> Result<Self, Self::Error> {
-        if (value & 0x8000_0000) != 0 {
-            Ok(GuestConnection::new(value))
-        } else {
-            Err(Error::InvalidConnection(value))
-        }
-    }
-}
-
-struct PercpuInitState {
-    port_buf_map: HashMap<GuestConnection, GuestAddress>,
-    next_conn: GuestConnection,
-}
-
-impl PercpuInitState {
-    fn new() -> Self {
-        PercpuInitState {
-            port_buf_map: HashMap::new(),
-            next_conn: GuestConnection::default(),
-        }
-    }
-}
-
-enum PvmemcontrolState {
-    PercpuInit(PercpuInitState),
-    Ready(HashMap<GuestConnection, GuestAddress>),
-    Broken,
-}
-
-pub struct PvmemcontrolDevice {
-    transport: PvmemcontrolTransport,
-    state: PvmemcontrolState,
-}
-
-impl PvmemcontrolDevice {
-    fn new(transport: PvmemcontrolTransport, state: PvmemcontrolState) -> Self {
-        PvmemcontrolDevice { transport, state }
-    }
-}
-
-impl PvmemcontrolDevice {
-    fn register_percpu_buf(
-        guest_memory: &GuestMemoryAtomic<GuestMemoryMmap<AtomicBitmap>>,
-        mut state: PercpuInitState,
-        PvmemcontrolTransportRegister { buf_phys_addr }: PvmemcontrolTransportRegister,
-    ) -> Self {
-        // access to this address is checked
-        let buf_phys_addr = GuestAddress(buf_phys_addr.into());
-        if !guest_memory.memory().check_range(
-            buf_phys_addr,
-            std::mem::size_of::<PvmemcontrolResp>().max(std::mem::size_of::<PvmemcontrolReq>()),
-        ) {
-            warn!("guest sent invalid phys addr {:#x}", buf_phys_addr.0);
-            return PvmemcontrolDevice::new(
-                PvmemcontrolTransport::error(),
-                PvmemcontrolState::Broken,
-            );
-        }
-
-        let conn = {
-            // find an available port+byte combination, and fail if full
-            let mut next_conn = state.next_conn;
-            while state.port_buf_map.contains_key(&next_conn) {
-                next_conn = next_conn.next();
-                if next_conn == state.next_conn {
-                    warn!("connections exhausted");
-                    return PvmemcontrolDevice::new(
-                        PvmemcontrolTransport::error(),
-                        PvmemcontrolState::Broken,
-                    );
-                }
-            }
-            next_conn
-        };
-        state.next_conn = conn.next();
-        state.port_buf_map.insert(conn, buf_phys_addr);
-
-        // inform guest of the connection
-        let response = PvmemcontrolTransport::register_response(conn.command);
-
-        PvmemcontrolDevice::new(response, PvmemcontrolState::PercpuInit(state))
-    }
-
-    fn reset() -> Self {
-        PvmemcontrolDevice::new(
-            PvmemcontrolTransport::ack(),
-            PvmemcontrolState::PercpuInit(PercpuInitState::new()),
-        )
-    }
-
-    fn error() -> Self {
-        PvmemcontrolDevice::new(PvmemcontrolTransport::error(), PvmemcontrolState::Broken)
-    }
-
-    fn ready(PercpuInitState { port_buf_map, .. }: PercpuInitState) -> Self {
-        PvmemcontrolDevice::new(
-            PvmemcontrolTransport::ack(),
-            PvmemcontrolState::Ready(port_buf_map),
-        )
-    }
-
-    fn run_command(
-        &mut self,
-        guest_memory: &GuestMemoryAtomic<GuestMemoryMmap<AtomicBitmap>>,
-        command: PvmemcontrolTransportCommand,
-    ) {
-        let state = std::mem::replace(&mut self.state, PvmemcontrolState::Broken);
-
-        *self = match command {
-            PvmemcontrolTransportCommand::Reset => Self::reset(),
-            PvmemcontrolTransportCommand::Register => {
-                if let PvmemcontrolState::PercpuInit(state) = state {
-                    // SAFETY: By device protocol. If driver is wrong the device
-                    // can enter a Broken state, but the behavior is still sound.
-                    Self::register_percpu_buf(guest_memory, state, unsafe {
-                        self.transport.as_register()
-                    })
-                } else {
-                    debug!("received register without reset");
-                    Self::error()
-                }
-            }
-            PvmemcontrolTransportCommand::Ready => {
-                if let PvmemcontrolState::PercpuInit(state) = state {
-                    Self::ready(state)
-                } else {
-                    debug!("received ready without reset");
-                    Self::error()
-                }
-            }
-            PvmemcontrolTransportCommand::Disconnect => Self::error(),
-            PvmemcontrolTransportCommand::Ack => {
-                debug!("received ack as command");
-                Self::error()
-            }
-            PvmemcontrolTransportCommand::Error => {
-                debug!("received error as command");
-                Self::error()
-            }
-        }
-    }
-
-    /// read from the transport
-    fn read_transport(&self, offset: u64, data: &mut [u8]) {
-        self.transport
-            .as_slice()
-            .iter()
-            .skip(offset as usize)
-            .zip(data.iter_mut())
-            .for_each(|(src, dest)| *dest = *src)
-    }
-
-    /// can only write to transport payload
-    /// command is a special register that needs separate dispatching
-    fn write_transport(&mut self, offset: u64, data: &[u8]) {
-        self.transport
-            .payload
-            .as_mut_slice()
-            .iter_mut()
-            .skip(offset as usize)
-            .zip(data.iter())
-            .for_each(|(dest, src)| *dest = *src)
-    }
-
-    fn find_connection(&self, conn: GuestConnection) -> Option<GuestAddress> {
-        match &self.state {
-            PvmemcontrolState::Ready(map) => map.get(&conn).copied(),
-            _ => None,
-        }
-    }
-}
-
-pub struct PvmemcontrolBusDevice {
-    mem: GuestMemoryAtomic<GuestMemoryMmap<AtomicBitmap>>,
-    dev: RwLock<PvmemcontrolDevice>,
-}
-
-pub struct PvmemcontrolPciDevice {
-    id: String,
-    configuration: PciConfiguration,
-    bar_regions: Vec<PciBarConfiguration>,
-}
-
-impl PvmemcontrolBusDevice {
-    /// f is called with the host address of `range_base` and only when
-    /// [`range_base`, `range_base` + `range_len`) is present in the guest
-    fn operate_on_memory_range<F>(&self, addr: u64, length: u64, f: F) -> result::Result<(), Error>
-    where
-        F: FnOnce(*mut libc::c_void, libc::size_t) -> libc::c_int,
-    {
-        let memory = self.mem.memory();
-        let range_base = GuestAddress(addr);
-        let range_len = usize::try_from(length).map_err(|_| Error::InvalidRequest)?;
-
-        // assume guest memory is not interleaved with vmm memory on the host.
-        if !memory.check_range(range_base, range_len) {
-            return Err(Error::GuestMemory(GuestMemoryError::InvalidGuestAddress(
-                range_base,
-            )));
-        }
-        let hva = memory
-            .get_host_address(range_base)
-            .map_err(Error::GuestMemory)?;
-        let res = f(hva as *mut libc::c_void, range_len as libc::size_t);
-        if res != 0 {
-            return Err(Error::LibcFail(io::Error::last_os_error()));
-        }
-        Ok(())
-    }
-
-    fn madvise(&self, addr: u64, length: u64, advice: libc::c_int) -> result::Result<(), Error> {
-        // SAFETY: [`base`, `base` + `len`) is guest memory
-        self.operate_on_memory_range(addr, length, |base, len| unsafe {
-            libc::madvise(base, len, advice)
-        })
-    }
-
-    fn mlock(&self, addr: u64, length: u64, on_default: bool) -> result::Result<(), Error> {
-        // SAFETY: [`base`, `base` + `len`) is guest memory
-        self.operate_on_memory_range(addr, length, |base, len| unsafe {
-            libc::mlock2(base, len, if on_default { libc::MLOCK_ONFAULT } else { 0 })
-        })
-    }
-
-    fn munlock(&self, addr: u64, length: u64) -> result::Result<(), Error> {
-        // SAFETY: [`base`, `base` + `len`) is guest memory
-        self.operate_on_memory_range(addr, length, |base, len| unsafe {
-            libc::munlock(base, len)
-        })
-    }
-
-    fn mprotect(
-        &self,
-        addr: u64,
-        length: u64,
-        protection: libc::c_int,
-    ) -> result::Result<(), Error> {
-        // SAFETY: [`base`, `base` + `len`) is guest memory
-        self.operate_on_memory_range(addr, length, |base, len| unsafe {
-            libc::mprotect(base, len, protection)
-        })
-    }
-
-    fn set_vma_anon_name(&self, addr: u64, length: u64, name: u64) -> result::Result<(), Error> {
-        let name = (name != 0).then(|| CString::new(format!("pvmemcontrol-{}", name)).unwrap());
-        let name_ptr = if let Some(name) = &name {
-            name.as_ptr()
-        } else {
-            std::ptr::null()
-        };
-        debug!("addr {:X} length {} name {:?}", addr, length, name);
-
-        // SAFETY: [`base`, `base` + `len`) is guest memory
-        self.operate_on_memory_range(addr, length, |base, len| unsafe {
-            libc::prctl(
-                libc::PR_SET_VMA,
-                libc::PR_SET_VMA_ANON_NAME,
-                base,
-                len,
-                name_ptr,
-            )
-        })
-    }
-
-    fn process_request(
-        &self,
-        func_code: FunctionCode,
-        addr: u64,
-        length: u64,
-        arg: u64,
-    ) -> Result<PvmemcontrolResp, Error> {
-        let result = match func_code {
-            FunctionCode::Info => {
-                return Ok(PvmemcontrolResp {
-                    ret_errno: 0.into(),
-                    ret_code: 0.into(),
-                    ret_value: get_page_size().into(),
-                    arg0: MAJOR_VERSION.into(),
-                    arg1: MINOR_VERSION.into(),
-                })
-            }
-            FunctionCode::Dontneed => self.madvise(addr, length, libc::MADV_DONTNEED),
-            FunctionCode::Remove => self.madvise(addr, length, libc::MADV_REMOVE),
-            FunctionCode::Free => self.madvise(addr, length, libc::MADV_FREE),
-            FunctionCode::Pageout => self.madvise(addr, length, libc::MADV_PAGEOUT),
-            FunctionCode::Dontdump => self.madvise(addr, length, libc::MADV_DONTDUMP),
-            FunctionCode::SetVMAAnonName => self.set_vma_anon_name(addr, length, arg),
-            FunctionCode::Mlock => self.mlock(addr, length, false),
-            FunctionCode::Munlock => self.munlock(addr, length),
-            FunctionCode::MprotectNone => self.mprotect(addr, length, libc::PROT_NONE),
-            FunctionCode::MprotectR => self.mprotect(addr, length, libc::PROT_READ),
-            FunctionCode::MprotectW => self.mprotect(addr, length, libc::PROT_WRITE),
-            FunctionCode::MprotectRW => {
-                self.mprotect(addr, length, libc::PROT_READ | libc::PROT_WRITE)
-            }
-            FunctionCode::Mergeable => self.madvise(addr, length, libc::MADV_MERGEABLE),
-            FunctionCode::Unmergeable => self.madvise(addr, length, libc::MADV_UNMERGEABLE),
-        };
-        result.map(|_| PvmemcontrolResp::default())
-    }
-
-    fn handle_request(
-        &self,
-        PvmemcontrolReq {
-            func_code,
-            addr,
-            length,
-            arg,
-        }: PvmemcontrolReq,
-    ) -> Result<PvmemcontrolResp, Error> {
-        let (func_code, addr, length, arg) = (
-            func_code.to_native(),
-            addr.to_native(),
-            length.to_native(),
-            arg.to_native(),
-        );
-
-        let resp_or_err = FunctionCode::try_from(func_code)
-            .map_err(|_| Error::UnknownFunctionCode(func_code))
-            .and_then(|func_code| self.process_request(func_code, addr, length, arg));
-
-        let resp = match resp_or_err {
-            Ok(resp) => resp,
-            Err(e) => match e {
-                Error::InvalidArgument(arg) => PvmemcontrolResp {
-                    ret_errno: (libc::EINVAL as u32).into(),
-                    ret_code: (arg as u32).into(),
-                    ..Default::default()
-                },
-                Error::LibcFail(err) => PvmemcontrolResp {
-                    ret_errno: (err.raw_os_error().unwrap_or(libc::EFAULT) as u32).into(),
-                    ret_code: 0u32.into(),
-                    ..Default::default()
-                },
-                Error::UnknownFunctionCode(func_code) => PvmemcontrolResp {
-                    ret_errno: (libc::EOPNOTSUPP as u32).into(),
-                    ret_code: (func_code as u32).into(),
-                    ..Default::default()
-                },
-                Error::GuestMemory(err) => {
-                    warn!("{}", err);
-                    PvmemcontrolResp {
-                        ret_errno: (libc::EINVAL as u32).into(),
-                        ret_code: (func_code as u32).into(),
-                        ..Default::default()
-                    }
-                }
-                // device error, stop responding
-                other => return Err(other),
-            },
-        };
-        Ok(resp)
-    }
-
-    fn handle_pvmemcontrol_request(&self, guest_addr: GuestAddress) {
-        let request: PvmemcontrolReq = if let Ok(x) = self.mem.memory().read_obj(guest_addr) {
-            x
-        } else {
-            warn!("cannot read from guest address {:#x}", guest_addr.0);
-            return;
-        };
-
-        let response: PvmemcontrolResp = match self.handle_request(request) {
-            Ok(x) => x,
-            Err(e) => {
-                warn!("cannot process request {:?} with error {}", request, e);
-                return;
-            }
-        };
-
-        if self.mem.memory().write_obj(response, guest_addr).is_err() {
-            warn!("cannot write to guest address {:#x}", guest_addr.0);
-        }
-    }
-
-    fn handle_guest_write(&self, offset: u64, data: &[u8]) {
-        if offset as usize != std::mem::offset_of!(PvmemcontrolTransport, command) {
-            if data.len() != 4 && data.len() != 8 {
-                warn!("guest write is not 4 or 8 bytes long");
-                return;
-            }
-            self.dev.write().unwrap().write_transport(offset, data);
-            return;
-        }
-        let data = if data.len() == 4 {
-            let mut d = [0u8; 4];
-            d.iter_mut()
-                .zip(data.iter())
-                .for_each(|(d, data)| *d = *data);
-            d
-        } else {
-            warn!("guest write with non u32 at command register");
-            return;
-        };
-        let data_cmd = u32::from_le_bytes(data);
-        let command = PvmemcontrolTransportCommand::try_from(data_cmd);
-
-        match command {
-            Ok(command) => self.dev.write().unwrap().run_command(&self.mem, command),
-            Err(_) => {
-                GuestConnection::try_from(data_cmd)
-                    .and_then(|conn| {
-                        self.dev
-                            .read()
-                            .unwrap()
-                            .find_connection(conn)
-                            .ok_or(Error::InvalidConnection(conn.command))
-                    })
-                    .map(|gpa| self.handle_pvmemcontrol_request(gpa))
-                    .unwrap_or_else(|err| warn!("{:?}", err));
-            }
-        }
-    }
-
-    fn handle_guest_read(&self, offset: u64, data: &mut [u8]) {
-        self.dev.read().unwrap().read_transport(offset, data)
-    }
-}
-
-impl PvmemcontrolDevice {
-    pub fn make_device(
-        id: String,
-        mem: GuestMemoryAtomic<GuestMemoryMmap<AtomicBitmap>>,
-    ) -> (PvmemcontrolPciDevice, PvmemcontrolBusDevice) {
-        let dev = RwLock::new(PvmemcontrolDevice::error());
-        let mut configuration = PciConfiguration::new(
-            PVMEMCONTROL_VENDOR_ID,
-            PVMEMCONTROL_DEVICE_ID,
-            0x1,
-            PciClassCode::BaseSystemPeripheral,
-            &PvmemcontrolSubclass::Other,
-            None,
-            PciHeaderType::Device,
-            PVMEMCONTROL_SUBSYSTEM_VENDOR_ID,
-            PVMEMCONTROL_SUBSYSTEM_ID,
-            None,
-            None,
-        );
-        let command: [u8; 2] = [0x03, 0x01]; // memory, io, SERR#
-
-        configuration.write_config_register(1, 0, &command);
-        (
-            PvmemcontrolPciDevice {
-                id,
-                configuration,
-                bar_regions: Vec::new(),
-            },
-            PvmemcontrolBusDevice { mem, dev },
-        )
-    }
-}
-
-impl PciDevice for PvmemcontrolPciDevice {
-    fn write_config_register(
-        &mut self,
-        reg_idx: usize,
-        offset: u64,
-        data: &[u8],
-    ) -> Option<Arc<Barrier>> {
-        self.configuration
-            .write_config_register(reg_idx, offset, data);
-        None
-    }
-
-    fn read_config_register(&mut self, reg_idx: usize) -> u32 {
-        self.configuration.read_config_register(reg_idx)
-    }
-
-    fn as_any(&mut self) -> &mut dyn std::any::Any {
-        self
-    }
-
-    fn id(&self) -> Option<String> {
-        Some(self.id.clone())
-    }
-
-    fn detect_bar_reprogramming(
-        &mut self,
-        reg_idx: usize,
-        data: &[u8],
-    ) -> Option<BarReprogrammingParams> {
-        self.configuration.detect_bar_reprogramming(reg_idx, data)
-    }
-
-    fn allocate_bars(
-        &mut self,
-        _allocator: &Arc<Mutex<SystemAllocator>>,
-        mmio32_allocator: &mut AddressAllocator,
-        _mmio64_allocator: &mut AddressAllocator,
-        resources: Option<Vec<Resource>>,
-    ) -> Result<Vec<PciBarConfiguration>, PciDeviceError> {
-        let mut bars = Vec::new();
-        let region_type = PciBarRegionType::Memory32BitRegion;
-        let bar_id = 0;
-        let region_size = PVMEMCONTROL_DEVICE_MMIO_SIZE;
-        let restoring = resources.is_some();
-        let bar_addr = mmio32_allocator
-            .allocate(None, region_size, Some(PVMEMCONTROL_DEVICE_MMIO_ALIGN))
-            .ok_or(PciDeviceError::IoAllocationFailed(region_size))?;
-
-        let bar = PciBarConfiguration::default()
-            .set_index(bar_id as usize)
-            .set_address(bar_addr.raw_value())
-            .set_size(region_size)
-            .set_region_type(region_type)
-            .set_prefetchable(PciBarPrefetchable::NotPrefetchable);
-
-        if !restoring {
-            self.configuration
-                .add_pci_bar(&bar)
-                .map_err(|e| PciDeviceError::IoRegistrationFailed(bar_addr.raw_value(), e))?;
-        }
-
-        bars.push(bar);
-        self.bar_regions.clone_from(&bars);
-        Ok(bars)
-    }
-
-    fn free_bars(
-        &mut self,
-        _allocator: &mut SystemAllocator,
-        mmio32_allocator: &mut AddressAllocator,
-        _mmio64_allocator: &mut AddressAllocator,
-    ) -> Result<(), PciDeviceError> {
-        for bar in self.bar_regions.drain(..) {
-            mmio32_allocator.free(GuestAddress(bar.addr()), bar.size())
-        }
-        Ok(())
-    }
-
-    fn move_bar(&mut self, old_base: u64, new_base: u64) -> result::Result<(), io::Error> {
-        for bar in self.bar_regions.iter_mut() {
-            if bar.addr() == old_base {
-                *bar = bar.set_address(new_base);
-            }
-        }
-        Ok(())
-    }
-}
-
-impl Pausable for PvmemcontrolPciDevice {
-    fn pause(&mut self) -> std::result::Result<(), MigratableError> {
-        Ok(())
-    }
-
-    fn resume(&mut self) -> std::result::Result<(), MigratableError> {
-        Ok(())
-    }
-}
-
-impl Snapshottable for PvmemcontrolPciDevice {
-    fn id(&self) -> String {
-        self.id.clone()
-    }
-
-    fn snapshot(&mut self) -> std::result::Result<Snapshot, MigratableError> {
-        let mut snapshot = Snapshot::new_from_state(&())?;
-
-        // Snapshot PciConfiguration
-        snapshot.add_snapshot(self.configuration.id(), self.configuration.snapshot()?);
-
-        Ok(snapshot)
-    }
-}
-
-impl Transportable for PvmemcontrolPciDevice {}
-impl Migratable for PvmemcontrolPciDevice {}
-
-impl BusDeviceSync for PvmemcontrolBusDevice {
-    fn read(&self, _base: u64, offset: u64, data: &mut [u8]) {
-        self.handle_guest_read(offset, data)
-    }
-
-    fn write(&self, _base: u64, offset: u64, data: &[u8]) -> Option<Arc<Barrier>> {
-        self.handle_guest_write(offset, data);
-        None
-    }
-}
--- a/devices/src/pvpanic.rs
+++ b/devices/src/pvpanic.rs
@@ -9,15 +9,18 @@ use pci::{
    PciClassCode, PciConfiguration, PciDevice, PciDeviceError, PciHeaderType, PciSubclass,
    PCI_CONFIGURATION_ID,
 };
-use serde::{Deserialize, Serialize};
 use std::any::Any;
 use std::result;
 use std::sync::{Arc, Barrier, Mutex};
 use thiserror::Error;
+use versionize::{VersionMap, Versionize, VersionizeResult};
+use versionize_derive::Versionize;
 use vm_allocator::{AddressAllocator, SystemAllocator};
 use vm_device::{BusDevice, Resource};
 use vm_memory::{Address, GuestAddress};
-use vm_migration::{Migratable, MigratableError, Pausable, Snapshot, Snapshottable, Transportable};
+use vm_migration::{
+    Migratable, MigratableError, Pausable, Snapshot, Snapshottable, Transportable, VersionMapped,
+};

 const PVPANIC_VENDOR_ID: u16 = 0x1b36;
 const PVPANIC_DEVICE_ID: u16 = 0x0011;
@@ -57,20 +60,23 @@ pub struct PvPanicDevice {
    bar_regions: Vec<PciBarConfiguration>,
 }

-#[derive(Serialize, Deserialize)]
+#[derive(Versionize)]
 pub struct PvPanicDeviceState {
    events: u8,
 }

+impl VersionMapped for PvPanicDeviceState {}
+
 impl PvPanicDevice {
    pub fn new(id: String, snapshot: Option<Snapshot>) -> Result<Self, PvPanicError> {
        let pci_configuration_state =
-            vm_migration::state_from_id(snapshot.as_ref(), PCI_CONFIGURATION_ID).map_err(|e| {
-                PvPanicError::RetrievePciConfigurationState(anyhow!(
-                    "Failed to get PciConfigurationState from Snapshot: {}",
-                    e
-                ))
-            })?;
+            vm_migration::versioned_state_from_id(snapshot.as_ref(), PCI_CONFIGURATION_ID)
+                .map_err(|e| {
+                    PvPanicError::RetrievePciConfigurationState(anyhow!(
+                        "Failed to get PciConfigurationState from Snapshot: {}",
+                        e
+                    ))
+                })?;

        let mut configuration = PciConfiguration::new(
            PVPANIC_VENDOR_ID,
@@ -91,7 +97,7 @@ impl PvPanicDevice {

        let state: Option<PvPanicDeviceState> = snapshot
            .as_ref()
-            .map(|s| s.to_state())
+            .map(|s| s.to_versioned_state())
            .transpose()
            .map_err(|e| {
                PvPanicError::CreatePvPanicDevice(anyhow!(
@@ -204,7 +210,7 @@ impl PciDevice for PvPanicDevice {
        }

        bars.push(bar);
-        self.bar_regions.clone_from(&bars);
+        self.bar_regions = bars.clone();

        Ok(bars)
    }
@@ -253,7 +259,7 @@ impl Snapshottable for PvPanicDevice {
    }

    fn snapshot(&mut self) -> std::result::Result<Snapshot, MigratableError> {
-        let mut snapshot = Snapshot::new_from_state(&self.state())?;
+        let mut snapshot = Snapshot::new_from_versioned_state(&self.state())?;

        // Snapshot PciConfiguration
        snapshot.add_snapshot(self.configuration.id(), self.configuration.snapshot()?);
--- a/devices/src/tpm.rs
+++ b/devices/src/tpm.rs
@@ -450,7 +450,7 @@ impl BusDevice for Tpm {
                        );
                    }
                    _ => {
-                        error!("Invalid value passed to CTRL_REQ register");
+                        error!("Invalid value passed to CRTL_REQ register");
                        return None;
                    }
                },
--- a/LICENSES/CC-BY-4.0.txt
+++ b/LICENSES/CC-BY-4.0.txt
@@ -1,5 +1,4 @@
-All documentations (e.g. files with extension `.md`) in this repository is
-covered by the following license:
+The documentation in this directory is covered by the following license:

 Attribution 4.0 International

--- a/docs/api.md
+++ b/docs/api.md
@@ -110,7 +110,6 @@ The Cloud Hypervisor API exposes the following actions through its endpoints:
 | Add vsock device to the VM         | `/vm.add-vsock`         | `/schemas/VsockConfig`          | `/schemas/PciDeviceInfo` | The VM is booted                                       |
 | Remove device from the VM          | `/vm.remove-device`     | `/schemas/VmRemoveDevice`       | N/A                      | The VM is booted                                       |
 | Dump the VM counters               | `/vm.counters`          | N/A                             | `/schemas/VmCounters`    | The VM is booted                                       |
-| Inject an NMI                      | `/vm.nmi`               | N/A                             | N/A                      | The VM is booted                                       |
 | Prepare to receive a migration     | `/vm.receive-migration` | `/schemas/ReceiveMigrationData` | N/A                      | N/A                                                    |
 | Start to send migration to target  | `/vm.send-migration`    | `/schemas/SendMigrationData`    | N/A                      | The VM is booted and (shared mem or hugepages enabled) |

@@ -148,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'  \
@@ -168,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'
 ```
@@ -178,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' \
@@ -190,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'
 ```
@@ -200,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'
 ```
@@ -270,7 +269,7 @@ definition in XML format:
 ### Command Line Interface

 The Cloud Hypervisor Command Line Interface (CLI) can only be used for launching
-the Cloud Hypervisor binary, i.e. it cannot be used for controlling the VMM or
+the Cloud Hypervisor binary, i.e. it can not be used for controlling the VMM or
 the launched VM once they're up and running.

 If you want to inspect the VMM, or control the VM after launching Cloud
@@ -386,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'  \
--- a/docs/custom-image.md
+++ b/docs/custom-image.md
@@ -159,10 +159,10 @@ as we might need to update the direct kernel boot command line, replacing

 Update all references to the previous image name to the new one.

-## NVIDIA image for VFIO bare-metal CI
+## NVIDIA image for VFIO baremetal CI

 Here we are going to describe how to create a cloud image that contains the
-necessary NVIDIA drivers for our VFIO bare-metal CI.
+necessary NVIDIA drivers for our VFIO baremetal CI.

 ### Download base image

--- a/docs/debug-port.md
+++ b/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:
- [`0x80` debug port](https://www.intel.com/content/www/us/en/support/articles/000005500/boards-and-kits.html) 
- 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
+`cloud-hypervisor` uses the [`0x80`](https://www.intel.com/content/www/us/en/support/articles/000005500/boards-and-kits.html)
+I/O port to trace user defined guest events.

 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. 
--- a/docs/fuzzing.md
+++ b/docs/fuzzing.md
@@ -2,7 +2,7 @@

 Cloud Hypervisor uses [cargo-fuzz](https://github.com/rust-fuzz/cargo-fuzz) for fuzzing individual components.

-The fuzzers are in the `fuzz/fuzz_targets` directory
+The fuzzers are are in the `fuzz/fuzz_targets` directory

 ## Preparation

--- a/docs/hotplug.md
+++ b/docs/hotplug.md
@@ -53,7 +53,7 @@ On-line CPU(s) list:             0-7

 After a reboot the added CPUs will remain.

-Removing CPUs works similarly by reducing the number in the "desired_vcpus" field of the resize API. The CPUs will be automatically offlined inside the guest so there is no need to run any commands inside the guest:
+Removing CPUs works similarly by reducing the number in the "desired_vcpus" field of the reisze API. The CPUs will be automatically offlined inside the guest so there is no need to run any commands inside the guest:

 ```shell
 ./ch-remote --api-socket=/tmp/ch-socket resize --cpus 2
--- a/docs/intel_tdx.md
+++ b/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
--- a/docs/io_throttling.md
+++ b/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
-```
--- a/docs/iommu.md
+++ b/docs/iommu.md
@@ -39,7 +39,7 @@ Another reason for having a virtual IOMMU is to allow passing physical devices
 from the host through multiple layers of virtualization. Let's take as example
 a system with a physical IOMMU running a VM with a virtual IOMMU. The
 implementation of the virtual IOMMU is responsible for updating the physical
-DMA Remapping table (DMAR) every time the DMA mapping changes. This must happen
+DMA Remapping table (DMAR) everytime the DMA mapping changes. This must happen
 through the VFIO framework on the host as this is the only userspace interface
 to interact with a physical IOMMU.

@@ -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

@@ -124,7 +127,7 @@ On AArch64 architecture, the virtual IOMMU can still be used even if ACPI is not
 enabled. But the effect is different with what the aforementioned test showed.

 When ACPI is disabled, virtual IOMMU is supported through Flattened Device Tree
-(FDT). In this case, the guest kernel cannot tell which device should be
+(FDT). In this case, the guest kernel can not tell which device should be
 IOMMU-attached and which should not. No matter how many devices you attached to
 the virtual IOMMU by setting `iommu=on` option, all the devices on the PCI bus
 will be attached to the virtual IOMMU (except the IOMMU itself). Each of the
--- a/docs/landlock.md
+++ b/docs/landlock.md
@@ -1,105 +0,0 @@
-# Sandboxing using Landlock
-
-Landlock is a lightweight mechanism to allow unprivileged applications to
-sandbox themselves.
-
-During initial stages of running, applications can define the set of resources
-(mostly files) they need to access during their lifetime. All such rules are
-used to create a ruleset. Once the ruleset is applied, the process cannot access
-any resources outside of the ruleset during its lifetime, even if it were
-compromised.
-
-Under the scope of `read` and `write` access, Landlock currently allows some
-additional accesses (eg: for now, access to extended file attributes is always
-allowed). Eventually, Landlock will only allow accesses similar to Unix
-permissions.
-
-## Host Setup
-
-Landlock should be enabled in Host kernel to use it with cloud-hypervisor.
-Please following [Kernel-Support](https://docs.kernel.org/userspace-api/landlock.html#kernel-support) link to enable Landlock on Host kernel.
-
-
-Landlock support can be checked with following command:
-```
-$ sudo dmesg | grep -w  landlock
-[    0.000000] landlock: Up and running.
-```
-Linux kernel confirms Landlock support with above message in dmesg.
-
-## Enable Landlock
-
-At the time of enabling Landlock, Cloud-Hypervisor process needs the complete
-list of files it accesses over its lifetime. So, Landlock is enabled `vm_create`
-stage of guest boot.
-
-### Command Line
-Append `--landlock` to Cloud-Hypervisor's command line to enable Landlock
-support.
-
-If you expect guest to access additional paths after it boots
-(ex: during hotplug), those paths can be passed using `--landlock-rules` command
-line parameter.
-
-### API
-Landlock can also be enabled during `vm.create` request by passing a config like below:
-
-```
-{
-...
-    "landlock_enable": true,
-    "landlock_rules": [
-      {
-        "path": "/tmp/disk1",
-        "access": "rw"
-      },
-      {
-        "path": "/tmp/disk2",
-        "access": "rw"
-      }
-    ]
-...
-}
-```
-
-
-## Usage Examples
-
-To enable Landlock:
-
-```
-./cloud-hypervisor \
-	--kernel ./linux-cloud-hypervisor/arch/x86/boot/compressed/vmlinux.bin \
-	--disk path=focal-server-cloudimg-amd64.raw path=/tmp/ubuntu-cloudinit.img \
-	--cmdline "console=hvc0 root=/dev/vda1 rw" \
-	--cpus boot=4 \
-	--memory size=1024M \
-	--net "tap=,mac=,ip=,mask=" \
-	--landlock
-```
-Hotplugging any new file-backed resources to above guest will result in
-**Permission Denied** error.
-
-To enable Landlock with hotplug support:
-
-```
-./cloud-hypervisor \
-	--api-socket /tmpXXXX/ch.socket \
-	--kernel ./linux-cloud-hypervisor/arch/x86/boot/compressed/vmlinux.bin \
-	--disk path=focal-server-cloudimg-amd64.raw path=/tmp/ubuntu-cloudinit.img \
-	--cmdline "console=hvc0 root=/dev/vda1 rw" \
-	--cpus boot=4 \
-	--memory size=1024M \
-	--net "tap=,mac=,ip=,mask=" \
-	--landlock \
-	--landlock-rules path="/path/to/hotplug1",access="rw" path="/path/to/hotplug2",access="rw"
-
-./ch-remote --api-socket /tmpXXXX/ch.socket \
-	add-disk "path=/path/to/hotplug/blk.raw"
-```
-
-`--landlock-rules` accepts file or directory paths among its options.
-
-# References
-
-* https://landlock.io/
--- a/docs/memory.md
+++ b/docs/memory.md
@@ -466,7 +466,7 @@ List of virtual CPUs attached to the guest NUMA node identified by the
 `guest_numa_id` option. This allows for describing a list of CPUs which
 must be seen by the guest as belonging to the NUMA node `guest_numa_id`.

-One can use this option for a fine-grained description of the NUMA topology
+One can use this option for a fine grained description of the NUMA topology
 regarding the CPUs associated with it, which might help the guest run more
 efficiently.

@@ -573,7 +573,7 @@ _Example_
 ### PCI bus

 Cloud Hypervisor supports guests with one or more PCI segments. The default PCI segment always
-has affinity to NUMA node 0. Be default, all other PCI segments have affinity to NUMA node 0.
+has affinity to NUMA node 0. Be default, all other PCI segments have afffinity to NUMA node 0.
 The user may configure the NUMA affinity for any additional PCI segments.

 _Example_
--- a/docs/performance_metrics.md
+++ b/docs/performance_metrics.md
@@ -8,8 +8,6 @@ e.g. `dev_cli.sh`. The only prerequisite is [Docker installation](https://docs.d
 Please note that upon its first invocation, this script will pull a
 fairly large container image.

-## Run the Performance Tests
-
 To generate metrics data for all available performance tests (including
 boot time, block I/O throughput, and network throughput & latency) and
 output the result into a json file:
@@ -29,92 +27,3 @@ To generate metrics data for selected performance tests, e.g. boot time only:
 ```
 $ ./scripts/dev_cli.sh tests --metrics -- -- --report-file /tmp/metrics.json --test-filter boot_time
 ```
-
-To set custom timeout or test iterations for all performance tests:
-
-```
-$ ./scripts/dev_cli.sh tests --metrics -- -- --timeout 5 --iterations 10
-```
-
-## Performance Tests Details
-
-The following table lists the supported performance tests with default
-timeout and number of iterations. The `timeout` defines the maximum
-execution time of each test for each iteration. The `iteration` defines
-how many times a test needs to be executed to generate the final metrics
-data.
-
-| **Type**   | **Metric**                                 | **Timeout(s)** | **Iterations** |
-|------------|--------------------------------------------|----------------|----------------|
-| Boot Time  | boot_time_ms                               | 2              | 10             |
-|            | boot_time_pmem_ms                          | 2              | 10             |
-|            | boot_time_16_vcpus_ms                      | 2              | 10             |
-|            | boot_time_16_vcpus_pmem_ms                 | 2              | 10             |
-| Virtio Net | virtio_net_latency_us                      | 10             | 5              |
-|            | virtio_net_throughput_single_queue_rx_gbps | 10             | 5              |
-|            | virtio_net_throughput_single_queue_tx_gbps | 10             | 5              |
-|            | virtio_net_throughput_multi_queue_rx_gbps  | 10             | 5              |
-|            | virtio_net_throughput_multi_queue_tx_gbps  | 10             | 5              |
-| Block      | block_read_MiBps                           | 10             | 5              |
-|            | block_write_MiBps                          | 10             | 5              |
-|            | block_random_read_MiBps                    | 10             | 5              |
-|            | block_random_write_MiBps                   | 10             | 5              |
-|            | block_multi_queue_read_MiBps               | 10             | 5              |
-|            | block_multi_queue_write_MiBps              | 10             | 5              |
-|            | block_multi_queue_random_read_MiBps        | 10             | 5              |
-|            | block_multi_queue_random_write_MiBps       | 10             | 5              |
-|            | block_read_IOPS                            | 10             | 5              |
-|            | block_write_IOPS                           | 10             | 5              |
-|            | block_random_read_IOPS                     | 10             | 5              |
-|            | block_random_write_IOPS                    | 10             | 5              |
-|            | block_multi_queue_read_IOPS                | 10             | 5              |
-|            | block_multi_queue_write_IOPS               | 10             | 5              |
-|            | block_multi_queue_random_read_IOPS         | 10             | 5              |
-|            | block_multi_queue_random_write_IOPS        | 10             | 5              |
-| Other      | restore_latency_time_ms                    | 2              | 10             |
-
-## Output Format
-
-Performance-metrics output the result into a json file if `report-file`
-param is set. The fields included in JSON include:
-
-| Field Name         | Content                                  |
-|--------------------|------------------------------------------|
-| git_human_readable | Recent tag information of git repository |
-| git_revision       | Commit id of HEAD                        |
-| git_commit_date    | Commit date of HEAD                      |
-| date               | Date for executing the program           |
-| results            | A list of metrics                        |
-
-## Example
-
-Here is an example of generating metrics data for the boot time using
-`pmem`:
-
-```bash
-$ ./scripts/dev_cli.sh tests --metrics -- -- --test-filter boot_time_pmem_ms
-```
-
-Here is a sample output:
-
-```json
-{
-  "git_human_readable": "v40.0",
-  "git_revision": "e9b263975786abbf895469b93dfc00f21ce39a88",
-  "git_commit_date": "Fri Jun 21 08:40:44 2024 +0000",
-  "date": "Tue Jul 16 16:35:29 UTC 2024",
-  "results": [
-    {
-      "name": "boot_time_pmem_ms",
-      "mean": 105.9461,
-      "std_dev": 7.140993312558129,
-      "max": 120.01499999999999,
-      "min": 92.37600000000002
-    }
-  ]
-}
-```
-
-Note that the metrics data above is for illustration purpose only and
-does not represent the actual performance of Cloud Hypervisor on your
-system.
--- a/docs/releases.md
+++ b/docs/releases.md
@@ -95,7 +95,7 @@ E - EOL

 ```

-### LTS Stability Considerations
+### LTS Stablity Considerations

 An LTS release is just a `MAJOR` release for which point releases are made for
 longer following the same rules for what can be backported to a `POINT` release.
--- a/docs/snapshot_restore.md
+++ b/docs/snapshot_restore.md
@@ -63,7 +63,7 @@ component in the state it was left before the snapshot occurred.
 ## Restore a Cloud Hypervisor VM

 Given that one has access to an existing snapshot in `/home/foo/snapshot`,
-it is possible to create a new VM based on this snapshot with the following
+it is possible to create a new VM based on this snapshot with the following 
 command:

 ```bash
@@ -93,21 +93,6 @@ start using it.
 At this point, the VM is fully restored and is identical to the VM which was
 snapshot earlier.

-## Restore a VM with new Net FDs
-For a VM created with FDs explicitly passed to NetConfig, a set of valid FDs
-need to be provided along with the VM restore command in the following syntax:
-
-```bash
-# First terminal
-./cloud-hypervisor --api-socket /tmp/cloud-hypervisor.sock
-
-# Second terminal
-./ch-remote --api-socket=/tmp/cloud-hypervisor.sock restore source_url=file:///home/foo/snapshot net_fds=[net1@[23,24],net2@[25,26]]
-```
-In the example above, the net device with id `net1` will be backed by FDs '23'
-and '24', and the net device with id `net2` will be backed by FDs '25' and '26'
-from the restored VM.
-
 ## Limitations

 VFIO devices and Intel SGX are out of scope.
--- a/docs/tracing.md
+++ b/docs/tracing.md
@@ -37,6 +37,6 @@ generating traces of the boot. These can be relocated for focus tracing on a
 narrow part of the code base.

 A `tracer::trace_point!()` macro is also provided for an instantaneous trace
-point however this is neither in use in the code base currently nor is handled by
+point however this is not in use in the code base currently nor is handled by
 the visualisation script due to the difficulty in representation in the SVG.

--- a/docs/vfio.md
+++ b/docs/vfio.md
@@ -122,64 +122,4 @@ $ ls /sys/kernel/iommu_groups/22/devices/

 This means these two devices are under the same IOMMU group 22. In such case,
 it is important to bind both devices to VFIO and pass them both through the
-VM, otherwise this could cause some functional and security issues.
-
-### Advanced Configuration Options
-
-When using NVIDIA GPUs in a VFIO passthrough configuration, advanced
-configuration options are supported to enable GPUDirect P2P DMA over
-PCIe. When enabled, loads and stores between GPUs use native PCIe
-peer-to-peer transactions instead of a shared memory buffer. This drastically
-decreases P2P latency between GPUs. This functionality is supported by
-cloud-hypervisor on NVIDIA Turing, Ampere, Hopper, and Lovelace GPUs.
-
-The NVIDIA driver does not enable GPUDirect P2P over PCIe within guests
-by default because hardware support for routing P2P TLP between PCIe root
-ports is optional. PCIe P2P should always be supported between devices
-on the same PCIe switch. The `x_nv_gpudirect_clique` config argument may
-be used to signal support for PCIe P2P traffic between NVIDIA VFIO endpoints.
-The guest driver assumes that P2P traffic is supported between all endpoints
-that are part of the same clique.
-```
--device path=/sys/bus/pci/devices/0000:01:00.0/,x_nv_gpudirect_clique=0
-```
-
-The following command can be run on the guest to verify that GPUDirect P2P is
-correctly enabled.
-```
-nvidia-smi topo -p2p r
- 	GPU0	GPU1	GPU2	GPU3	GPU4	GPU5	GPU6	GPU7	
- GPU0	X	OK	OK	OK	OK	OK	OK	OK	
- GPU1	OK	X	OK	OK	OK	OK	OK	OK	
- GPU2	OK	OK	X	OK	OK	OK	OK	OK	
- GPU3	OK	OK	OK	X	OK	OK	OK	OK	
- GPU4	OK	OK	OK	OK	X	OK	OK	OK	
- GPU5	OK	OK	OK	OK	OK	X	OK	OK	
- GPU6	OK	OK	OK	OK	OK	OK	X	OK	
- GPU7	OK	OK	OK	OK	OK	OK	OK	X	
-```
-
-Some VFIO devices have a 32-bit mmio BAR. When using many such devices, it is
-possible to exhaust the 32-bit mmio space available on a PCI segment. The
-following example demonstrates an example device with a 16 MiB 32-bit mmio BAR.
-```
-lspci -s 0000:01:00.0  -v
-0000:01:00.0 3D controller: NVIDIA Corporation Device 26b9 (rev a1)
-    [...]
-    Memory at f9000000 (32-bit, non-prefetchable) [size=16M]
-    Memory at 46000000000 (64-bit, prefetchable) [size=64G]
-    Memory at 48040000000 (64-bit, prefetchable) [size=32M]
-    [...]
-```
-
-When using multiple PCI segments, the 32-bit mmio address space available to
-be allocated to VFIO devices is equally split between all PCI segments by
-default. This can be tuned with the `--pci-segment` flag. The following example
-demonstrates a guest with two PCI segments. 2/3 of the 32-bit mmio address
-space is available for use by devices on PCI segment 0 and 1/3 of the 32-bit
-mmio address space is available for use by devices on PCI segment 1.
-```
--platform num_pci_segments=2
--pci-segment pci_segment=0,mmio32_aperture_weight=2
--pci-segment pci_segment=1,mmio32_aperture_weight=1
-```
+VM, otherwise this could cause some functional and security issues.
--- a/docs/vhost-user-net-testing.md
+++ b/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
-v37.0 on Ubuntu 22.04.3 (host kernel v5.15.0).
+tested with Open vSwitch v2.13.1, DPDK v19.11.3, and Cloud Hypervisor
+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-user2 -- set Interface vhost-user2 type=dpdkvhostuserclient options:vhost-server-path=/tmp/vhost-user2
+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=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 link set up dev ens3
+sudo ip addr add 172.100.0.1/24 dev ens2
+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 link set up dev ens3
+sudo ip addr add 172.100.0.2/24 dev ens2
+sudo ip link set up dev ens2
 ```

 _Ping VM1 from VM2_
--- a/docs/vsock.md
+++ b/docs/vsock.md
@@ -1,6 +1,6 @@
 # VSOCK support

-VSOCK provides a way for guest and host to communicate through a socket. `cloud-hypervisor` only supports stream VSOCK sockets.
+VSOCK provides a way for guest and host to communicate through a socket. VSOCK sockets support both stream and datagram types.

 The `virtio-vsock` is based on the [Firecracker](https://github.com/firecracker-microvm/firecracker/blob/main/docs/vsock.md) implementation, where additional details can be found.

--- a/event_monitor/Cargo.toml
+++ b/event_monitor/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
-authors = ["The Cloud Hypervisor Authors"]
-edition = "2021"
 name = "event_monitor"
 version = "0.1.0"
+authors = ["The Cloud Hypervisor Authors"]
+edition = "2021"

 [dependencies]
-flume = "0.11.0"
-libc = "0.2.155"
-once_cell = "1.19.0"
-serde = { version = "1.0.197", features = ["derive", "rc"] }
-serde_json = "1.0.120"
+flume = "0.10.14"
+libc = "0.2.147"
+once_cell = "1.18.0"
+serde = { version = "1.0.168", features = ["rc", "derive"] }
+serde_json = "1.0.107"
--- a/fuzz/Cargo.lock
+++ b/fuzz/Cargo.lock
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -1,133 +1,139 @@
 [package]
-authors = ["Automatically generated"]
-edition = "2021"
 name = "cloud-hypervisor-fuzz"
-publish = false
 version = "0.0.0"
+authors = ["Automatically generated"]
+publish = false
+edition = "2021"

 [package.metadata]
 cargo-fuzz = true

 [features]
 igvm = []
-pvmemcontrol = []

 [dependencies]
 block = { path = "../block" }
 devices = { path = "../devices" }
-epoll = "4.3.3"
-libc = "0.2.155"
+epoll = "4.3.1"
+libc = "0.2.152"
 libfuzzer-sys = "0.4.7"
-linux-loader = { version = "0.11.0", features = ["bzimage", "elf", "pe"] }
+linux-loader = { version = "0.11.0", 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"
 seccompiler = "0.4.0"
 virtio-devices = { path = "../virtio-devices" }
-virtio-queue = "0.12.0"
-vm-device = { path = "../vm-device" }
-vm-memory = "0.14.1"
-vm-migration = { path = "../vm-migration" }
-vm-virtio = { path = "../vm-virtio" }
-vmm = { path = "../vmm", features = ["guest_debug"] }
+virtio-queue = "0.11.0"
+vmm = { path = "../vmm" }
 vmm-sys-util = "0.12.1"
+vm-memory = "0.14.0"
+vm-migration = { path = "../vm-migration" }
+vm-device = { path = "../vm-device" }
+vm-virtio = { path = "../vm-virtio" }
+
+[dependencies.cloud-hypervisor]
+path = ".."
+
+[patch.crates-io]
+kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-live-upgrade-stable-37.x" }
+versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch-0.1.6" }

 # Prevent this from interfering with workspaces
 [workspace]
 members = ["."]

 [[bin]]
-doc = false
 name = "balloon"
 path = "fuzz_targets/balloon.rs"
 test = false
+doc = false

 [[bin]]
-doc = false
 name = "block"
 path = "fuzz_targets/block.rs"
 test = false
+doc = false

 [[bin]]
-doc = false
 name = "cmos"
 path = "fuzz_targets/cmos.rs"
 test = false
+doc = false

 [[bin]]
-doc = false
 name = "console"
 path = "fuzz_targets/console.rs"
 test = false
+doc = false

 [[bin]]
-doc = false
 name = "http_api"
 path = "fuzz_targets/http_api.rs"
 test = false
+doc = false

 [[bin]]
-doc = false
 name = "iommu"
 path = "fuzz_targets/iommu.rs"
 test = false
+doc = false

 [[bin]]
-doc = false
 name = "linux_loader"
 path = "fuzz_targets/linux_loader.rs"
 test = false
+doc = false

 [[bin]]
-doc = false
 name = "linux_loader_cmdline"
 path = "fuzz_targets/linux_loader_cmdline.rs"
 test = false
+doc = false

 [[bin]]
-doc = false
 name = "mem"
 path = "fuzz_targets/mem.rs"
 test = false
+doc = false

 [[bin]]
-doc = false
 name = "net"
 path = "fuzz_targets/net.rs"
 test = false
+doc = false

 [[bin]]
-doc = false
 name = "pmem"
 path = "fuzz_targets/pmem.rs"
 test = false
+doc = false

 [[bin]]
-doc = false
 name = "qcow"
 path = "fuzz_targets/qcow.rs"
 test = false
+doc = false

 [[bin]]
-doc = false
 name = "rng"
 path = "fuzz_targets/rng.rs"
 test = false
+doc = false

 [[bin]]
-doc = false
 name = "serial"
 path = "fuzz_targets/serial.rs"
 test = false
+doc = false

 [[bin]]
-doc = false
 name = "vhdx"
 path = "fuzz_targets/vhdx.rs"
 test = false
+doc = false

 [[bin]]
-doc = false
 name = "watchdog"
 path = "fuzz_targets/watchdog.rs"
 test = false
+doc = false
--- a/fuzz/fuzz_targets/block.rs
+++ b/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();

--- a/fuzz/fuzz_targets/cmos.rs
+++ b/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;

--- a/fuzz/fuzz_targets/http_api.rs
+++ b/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, RequestHandler, VmInfoResponse, VmReceiveMigrationData,
-    VmSendMigrationData, VmmPingResponse,
-};
-use vmm::config::RestoreConfig;
-use vmm::vm::{Error as VmError, VmState};
-use vmm::vm_config::*;
+use vmm::api::{http::*, ApiRequest, ApiResponsePayload};
 use vmm::{EpollContext, EpollDispatch};
 use vmm_sys_util::eventfd::EventFd;

@@ -78,211 +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(target_arch = "x86_64")]
-    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,
-                #[cfg(feature = "pvmemcontrol")]
-                pvmemcontrol: None,
-                iommu: false,
-                #[cfg(target_arch = "x86_64")]
-                sgx_epc: None,
-                numa: None,
-                watchdog: false,
-                gdb: false,
-                pci_segments: None,
-                platform: None,
-                tpm: None,
-                preserved_fds: None,
-                landlock_enable: false,
-                landlock_rules: 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 vm_nmi(&mut self) -> Result<(), VmError> {
-        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();
@@ -312,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();
+                        }
+                    }
                }
            }
            _ => {
--- a/fuzz/fuzz_targets/qcow.rs
+++ b/fuzz/fuzz_targets/qcow.rs
@@ -1,8 +1,6 @@
 // Copyright 2018 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-BSD-3-Clause file.
-//
-// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause

 #![no_main]
 use libfuzzer_sys::fuzz_target;
--- a/hypervisor/Cargo.toml
+++ b/hypervisor/Cargo.toml
@@ -1,47 +1,39 @@
 [package]
+name = "hypervisor"
+version = "0.1.0"
 authors = ["Microsoft Authors"]
 edition = "2021"
 license = "Apache-2.0 OR BSD-3-Clause"
-name = "hypervisor"
-version = "0.1.0"

 [features]
-kvm = ["kvm-bindings", "kvm-ioctls", "vfio-ioctls/kvm"]
-mshv = ["iced-x86", "mshv-bindings", "mshv-ioctls", "vfio-ioctls/mshv"]
-sev_snp = ["igvm", "igvm_defs"]
+kvm = ["kvm-ioctls", "kvm-bindings", "vfio-ioctls/kvm"]
+mshv = ["mshv-ioctls", "mshv-bindings", "vfio-ioctls/mshv", "iced-x86"]
+sev_snp = ["igvm_parser", "igvm_defs"]
 tdx = []

 [dependencies]
-anyhow = "1.0.86"
-byteorder = "1.5.0"
-igvm = { version = "0.3.3", optional = true }
-igvm_defs = { version = "0.3.1", optional = true }
-kvm-bindings = { version = "0.8.1", optional = true, features = ["serde"] }
-kvm-ioctls = { version = "0.17.0", optional = true }
-libc = "0.2.155"
-log = "0.4.22"
-mshv-bindings = { git = "https://github.com/rust-vmm/mshv", tag = "v0.2.0", features = [
-  "fam-wrappers",
-  "with-serde",
-], optional = true }
-mshv-ioctls = { git = "https://github.com/rust-vmm/mshv", tag = "v0.2.0", optional = true }
-serde = { version = "1.0.197", features = ["derive", "rc"] }
-serde_with = { version = "3.9.0", default-features = false, features = [
-  "macros",
-] }
-thiserror = "1.0.62"
+anyhow = "1.0.75"
+byteorder = "1.4.3"
+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 }
+libc = "0.2.147"
+log = "0.4.20"
+kvm-ioctls = { version = "0.16.0", optional = true }
+kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-live-upgrade-stable-37.x", 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.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.1", features = [
-  "backend-atomic",
-  "backend-mmap",
-] }
+vm-memory = { version = "0.14.0", features = ["backend-mmap", "backend-atomic"] }
 vmm-sys-util = { version = "0.12.1", features = ["with-serde"] }
+thiserror = "1.0.52"

 [target.'cfg(target_arch = "x86_64")'.dependencies.iced-x86]
-default-features = false
-features = ["decoder", "fast_fmt", "instr_info", "op_code_info", "std"]
 optional = true
-version = "1.21.0"
+version = "1.20.0"
+default-features = false
+features = ["std", "decoder", "op_code_info", "instr_info", "fast_fmt"]

 [dev-dependencies]
-env_logger = "0.11.3"
+env_logger = "0.10.0"
--- a/hypervisor/src/arch/aarch64/gic.rs
+++ b/hypervisor/src/arch/aarch64/gic.rs
@@ -1,23 +1,17 @@
 // Copyright 2022 Arm Limited (or its affiliates). All rights reserved.
-//
-// SPDX-License-Identifier: Apache-2.0

 use crate::{CpuState, GicState, HypervisorDeviceError, HypervisorVmError};
 use std::any::Any;
 use std::result;
-use thiserror::Error;

 /// Errors thrown while setting up the VGIC.
-#[derive(Debug, Error)]
+#[derive(Debug)]
 pub enum Error {
    /// Error while calling KVM ioctl for setting up the global interrupt controller.
-    #[error("Failed creating GIC device: {0}")]
    CreateGic(HypervisorVmError),
    /// Error while setting device attributes for the GIC.
-    #[error("Failed setting device attributes for the GIC: {0}")]
    SetDeviceAttribute(HypervisorDeviceError),
    /// Error while getting device attributes for the GIC.
-    #[error("Failed getting device attributes for the GIC: {0}")]
    GetDeviceAttribute(HypervisorDeviceError),
 }
 pub type Result<T> = result::Result<T, Error>;
--- a/hypervisor/src/arch/aarch64/mod.rs
+++ b/hypervisor/src/arch/aarch64/mod.rs
@@ -1,5 +1,3 @@
 // Copyright 2022 Arm Limited (or its affiliates). All rights reserved.
-//
-// SPDX-License-Identifier: Apache-2.0

 pub mod gic;
--- a/hypervisor/src/arch/emulator/mod.rs
+++ b/hypervisor/src/arch/emulator/mod.rs
@@ -137,6 +137,14 @@ pub trait PlatformEmulator {
    ///
    fn set_cpu_state(&self, cpu_id: usize, state: Self::CpuState) -> Result<(), PlatformError>;

+    /// Translate a guest virtual address into a physical one
+    ///
+    /// # Arguments
+    ///
+    /// * `gva` - Guest virtual address to translate.
+    ///
+    fn gva_to_gpa(&self, gva: u64) -> Result<u64, PlatformError>;
+
    /// Fetch instruction bytes from memory.
    ///
    /// # Arguments
--- a/hypervisor/src/arch/x86/emulator/instructions/cmp.rs
+++ b/hypervisor/src/arch/x86/emulator/instructions/cmp.rs
@@ -10,8 +10,10 @@
 // CMP-Compare Two Operands
 //

+use crate::arch::emulator::{EmulationError, PlatformEmulator};
 use crate::arch::x86::emulator::instructions::*;
 use crate::arch::x86::regs::*;
+use crate::arch::x86::Exception;

 // CMP affects OF, SF, ZF, AF, PF and CF
 const FLAGS_MASK: u64 = CF | PF | AF | ZF | SF | OF;
@@ -209,6 +211,8 @@ impl<T: CpuStateManager> InstructionHandler<T> for Cmp_rm64_imm8 {

 #[cfg(test)]
 mod tests {
+    #![allow(unused_mut)]
+
    use super::*;
    use crate::arch::x86::emulator::mock_vmm::*;

--- a/hypervisor/src/arch/x86/emulator/instructions/mod.rs
+++ b/hypervisor/src/arch/x86/emulator/instructions/mod.rs
@@ -13,7 +13,6 @@ pub mod cmp;
 pub mod mov;
 pub mod movs;
 pub mod or;
-pub mod stos;

 fn get_op<T: CpuStateManager>(
    insn: &Instruction,
--- a/hypervisor/src/arch/x86/emulator/instructions/mov.rs
+++ b/hypervisor/src/arch/x86/emulator/instructions/mov.rs
@@ -12,7 +12,9 @@
 //   Copies the second operand (source operand) to the first operand (destination operand).
 //

+use crate::arch::emulator::{EmulationError, PlatformEmulator};
 use crate::arch::x86::emulator::instructions::*;
+use crate::arch::x86::Exception;

 macro_rules! mov_rm_r {
    ($bound:ty) => {
@@ -269,6 +271,7 @@ impl<T: CpuStateManager> InstructionHandler<T> for Mov_RAX_moffs64 {

 #[cfg(test)]
 mod tests {
+    #![allow(unused_mut)]
    use super::*;
    use crate::arch::x86::emulator::mock_vmm::*;

--- a/hypervisor/src/arch/x86/emulator/instructions/movs.rs
+++ b/hypervisor/src/arch/x86/emulator/instructions/movs.rs
@@ -10,8 +10,10 @@
 // MOVS - Move Data from String to String
 //

+use crate::arch::emulator::{EmulationError, PlatformEmulator};
 use crate::arch::x86::emulator::instructions::*;
 use crate::arch::x86::regs::DF;
+use crate::arch::x86::Exception;

 macro_rules! movs {
    ($bound:ty) => {
@@ -40,7 +42,7 @@ macro_rules! movs {
            let len = std::mem::size_of::<$bound>();

            while count > 0 {
-                let mut memory: [u8; 8] = [0; 8];
+                let mut memory: [u8; 4] = [0; 4];

                let src = state
                    .linearize(Register::DS, rsi, false)
@@ -83,11 +85,6 @@ macro_rules! movs {
    };
 }

-pub struct Movsq_m64_m64;
-impl<T: CpuStateManager> InstructionHandler<T> for Movsq_m64_m64 {
-    movs!(u64);
-}
-
 pub struct Movsd_m32_m32;
 impl<T: CpuStateManager> InstructionHandler<T> for Movsd_m32_m32 {
    movs!(u32);
@@ -105,43 +102,10 @@ impl<T: CpuStateManager> InstructionHandler<T> for Movsb_m8_m8 {

 #[cfg(test)]
 mod tests {
+    #![allow(unused_mut)]
    use super::*;
    use crate::arch::x86::emulator::mock_vmm::*;

-    #[test]
-    fn test_rep_movsq_m64_m64() {
-        let ip: u64 = 0x1000;
-        let memory: [u8; 32] = [
-            0x78, 0x56, 0x34, 0x12, // 0x12345678
-            0xdd, 0xcc, 0xbb, 0xaa, // 0xaabbccdd
-            0xa5, 0x5a, 0xa5, 0x5a, // 0x5aa55aa5
-            0xcd, 0xcd, 0xcd, 0xcd, // 0xcdcdcdcd
-            0x00, 0x00, 0x00, 0x00, // 0x00000000
-            0x00, 0x00, 0x00, 0x00, // 0x00000000
-            0x00, 0x00, 0x00, 0x00, // 0x00000000
-            0x00, 0x00, 0x00, 0x00, // 0x00000000
-        ];
-        let insn = [0xf3, 0x48, 0xa5]; // rep movsq
-        let regs = vec![
-            (Register::ECX, 2),
-            (Register::ESI, 0),
-            (Register::EDI, 0x10),
-        ];
-        let mut data = [0u8; 8];
-
-        let mut vmm = MockVmm::new(ip, regs, Some((0, &memory)));
-
-        assert!(vmm.emulate_first_insn(0, &insn).is_ok());
-
-        vmm.read_memory(0x10, &mut data).unwrap();
-        assert_eq!(0xaabbccdd12345678, <u64>::from_le_bytes(data));
-        vmm.read_memory(0x18, &mut data).unwrap();
-        assert_eq!(0xcdcdcdcd5aa55aa5, <u64>::from_le_bytes(data));
-        // The rest should be default value 0 from MockVmm
-        vmm.read_memory(0x20, &mut data).unwrap();
-        assert_eq!(0x0, <u64>::from_le_bytes(data));
-    }
-
    #[test]
    fn test_rep_movsd_m32_m32() {
        let ip: u64 = 0x1000;
--- a/hypervisor/src/arch/x86/emulator/instructions/or.rs
+++ b/hypervisor/src/arch/x86/emulator/instructions/or.rs
@@ -10,7 +10,9 @@
 // OR - Logical inclusive OR
 //

+use crate::arch::emulator::{EmulationError, PlatformEmulator};
 use crate::arch::x86::emulator::instructions::*;
+use crate::arch::x86::Exception;

 macro_rules! or_rm_r {
    ($bound:ty) => {
@@ -50,6 +52,7 @@ impl<T: CpuStateManager> InstructionHandler<T> for Or_rm8_r8 {

 #[cfg(test)]
 mod tests {
+    #![allow(unused_mut)]
    use super::*;

    use crate::arch::x86::emulator::mock_vmm::*;
--- a/hypervisor/src/arch/x86/emulator/instructions/stos.rs
+++ b/hypervisor/src/arch/x86/emulator/instructions/stos.rs
@@ -1,236 +0,0 @@
-//
-// Copyright © 2024 Microsoft
-//
-// SPDX-License-Identifier: Apache-2.0
-//
-
-#![allow(non_camel_case_types)]
-
-//
-// STOS - Store String
-//
-
-use crate::arch::x86::emulator::instructions::*;
-use crate::arch::x86::regs::DF;
-
-macro_rules! stos {
-    ($bound:ty) => {
-        fn emulate(
-            &self,
-            insn: &Instruction,
-            state: &mut T,
-            platform: &mut dyn PlatformEmulator<CpuState = T>,
-        ) -> Result<(), EmulationError<Exception>> {
-            let mut count: u64 = if insn.has_rep_prefix() {
-                state
-                    .read_reg(Register::ECX)
-                    .map_err(|e| EmulationError::InvalidOperand(anyhow!(e)))?
-            } else {
-                1
-            };
-
-            let rax = state
-                .read_reg(Register::RAX)
-                .map_err(|e| EmulationError::InvalidOperand(anyhow!(e)))?;
-
-            let mut rdi = state
-                .read_reg(Register::RDI)
-                .map_err(|e| EmulationError::InvalidOperand(anyhow!(e)))?;
-
-            let df = (state.flags() & DF) != 0;
-            let len = std::mem::size_of::<$bound>();
-            let rax_bytes = rax.to_le_bytes();
-
-            while count > 0 {
-                let dst = state
-                    .linearize(Register::ES, rdi, true)
-                    .map_err(|e| EmulationError::InvalidOperand(anyhow!(e)))?;
-
-                platform
-                    .write_memory(dst, &rax_bytes[0..len])
-                    .map_err(EmulationError::PlatformEmulationError)?;
-
-                if df {
-                    rdi = rdi.wrapping_sub(len as u64);
-                } else {
-                    rdi = rdi.wrapping_add(len as u64);
-                }
-                count -= 1;
-            }
-
-            if insn.has_rep_prefix() {
-                state
-                    .write_reg(Register::ECX, 0)
-                    .map_err(|e| EmulationError::InvalidOperand(anyhow!(e)))?;
-            }
-
-            Ok(())
-        }
-    };
-}
-
-pub struct Stosq_m64_RAX;
-impl<T: CpuStateManager> InstructionHandler<T> for Stosq_m64_RAX {
-    stos!(u64);
-}
-
-pub struct Stosd_m32_EAX;
-impl<T: CpuStateManager> InstructionHandler<T> for Stosd_m32_EAX {
-    stos!(u32);
-}
-
-pub struct Stosw_m16_AX;
-impl<T: CpuStateManager> InstructionHandler<T> for Stosw_m16_AX {
-    stos!(u16);
-}
-
-pub struct Stosb_m8_AL;
-impl<T: CpuStateManager> InstructionHandler<T> for Stosb_m8_AL {
-    stos!(u8);
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::arch::x86::emulator::mock_vmm::*;
-
-    #[test]
-    fn test_rep_stosb() {
-        let ip: u64 = 0x1000;
-        let memory: [u8; 12] = [
-            0x78, 0x56, 0x34, 0x12, // 0x12345678
-            0xdd, 0xcc, 0xbb, 0xaa, // 0xaabbccdd
-            0xa5, 0x5a, 0xa5, 0x5a, // 0x5aa55aa5
-        ];
-        let insn = [0xf3, 0xaa]; // rep stosb
-        let regs = vec![
-            (Register::ECX, 3),
-            (Register::EDI, 0x0),
-            (Register::RAX, 0x123456ff),
-        ];
-        let mut data = [0u8; 4];
-
-        let mut vmm = MockVmm::new(ip, regs, Some((0, &memory)));
-
-        assert!(vmm.emulate_first_insn(0, &insn).is_ok());
-
-        vmm.read_memory(0, &mut data).unwrap();
-        assert_eq!(0x12ffffff, <u32>::from_le_bytes(data));
-        vmm.read_memory(4, &mut data).unwrap();
-        assert_eq!(0xaabbccdd, <u32>::from_le_bytes(data));
-        vmm.read_memory(8, &mut data).unwrap();
-        assert_eq!(0x5aa55aa5, <u32>::from_le_bytes(data));
-    }
-
-    #[test]
-    fn test_stosw() {
-        let ip: u64 = 0x1000;
-        let memory: [u8; 4] = [
-            0x78, 0x56, 0x34, 0x12, // 0x12345678
-        ];
-        let insn = [0x66, 0xab]; // stosw
-        let regs = vec![(Register::EDI, 0x1), (Register::AX, 0xaabb)];
-        let mut data = [0u8; 4];
-
-        let mut vmm = MockVmm::new(ip, regs, Some((0, &memory)));
-
-        assert!(vmm.emulate_first_insn(0, &insn).is_ok());
-
-        vmm.read_memory(0x0, &mut data).unwrap();
-        assert_eq!(0x12aabb78, <u32>::from_le_bytes(data));
-        // The rest should be default value 0 from MockVmm
-        vmm.read_memory(0x4, &mut data).unwrap();
-        assert_eq!(0x0, <u32>::from_le_bytes(data));
-        vmm.read_memory(0x8 + 8, &mut data).unwrap();
-        assert_eq!(0x0, <u32>::from_le_bytes(data));
-    }
-
-    #[test]
-    fn test_rep_stosw() {
-        let ip: u64 = 0x1000;
-        let memory: [u8; 8] = [
-            0x78, 0x56, 0x34, 0x12, // 0x12345678
-            0x00, 0x00, 0x00, 0x00, // 0x00000000
-        ];
-        let insn = [0x66, 0xf3, 0xab]; // rep stosw
-        let regs = vec![
-            (Register::ECX, 2),
-            (Register::EDI, 0x2),
-            (Register::AX, 0xaabb),
-        ];
-        let mut data = [0u8; 4];
-
-        let mut vmm = MockVmm::new(ip, regs, Some((0, &memory)));
-
-        assert!(vmm.emulate_first_insn(0, &insn).is_ok());
-
-        vmm.read_memory(0x0, &mut data).unwrap();
-        assert_eq!(0xaabb5678, <u32>::from_le_bytes(data));
-        vmm.read_memory(0x4, &mut data).unwrap();
-        assert_eq!(0x0000aabb, <u32>::from_le_bytes(data));
-        vmm.read_memory(0x8, &mut data).unwrap();
-        assert_eq!(0x0, <u32>::from_le_bytes(data));
-    }
-
-    #[test]
-    fn test_rep_stosd() {
-        let ip: u64 = 0x1000;
-        let memory: [u8; 12] = [
-            0x78, 0x56, 0x34, 0x12, // 0x12345678
-            0x00, 0x00, 0x00, 0x00, // 0x00000000
-            0x00, 0x00, 0x00, 0x00, // 0x00000000
-        ];
-        let insn = [0xf3, 0xab]; // rep stosd
-        let regs = vec![
-            (Register::ECX, 2),
-            (Register::EDI, 0x8),
-            (Register::EAX, 0xaabbccdd),
-        ];
-        let mut data = [0u8; 4];
-
-        let mut vmm = MockVmm::new(ip, regs, Some((0, &memory)));
-
-        // Go backwards this time
-        let mut state = vmm.cpu_state(0).unwrap();
-        state.set_flags(state.flags() | DF);
-        vmm.set_cpu_state(0, state).unwrap();
-
-        assert!(vmm.emulate_first_insn(0, &insn).is_ok());
-
-        vmm.read_memory(0x0, &mut data).unwrap();
-        assert_eq!(0x12345678, <u32>::from_le_bytes(data));
-        vmm.read_memory(0x4, &mut data).unwrap();
-        assert_eq!(0xaabbccdd, <u32>::from_le_bytes(data));
-        vmm.read_memory(0x8, &mut data).unwrap();
-        assert_eq!(0xaabbccdd, <u32>::from_le_bytes(data));
-        vmm.read_memory(0xc, &mut data).unwrap();
-        assert_eq!(0x0, <u32>::from_le_bytes(data));
-    }
-
-    #[test]
-    fn test_rep_stosq() {
-        let ip: u64 = 0x1000;
-        let memory: [u8; 8] = [
-            0x78, 0x56, 0x34, 0x12, // 0x12345678
-            0x00, 0x00, 0x00, 0x00, // 0x00000000
-        ];
-        let insn = [0xf3, 0x48, 0xab]; // rep stosq
-        let regs = vec![
-            (Register::ECX, 2),
-            (Register::RDI, 0x0),
-            (Register::RAX, 0x11223344aabbccdd),
-        ];
-        let mut data = [0u8; 8];
-
-        let mut vmm = MockVmm::new(ip, regs, Some((0, &memory)));
-
-        assert!(vmm.emulate_first_insn(0, &insn).is_ok());
-
-        vmm.read_memory(0x0, &mut data).unwrap();
-        assert_eq!(0x11223344aabbccdd, <u64>::from_le_bytes(data));
-        vmm.read_memory(0x8, &mut data).unwrap();
-        assert_eq!(0x11223344aabbccdd, <u64>::from_le_bytes(data));
-        vmm.read_memory(0x10, &mut data).unwrap();
-        assert_eq!(0x0, <u64>::from_le_bytes(data));
-    }
-}
--- a/hypervisor/src/arch/x86/emulator/mod.rs
+++ b/hypervisor/src/arch/x86/emulator/mod.rs
@@ -135,7 +135,7 @@ pub trait CpuStateManager: Clone {
                    .checked_add(segment_register.base)
                    .ok_or_else(|| {
                        PlatformError::InvalidAddress(anyhow!(
-                            "Logical address {:#x} cannot be linearized with segment {:#x?}",
+                            "Logical address {:#x} can not be linearized with segment {:#x?}",
                            logical_addr,
                            segment_register
                        ))
@@ -148,7 +148,7 @@ pub trait CpuStateManager: Clone {
                // Must not write to a read-only segment.
                if segment_type_ro(segment_type) && write {
                    return Err(PlatformError::InvalidAddress(anyhow!(
-                        "Cannot write to a read-only segment"
+                        "Can not write to a read-only segment"
                    )));
                }

@@ -532,17 +532,11 @@ impl<'a, T: CpuStateManager> Emulator<'a, T> {
            (mov, Mov_moffs64_RAX),
            (mov, Mov_RAX_moffs64),
            // MOVS
-            (movs, Movsq_m64_m64),
            (movs, Movsd_m32_m32),
            (movs, Movsw_m16_m16),
            (movs, Movsb_m8_m8),
            // OR
-            (or, Or_rm8_r8),
-            // STOS
-            (stos, Stosb_m8_AL),
-            (stos, Stosw_m16_AX),
-            (stos, Stosd_m32_EAX),
-            (stos, Stosq_m64_RAX)
+            (or, Or_rm8_r8)
        );

        handler
@@ -567,7 +561,7 @@ impl<'a, T: CpuStateManager> Emulator<'a, T> {

        decoder.set_ip(state.ip());

-        while !stop_emulation {
+        while decoder.can_decode() && !stop_emulation {
            decoder.decode_out(&mut insn);

            if decoder.last_error() == DecoderError::NoMoreBytes {
@@ -594,7 +588,6 @@ impl<'a, T: CpuStateManager> Emulator<'a, T> {
                // Once we have the new stream, we must create a new decoder
                // and emulate one last instruction from the last decoded IP.
                decoder = Decoder::new(64, &fetched_insn_stream, DecoderOptions::NONE);
-                decoder.set_ip(last_decoded_ip);
                decoder.decode_out(&mut insn);
                if decoder.last_error() != DecoderError::None {
                    return Err(EmulationError::InstructionFetchingError(anyhow!(
@@ -602,6 +595,8 @@ impl<'a, T: CpuStateManager> Emulator<'a, T> {
                        insn_format!(insn)
                    )));
                }
+
+                stop_emulation = true;
            }

            // Emulate the decoded instruction
@@ -653,9 +648,13 @@ impl<'a, T: CpuStateManager> Emulator<'a, T> {

 #[cfg(test)]
 mod mock_vmm {
+    #![allow(unused_mut)]
+
    use super::*;
-    use crate::arch::x86::emulator::EmulatorCpuState as CpuState;
+    use crate::arch::emulator::{EmulationError, PlatformEmulator};
+    use crate::arch::x86::emulator::{Emulator, EmulatorCpuState as CpuState};
    use crate::arch::x86::gdt::{gdt_entry, segment_from_gdt};
+    use crate::arch::x86::Exception;
    use std::sync::{Arc, Mutex};

    #[derive(Debug, Clone)]
@@ -756,6 +755,10 @@ mod mock_vmm {
            Ok(())
        }

+        fn gva_to_gpa(&self, gva: u64) -> Result<u64, PlatformError> {
+            Ok(gva)
+        }
+
        fn fetch(&self, ip: u64, instruction_bytes: &mut [u8]) -> Result<(), PlatformError> {
            let rip = self
                .state
@@ -769,80 +772,16 @@ mod mock_vmm {

 #[cfg(test)]
 mod tests {
+    #![allow(unused_mut)]
    use super::*;
    use crate::arch::x86::emulator::mock_vmm::*;

-    #[test]
-    // Emulate executing an empty stream. Instructions should be fetched from
-    // memory.
-    //
-    // mov rax, 0x1000
-    // mov rbx, qword ptr [rax+10h]
-    fn test_empty_instruction_stream() {
-        let target_rax: u64 = 0x1000;
-        let target_rbx: u64 = 0x1234567812345678;
-        let ip: u64 = 0x1000;
-        let cpu_id = 0;
-        let memory = [
-            // Code at IP
-            0x48, 0xc7, 0xc0, 0x00, 0x10, 0x00, 0x00, // mov rax, 0x1000
-            0x48, 0x8b, 0x58, 0x10, // mov rbx, qword ptr [rax+10h]
-            // Padding
-            0x00, 0x00, 0x00, 0x00, 0x00, // Padding is all zeroes
-            // Data at IP + 0x10 (0x1234567812345678 in LE)
-            0x78, 0x56, 0x34, 0x12, 0x78, 0x56, 0x34, 0x12,
-        ];
-
-        let mut vmm = MockVmm::new(ip, vec![], Some((ip, &memory)));
-        assert!(vmm.emulate_insn(cpu_id, &[], Some(2)).is_ok());
-
-        let rax: u64 = vmm
-            .cpu_state(cpu_id)
-            .unwrap()
-            .read_reg(Register::RAX)
-            .unwrap();
-        assert_eq!(rax, target_rax);
-
-        let rbx: u64 = vmm
-            .cpu_state(cpu_id)
-            .unwrap()
-            .read_reg(Register::RBX)
-            .unwrap();
-        assert_eq!(rbx, target_rbx);
-    }
-
-    #[test]
-    // Emulate executing an empty stream. Instructions should be fetched from
-    // memory. The emulation should abort.
-    //
-    // mov rax, 0x1000
-    // mov rbx, qword ptr [rax+10h]
-    // ... garbage ...
-    fn test_empty_instruction_stream_bad() {
-        let ip: u64 = 0x1000;
-        let cpu_id = 0;
-        let memory = [
-            // Code at IP
-            0x48, 0xc7, 0xc0, 0x00, 0x10, 0x00, 0x00, // mov rax, 0x1000
-            0x48, 0x8b, 0x58, 0x10, // mov rbx, qword ptr [rax+10h]
-            // Padding
-            0xff, 0xff, 0xff, 0xff, 0xff, // Garbage
-            // Data at IP + 0x10 (0x1234567812345678 in LE)
-            0x78, 0x56, 0x34, 0x12, 0x78, 0x56, 0x34, 0x12,
-        ];
-
-        let mut vmm = MockVmm::new(ip, vec![], Some((ip, &memory)));
-        assert!(vmm.emulate_insn(cpu_id, &[], None).is_err());
-    }
-
    #[test]
    // Emulate truncated instruction stream, which should cause a fetch.
    //
    // mov rax, 0x1000
-    // mov rbx, qword ptr [rax+10h]
    // Test with a first instruction truncated.
    fn test_fetch_first_instruction() {
-        let target_rax: u64 = 0x1000;
        let ip: u64 = 0x1000;
        let cpu_id = 0;
        let memory = [
@@ -867,7 +806,7 @@ mod tests {
            .unwrap()
            .read_reg(Register::RAX)
            .unwrap();
-        assert_eq!(rax, target_rax);
+        assert_eq!(rax, ip);
    }

    #[test]
@@ -905,52 +844,6 @@ mod tests {
        assert_eq!(rbx, target_rax);
    }

-    #[test]
-    // Emulate only one instruction.
-    //
-    // mov rax, 0x1000
-    // mov rbx, qword ptr [rax+10h]
-    // The emulation should stop after the first instruction.
-    fn test_emulate_one_instruction() {
-        let target_rax: u64 = 0x1000;
-        let ip: u64 = 0x1000;
-        let cpu_id = 0;
-        let memory = [
-            // Code at IP
-            0x48, 0xc7, 0xc0, 0x00, 0x10, 0x00, 0x00, // mov rax, 0x1000
-            0x48, 0x8b, 0x58, 0x10, // mov rbx, qword ptr [rax+10h]
-            // Padding
-            0x00, 0x00, 0x00, 0x00, 0x00, // Padding is all zeroes
-            // Data at IP + 0x10 (0x1234567812345678 in LE)
-            0x78, 0x56, 0x34, 0x12, 0x78, 0x56, 0x34, 0x12,
-        ];
-        let insn = [
-            0x48, 0xc7, 0xc0, 0x00, 0x10, 0x00, 0x00, // mov rax, 0x1000
-            0x48, 0x8b, 0x58, 0x10, // mov rbx, qword ptr [rax+10h]
-        ];
-
-        let mut vmm = MockVmm::new(ip, vec![], Some((ip, &memory)));
-        assert!(vmm.emulate_insn(cpu_id, &insn, Some(1)).is_ok());
-
-        let new_ip: u64 = vmm.cpu_state(cpu_id).unwrap().ip();
-        assert_eq!(new_ip, ip + 0x7 /* length of mov rax,0x1000 */);
-
-        let rax: u64 = vmm
-            .cpu_state(cpu_id)
-            .unwrap()
-            .read_reg(Register::RAX)
-            .unwrap();
-        assert_eq!(rax, target_rax);
-
-        // The second instruction is not executed so RBX should be zero.
-        let rbx: u64 = vmm
-            .cpu_state(cpu_id)
-            .unwrap()
-            .read_reg(Register::RBX)
-            .unwrap();
-        assert_eq!(rbx, 0);
-    }
-
    #[test]
    // Emulate truncated instruction stream, which should cause a fetch.
    //
--- a/hypervisor/src/arch/x86/mod.rs
+++ b/hypervisor/src/arch/x86/mod.rs
@@ -53,6 +53,7 @@ pub enum Exception {
 pub mod regs;

 #[derive(Debug, Default, Copy, Clone, PartialEq, Eq)]
+#[cfg_attr(feature = "with-serde", derive(Deserialize, Serialize))]
 pub struct SegmentRegister {
    pub base: u64,
    pub limit: u32,
@@ -173,6 +174,7 @@ macro_rules! msr_data {
 }

 #[derive(Debug, Default, Copy, Clone, PartialEq, Eq)]
+#[cfg_attr(feature = "with-serde", derive(Deserialize, Serialize))]
 pub struct StandardRegisters {
    pub rax: u64,
    pub rbx: u64,
@@ -195,12 +197,14 @@ pub struct StandardRegisters {
 }

 #[derive(Debug, Default, Copy, Clone, PartialEq, Eq)]
+#[cfg_attr(feature = "with-serde", derive(Deserialize, Serialize))]
 pub struct DescriptorTable {
    pub base: u64,
    pub limit: u16,
 }

 #[derive(Debug, Default, Copy, Clone, PartialEq, Eq)]
+#[cfg_attr(feature = "with-serde", derive(Deserialize, Serialize))]
 pub struct SpecialRegisters {
    pub cs: SegmentRegister,
    pub ds: SegmentRegister,
@@ -308,10 +312,10 @@ pub struct MsrEntry {
    pub data: u64,
 }

+#[repr(C)]
 #[serde_with::serde_as]
-#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Clone)]
 pub struct XsaveState {
-    #[serde_as(as = "[_; 1024usize]")]
    pub region: [u32; 1024usize],
 }

@@ -321,3 +325,26 @@ impl Default for XsaveState {
        unsafe { ::std::mem::zeroed() }
    }
 }
+
+impl<'de> serde::Deserialize<'de> for XsaveState {
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let region: Vec<u32> = Vec::deserialize(deserializer)?;
+        let mut val: XsaveState = XsaveState::default();
+        // This panics if the source and destination have different lengths.
+        val.region.copy_from_slice(&region[..]);
+        Ok(val)
+    }
+}
+
+impl serde::Serialize for XsaveState {
+    fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        let region = &self.region[..];
+        region.serialize(serializer)
+    }
+}
--- a/hypervisor/src/arch/x86/msr_index.rs
+++ b/hypervisor/src/arch/x86/msr_index.rs
@@ -1,6 +1,4 @@
 // Copyright 2017 The Chromium OS Authors. All rights reserved.
-//
-// SPDX-License-Identifier: Apache-2.0 AND BSD-3-Clause
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-BSD-3-Clause file.

--- a/hypervisor/src/cpu.rs
+++ b/hypervisor/src/cpu.rs
@@ -107,28 +107,14 @@ pub enum HypervisorCpuError {
    ///
    /// Setting Saved Processor Extended States error
    ///
-    #[cfg(feature = "kvm")]
    #[error("Failed to set Saved Processor Extended States: {0}")]
    SetXsaveState(#[source] anyhow::Error),
    ///
    /// Getting Saved Processor Extended States error
    ///
-    #[cfg(feature = "kvm")]
    #[error("Failed to get Saved Processor Extended States: {0}")]
    GetXsaveState(#[source] anyhow::Error),
    ///
-    /// Getting the VP state components error
-    ///
-    #[cfg(feature = "mshv")]
-    #[error("Failed to get VP State Components: {0}")]
-    GetAllVpStateComponents(#[source] anyhow::Error),
-    ///
-    /// Setting the VP state components error
-    ///
-    #[cfg(feature = "mshv")]
-    #[error("Failed to set VP State Components: {0}")]
-    SetAllVpStateComponents(#[source] anyhow::Error),
-    ///
    /// Setting Extended Control Registers error
    ///
    #[error("Failed to set Extended Control Registers: {0}")]
@@ -286,23 +272,18 @@ pub enum HypervisorCpuError {
    ///
    #[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),
-
-    /// Error injecting NMI
-    ///
-    #[error("Failed to inject NMI")]
-    Nmi(#[source] anyhow::Error),
 }

 #[derive(Debug)]
-pub enum VmExit {
+pub enum VmExit<'a> {
+    #[cfg(target_arch = "x86_64")]
+    IoOut(u16 /* port */, &'a [u8] /* data */),
+    #[cfg(target_arch = "x86_64")]
+    IoIn(u16 /* port */, &'a mut [u8] /* data */),
    #[cfg(target_arch = "x86_64")]
    IoapicEoi(u8 /* vector */),
+    MmioRead(u64 /* address */, &'a mut [u8]),
+    MmioWrite(u64 /* address */, &'a [u8]),
    Ignore,
    Reset,
    Shutdown,
@@ -514,14 +495,4 @@ pub trait Vcpu: Send + Sync {
    ) -> Result<[u32; 4]> {
        unimplemented!()
    }
-    #[cfg(feature = "mshv")]
-    fn set_sev_control_register(&self, _reg: u64) -> Result<()> {
-        unimplemented!()
-    }
-
-    #[cfg(target_arch = "x86_64")]
-    ///
-    /// Trigger NMI interrupt
-    ///
-    fn nmi(&self) -> Result<()>;
 }
--- a/hypervisor/src/hypervisor.rs
+++ b/hypervisor/src/hypervisor.rs
@@ -21,6 +21,8 @@ use std::sync::Arc;
 use thiserror::Error;

 #[derive(Error, Debug)]
+///
+///
 pub enum HypervisorError {
    ///
    /// Hypervisor availability check error
@@ -166,7 +168,7 @@ pub trait Hypervisor: Send + Sync {
                CpuVendor::AMD
            } else {
                // Not known yet, the corresponding manufacturer manual should contain the
-                // necessary info. See also https://wiki.osdev.org/CPUID#CPU_Vendor_ID_String
+                // necesssary info. See also https://wiki.osdev.org/CPUID#CPU_Vendor_ID_String
                CpuVendor::default()
            }
        }
--- a/hypervisor/src/kvm/aarch64/gic/dist_regs.rs
+++ b/hypervisor/src/kvm/aarch64/gic/dist_regs.rs
@@ -77,61 +77,46 @@ static VGIC_DIST_REGS: &[DistReg] = &[
    VGIC_DIST_REG!(GICD_IPRIORITYR, 8, 0),
 ];

-fn dist_attr_set(gic: &DeviceFd, offset: u32, val: u32) -> Result<()> {
-    let gic_dist_attr = kvm_device_attr {
-        group: KVM_DEV_ARM_VGIC_GRP_DIST_REGS,
-        attr: offset as u64,
-        addr: &val as *const u32 as u64,
-        flags: 0,
-    };
-
-    gic.set_device_attr(&gic_dist_attr).map_err(|e| {
-        Error::SetDeviceAttribute(HypervisorDeviceError::SetDeviceAttribute(e.into()))
-    })?;
-
-    Ok(())
-}
-
-fn dist_attr_get(gic: &DeviceFd, offset: u32) -> Result<u32> {
-    let mut val = 0;
-
+fn dist_attr_access(gic: &DeviceFd, offset: u32, val: &u32, set: bool) -> Result<()> {
    let mut gic_dist_attr = kvm_device_attr {
        group: KVM_DEV_ARM_VGIC_GRP_DIST_REGS,
        attr: offset as u64,
-        addr: &mut val as *mut u32 as u64,
+        addr: val as *const u32 as u64,
        flags: 0,
    };
-
-    // get_device_attr should be marked as unsafe, and will be in future.
-    // SAFETY: gic_dist_attr.addr is safe to write to.
-    gic.get_device_attr(&mut gic_dist_attr).map_err(|e| {
-        Error::GetDeviceAttribute(HypervisorDeviceError::GetDeviceAttribute(e.into()))
-    })?;
-
-    Ok(val)
+    if set {
+        gic.set_device_attr(&gic_dist_attr).map_err(|e| {
+            Error::SetDeviceAttribute(HypervisorDeviceError::SetDeviceAttribute(e.into()))
+        })?;
+    } else {
+        gic.get_device_attr(&mut gic_dist_attr).map_err(|e| {
+            Error::GetDeviceAttribute(HypervisorDeviceError::GetDeviceAttribute(e.into()))
+        })?;
+    }
+    Ok(())
 }

 /// Get the distributor control register.
 pub fn read_ctlr(gic: &DeviceFd) -> Result<u32> {
-    dist_attr_get(gic, GICD_CTLR)
+    let val: u32 = 0;
+    dist_attr_access(gic, GICD_CTLR, &val, false)?;
+    Ok(val)
 }

 /// Set the distributor control register.
 pub fn write_ctlr(gic: &DeviceFd, val: u32) -> Result<()> {
-    dist_attr_set(gic, GICD_CTLR, val)
+    dist_attr_access(gic, GICD_CTLR, &val, true)
 }

 fn get_interrupts_num(gic: &DeviceFd) -> Result<u32> {
-    let mut num_irq = 0;
+    let num_irq = 0;

    let mut nr_irqs_attr = kvm_device_attr {
        group: KVM_DEV_ARM_VGIC_GRP_NR_IRQS,
        attr: 0,
-        addr: &mut num_irq as *mut u32 as u64,
+        addr: &num_irq as *const u32 as u64,
        flags: 0,
    };
-    // get_device_attr should be marked as unsafe, and will be in future.
-    // SAFETY: nr_irqs_attr.addr is safe to write to.
    gic.get_device_attr(&mut nr_irqs_attr).map_err(|e| {
        Error::GetDeviceAttribute(HypervisorDeviceError::GetDeviceAttribute(e.into()))
    })?;
@@ -173,7 +158,8 @@ pub fn set_dist_regs(gic: &DeviceFd, state: &[u32]) -> Result<()> {
        let end = compute_reg_len(gic, dreg, base)?;

        while base < end {
-            dist_attr_set(gic, base, state[idx])?;
+            let val = state[idx];
+            dist_attr_access(gic, base, &val, true)?;
            idx += 1;
            base += REG_SIZE as u32;
        }
@@ -189,7 +175,9 @@ pub fn get_dist_regs(gic: &DeviceFd) -> Result<Vec<u32>> {
        let end = compute_reg_len(gic, dreg, base)?;

        while base < end {
-            state.push(dist_attr_get(gic, base)?);
+            let val: u32 = 0;
+            dist_attr_access(gic, base, &val, false)?;
+            state.push(val);
            base += REG_SIZE as u32;
        }
    }
--- a/hypervisor/src/kvm/aarch64/gic/icc_regs.rs
+++ b/hypervisor/src/kvm/aarch64/gic/icc_regs.rs
@@ -79,38 +79,23 @@ static VGIC_ICC_REGS: &[u64] = &[
    SYS_ICC_AP1R3_EL1,
 ];

-fn icc_attr_set(gic: &DeviceFd, offset: u64, typer: u64, val: u32) -> Result<()> {
-    let gic_icc_attr = kvm_device_attr {
-        group: KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS,
-        attr: ((typer & KVM_DEV_ARM_VGIC_V3_MPIDR_MASK) | offset), // this needs the mpidr
-        addr: &val as *const u32 as u64,
-        flags: 0,
-    };
-
-    gic.set_device_attr(&gic_icc_attr).map_err(|e| {
-        Error::SetDeviceAttribute(HypervisorDeviceError::SetDeviceAttribute(e.into()))
-    })?;
-
-    Ok(())
-}
-
-fn icc_attr_get(gic: &DeviceFd, offset: u64, typer: u64) -> Result<u32> {
-    let mut val = 0;
-
+fn icc_attr_access(gic: &DeviceFd, offset: u64, typer: u64, val: &u32, set: bool) -> Result<()> {
    let mut gic_icc_attr = kvm_device_attr {
        group: KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS,
        attr: ((typer & KVM_DEV_ARM_VGIC_V3_MPIDR_MASK) | offset), // this needs the mpidr
-        addr: &mut val as *mut u32 as u64,
+        addr: val as *const u32 as u64,
        flags: 0,
    };
-
-    // get_device_attr should be marked as unsafe, and will be in future.
-    // SAFETY: gic_icc_attr.addr is safe to write to.
-    gic.get_device_attr(&mut gic_icc_attr).map_err(|e| {
-        Error::GetDeviceAttribute(HypervisorDeviceError::GetDeviceAttribute(e.into()))
-    })?;
-
-    Ok(val)
+    if set {
+        gic.set_device_attr(&gic_icc_attr).map_err(|e| {
+            Error::SetDeviceAttribute(HypervisorDeviceError::SetDeviceAttribute(e.into()))
+        })?;
+    } else {
+        gic.get_device_attr(&mut gic_icc_attr).map_err(|e| {
+            Error::GetDeviceAttribute(HypervisorDeviceError::GetDeviceAttribute(e.into()))
+        })?;
+    }
+    Ok(())
 }

 /// Get ICC registers.
@@ -122,9 +107,10 @@ pub fn get_icc_regs(gic: &DeviceFd, gicr_typer: &[u64]) -> Result<Vec<u32>> {
    for ix in gicr_typer {
        let i = *ix;
        for icc_offset in VGIC_ICC_REGS {
+            let val = 0;
            if *icc_offset == SYS_ICC_CTLR_EL1 {
                // calculate priority bits by reading the ctrl_el1 register.
-                let val = icc_attr_get(gic, *icc_offset, i)?;
+                icc_attr_access(gic, *icc_offset, i, &val, false)?;
                // The priority bits are found in the ICC_CTLR_EL1 register (bits from  10:8).
                // See page 194 from https://static.docs.arm.com/ihi0069/c/IHI0069C_gic_
                // architecture_specification.pdf.
@@ -144,7 +130,8 @@ pub fn get_icc_regs(gic: &DeviceFd, gicr_typer: &[u64]) -> Result<Vec<u32>> {
            // 7 bits of priority.
            else if *icc_offset == SYS_ICC_AP0R1_EL1 || *icc_offset == SYS_ICC_AP1R1_EL1 {
                if num_priority_bits >= 6 {
-                    state.push(icc_attr_get(gic, *icc_offset, i)?);
+                    icc_attr_access(gic, *icc_offset, i, &val, false)?;
+                    state.push(val);
                }
            } else if *icc_offset == SYS_ICC_AP0R2_EL1
                || *icc_offset == SYS_ICC_AP0R3_EL1
@@ -152,10 +139,12 @@ pub fn get_icc_regs(gic: &DeviceFd, gicr_typer: &[u64]) -> Result<Vec<u32>> {
                || *icc_offset == SYS_ICC_AP1R3_EL1
            {
                if num_priority_bits == 7 {
-                    state.push(icc_attr_get(gic, *icc_offset, i)?);
+                    icc_attr_access(gic, *icc_offset, i, &val, false)?;
+                    state.push(val);
                }
            } else {
-                state.push(icc_attr_get(gic, *icc_offset, i)?);
+                icc_attr_access(gic, *icc_offset, i, &val, false)?;
+                state.push(val);
            }
        }
    }
@@ -176,7 +165,7 @@ pub fn set_icc_regs(gic: &DeviceFd, gicr_typer: &[u64], state: &[u32]) -> Result
            }
            if *icc_offset == SYS_ICC_AP0R1_EL1 || *icc_offset == SYS_ICC_AP1R1_EL1 {
                if num_priority_bits >= 6 {
-                    icc_attr_set(gic, *icc_offset, i, state[idx])?;
+                    icc_attr_access(gic, *icc_offset, i, &state[idx], true)?;
                    idx += 1;
                }
                continue;
@@ -187,12 +176,12 @@ pub fn set_icc_regs(gic: &DeviceFd, gicr_typer: &[u64], state: &[u32]) -> Result
                || *icc_offset == SYS_ICC_AP1R3_EL1
            {
                if num_priority_bits == 7 {
-                    icc_attr_set(gic, *icc_offset, i, state[idx])?;
+                    icc_attr_access(gic, *icc_offset, i, &state[idx], true)?;
                    idx += 1;
                }
                continue;
            }
-            icc_attr_set(gic, *icc_offset, i, state[idx])?;
+            icc_attr_access(gic, *icc_offset, i, &state[idx], true)?;
            idx += 1;
        }
    }
--- a/hypervisor/src/kvm/aarch64/gic/mod.rs
+++ b/hypervisor/src/kvm/aarch64/gic/mod.rs
@@ -1,6 +1,4 @@
 // Copyright 2022 Arm Limited (or its affiliates). All rights reserved.
-//
-// SPDX-License-Identifier: Apache-2.0

 mod dist_regs;
 mod icc_regs;
@@ -8,7 +6,7 @@ mod redist_regs;

 use crate::arch::aarch64::gic::{Error, Result, Vgic, VgicConfig};
 use crate::device::HypervisorDeviceError;
-use crate::kvm::KvmVm;
+use crate::kvm::{kvm_bindings, KvmVm};
 use crate::{CpuState, Vm};
 use dist_regs::{get_dist_regs, read_ctlr, set_dist_regs, write_ctlr};
 use icc_regs::{get_icc_regs, set_icc_regs};
@@ -16,6 +14,7 @@ use kvm_ioctls::DeviceFd;
 use redist_regs::{construct_gicr_typers, get_redist_regs, set_redist_regs};
 use serde::{Deserialize, Serialize};
 use std::any::Any;
+use std::convert::TryInto;

 const GITS_CTLR: u32 = 0x0000;
 const GITS_IIDR: u32 = 0x0004;
@@ -24,38 +23,34 @@ const GITS_CWRITER: u32 = 0x0088;
 const GITS_CREADR: u32 = 0x0090;
 const GITS_BASER: u32 = 0x0100;

-fn gicv3_its_attr_set(its_device: &DeviceFd, group: u32, attr: u32, val: u64) -> Result<()> {
-    let gicv3_its_attr = kvm_bindings::kvm_device_attr {
-        group,
-        attr: attr as u64,
-        addr: &val as *const u64 as u64,
-        flags: 0,
-    };
-
-    its_device
-        .set_device_attr(&gicv3_its_attr)
-        .map_err(|e| Error::SetDeviceAttribute(HypervisorDeviceError::SetDeviceAttribute(e.into())))
-}
-
-fn gicv3_its_attr_get(its_device: &DeviceFd, group: u32, attr: u32) -> Result<u64> {
-    let mut val = 0;
-
+/// Access an ITS device attribute.
+///
+/// This is a helper function to get/set the ITS device attribute depending
+/// the bool parameter `set` provided.
+pub fn gicv3_its_attr_access(
+    its_device: &DeviceFd,
+    group: u32,
+    attr: u32,
+    val: &u64,
+    set: bool,
+) -> Result<()> {
    let mut gicv3_its_attr = kvm_bindings::kvm_device_attr {
        group,
        attr: attr as u64,
-        addr: &mut val as *mut u64 as u64,
+        addr: val as *const u64 as u64,
        flags: 0,
    };
-
-    // get_device_attr should be marked as unsafe, and will be in future.
-    // SAFETY: gicv3_its_attr.addr is safe to write to.
-    its_device
-        .get_device_attr(&mut gicv3_its_attr)
-        .map_err(|e| {
-            Error::GetDeviceAttribute(HypervisorDeviceError::GetDeviceAttribute(e.into()))
-        })?;
-
-    Ok(val)
+    if set {
+        its_device.set_device_attr(&gicv3_its_attr).map_err(|e| {
+            Error::SetDeviceAttribute(HypervisorDeviceError::SetDeviceAttribute(e.into()))
+        })
+    } else {
+        its_device
+            .get_device_attr(&mut gicv3_its_attr)
+            .map_err(|e| {
+                Error::GetDeviceAttribute(HypervisorDeviceError::GetDeviceAttribute(e.into()))
+            })
+    }
 }

 /// Function that saves/restores ITS tables into guest RAM.
@@ -328,43 +323,60 @@ impl Vgic for KvmGicV3Its {

        let icc_state = get_icc_regs(&self.device, &gicr_typers)?;

-        let mut its_baser_state: [u64; 8] = [0; 8];
+        let its_baser_state: [u64; 8] = [0; 8];
        for i in 0..8 {
-            its_baser_state[i as usize] = gicv3_its_attr_get(
+            gicv3_its_attr_access(
                self.its_device.as_ref().unwrap(),
                kvm_bindings::KVM_DEV_ARM_VGIC_GRP_ITS_REGS,
                GITS_BASER + i * 8,
+                &its_baser_state[i as usize],
+                false,
            )?;
        }

-        let its_ctlr_state = gicv3_its_attr_get(
+        let its_ctlr_state: u64 = 0;
+        gicv3_its_attr_access(
            self.its_device.as_ref().unwrap(),
            kvm_bindings::KVM_DEV_ARM_VGIC_GRP_ITS_REGS,
            GITS_CTLR,
+            &its_ctlr_state,
+            false,
        )?;

-        let its_cbaser_state = gicv3_its_attr_get(
+        let its_cbaser_state: u64 = 0;
+        gicv3_its_attr_access(
            self.its_device.as_ref().unwrap(),
            kvm_bindings::KVM_DEV_ARM_VGIC_GRP_ITS_REGS,
            GITS_CBASER,
+            &its_cbaser_state,
+            false,
        )?;

-        let its_creadr_state = gicv3_its_attr_get(
+        let its_creadr_state: u64 = 0;
+        gicv3_its_attr_access(
            self.its_device.as_ref().unwrap(),
            kvm_bindings::KVM_DEV_ARM_VGIC_GRP_ITS_REGS,
            GITS_CREADR,
+            &its_creadr_state,
+            false,
        )?;

-        let its_cwriter_state = gicv3_its_attr_get(
+        let its_cwriter_state: u64 = 0;
+        gicv3_its_attr_access(
            self.its_device.as_ref().unwrap(),
            kvm_bindings::KVM_DEV_ARM_VGIC_GRP_ITS_REGS,
            GITS_CWRITER,
+            &its_cwriter_state,
+            false,
        )?;

-        let its_iidr_state = gicv3_its_attr_get(
+        let its_iidr_state: u64 = 0;
+        gicv3_its_attr_access(
            self.its_device.as_ref().unwrap(),
            kvm_bindings::KVM_DEV_ARM_VGIC_GRP_ITS_REGS,
            GITS_IIDR,
+            &its_iidr_state,
+            false,
        )?;

        Ok(Gicv3ItsState {
@@ -394,51 +406,57 @@ impl Vgic for KvmGicV3Its {
        set_icc_regs(&self.device, &gicr_typers, &state.icc)?;

        //Restore GICv3ITS registers
-        gicv3_its_attr_set(
+        gicv3_its_attr_access(
            self.its_device.as_ref().unwrap(),
            kvm_bindings::KVM_DEV_ARM_VGIC_GRP_ITS_REGS,
            GITS_IIDR,
-            state.its_iidr,
+            &state.its_iidr,
+            true,
        )?;

-        gicv3_its_attr_set(
+        gicv3_its_attr_access(
            self.its_device.as_ref().unwrap(),
            kvm_bindings::KVM_DEV_ARM_VGIC_GRP_ITS_REGS,
            GITS_CBASER,
-            state.its_cbaser,
+            &state.its_cbaser,
+            true,
        )?;

-        gicv3_its_attr_set(
+        gicv3_its_attr_access(
            self.its_device.as_ref().unwrap(),
            kvm_bindings::KVM_DEV_ARM_VGIC_GRP_ITS_REGS,
            GITS_CREADR,
-            state.its_creadr,
+            &state.its_creadr,
+            true,
        )?;

-        gicv3_its_attr_set(
+        gicv3_its_attr_access(
            self.its_device.as_ref().unwrap(),
            kvm_bindings::KVM_DEV_ARM_VGIC_GRP_ITS_REGS,
            GITS_CWRITER,
-            state.its_cwriter,
+            &state.its_cwriter,
+            true,
        )?;

        for i in 0..8 {
-            gicv3_its_attr_set(
+            gicv3_its_attr_access(
                self.its_device.as_ref().unwrap(),
                kvm_bindings::KVM_DEV_ARM_VGIC_GRP_ITS_REGS,
                GITS_BASER + i * 8,
-                state.its_baser[i as usize],
+                &state.its_baser[i as usize],
+                true,
            )?;
        }

        // Restore ITS tables
        gicv3_its_tables_access(self.its_device.as_ref().unwrap(), false)?;

-        gicv3_its_attr_set(
+        gicv3_its_attr_access(
            self.its_device.as_ref().unwrap(),
            kvm_bindings::KVM_DEV_ARM_VGIC_GRP_ITS_REGS,
            GITS_CTLR,
-            state.its_ctlr,
+            &state.its_ctlr,
+            true,
        )
    }

--- a/hypervisor/src/kvm/aarch64/gic/redist_regs.rs
+++ b/hypervisor/src/kvm/aarch64/gic/redist_regs.rs
@@ -46,7 +46,7 @@ const KVM_ARM64_SYSREG_MPIDR_EL1: u64 = KVM_REG_ARM64
    | (((5_u64) << KVM_REG_ARM64_SYSREG_OP2_SHIFT) & KVM_REG_ARM64_SYSREG_OP2_MASK as u64);

 /// This is how we represent the registers of a distributor.
-/// It is relevant their offset from the base address of the
+/// It is relrvant their offset from the base address of the
 /// distributor.
 /// Each register has a different number
 /// of bits_per_irq and is therefore variable length.
@@ -96,38 +96,23 @@ static VGIC_SGI_REGS: &[RdistReg] = &[
    VGIC_RDIST_REG!(GICR_IPRIORITYR0, 32),
 ];

-fn redist_attr_set(gic: &DeviceFd, offset: u32, typer: u64, val: u32) -> Result<()> {
-    let gic_redist_attr = kvm_device_attr {
-        group: KVM_DEV_ARM_VGIC_GRP_REDIST_REGS,
-        attr: (typer & KVM_DEV_ARM_VGIC_V3_MPIDR_MASK) | (offset as u64), // this needs the mpidr
-        addr: &val as *const u32 as u64,
-        flags: 0,
-    };
-
-    gic.set_device_attr(&gic_redist_attr).map_err(|e| {
-        Error::SetDeviceAttribute(HypervisorDeviceError::SetDeviceAttribute(e.into()))
-    })?;
-
-    Ok(())
-}
-
-fn redist_attr_get(gic: &DeviceFd, offset: u32, typer: u64) -> Result<u32> {
-    let mut val = 0;
-
+fn redist_attr_access(gic: &DeviceFd, offset: u32, typer: u64, val: &u32, set: bool) -> Result<()> {
    let mut gic_redist_attr = kvm_device_attr {
        group: KVM_DEV_ARM_VGIC_GRP_REDIST_REGS,
        attr: (typer & KVM_DEV_ARM_VGIC_V3_MPIDR_MASK) | (offset as u64), // this needs the mpidr
-        addr: &mut val as *mut u32 as u64,
+        addr: val as *const u32 as u64,
        flags: 0,
    };
-
-    // get_device_attr should be marked as unsafe, and will be in future.
-    // SAFETY: gic_redist_attr.addr is safe to write to.
-    gic.get_device_attr(&mut gic_redist_attr).map_err(|e| {
-        Error::GetDeviceAttribute(HypervisorDeviceError::GetDeviceAttribute(e.into()))
-    })?;
-
-    Ok(val)
+    if set {
+        gic.set_device_attr(&gic_redist_attr).map_err(|e| {
+            Error::SetDeviceAttribute(HypervisorDeviceError::SetDeviceAttribute(e.into()))
+        })?;
+    } else {
+        gic.get_device_attr(&mut gic_redist_attr).map_err(|e| {
+            Error::GetDeviceAttribute(HypervisorDeviceError::GetDeviceAttribute(e.into()))
+        })?;
+    }
+    Ok(())
 }

 fn access_redists_aux(
@@ -144,11 +129,14 @@ fn access_redists_aux(
            let end = base + rdreg.length as u32;

            while base < end {
+                let mut val = 0;
                if set {
-                    redist_attr_set(gic, base, *i, state[*idx])?;
+                    val = state[*idx];
+                    redist_attr_access(gic, base, *i, &val, true)?;
                    *idx += 1;
                } else {
-                    state.push(redist_attr_get(gic, base, *i)?);
+                    redist_attr_access(gic, base, *i, &val, false)?;
+                    state.push(val);
                }
                base += REG_SIZE as u32;
            }
--- a/hypervisor/src/kvm/aarch64/mod.rs
+++ b/hypervisor/src/kvm/aarch64/mod.rs
@@ -106,23 +106,12 @@ pub fn is_system_register(regid: u64) -> bool {
 }

 pub fn check_required_kvm_extensions(kvm: &Kvm) -> KvmResult<()> {
-    macro_rules! check_extension {
-        ($cap:expr) => {
-            if !kvm.check_extension($cap) {
-                return Err(KvmError::CapabilityMissing($cap));
-            }
-        };
+    if !kvm.check_extension(Cap::SignalMsi) {
+        return Err(KvmError::CapabilityMissing(Cap::SignalMsi));
+    }
+    if !kvm.check_extension(Cap::OneReg) {
+        return Err(KvmError::CapabilityMissing(Cap::OneReg));
    }
-
-    // SetGuestDebug is required but some kernels have it implemented without the capability flag.
-    check_extension!(Cap::ImmediateExit);
-    check_extension!(Cap::Ioeventfd);
-    check_extension!(Cap::Irqchip);
-    check_extension!(Cap::Irqfd);
-    check_extension!(Cap::IrqRouting);
-    check_extension!(Cap::MpState);
-    check_extension!(Cap::OneReg);
-    check_extension!(Cap::UserMemory);
    Ok(())
 }

--- a/hypervisor/src/kvm/mod.rs
+++ b/hypervisor/src/kvm/mod.rs
@@ -27,6 +27,8 @@ use crate::{arm64_core_reg_id, offset_of};
 use kvm_ioctls::{NoDatamatch, VcpuFd, VmFd};
 use std::any::Any;
 use std::collections::HashMap;
+#[cfg(target_arch = "aarch64")]
+use std::convert::TryInto;
 #[cfg(target_arch = "x86_64")]
 use std::fs::File;
 #[cfg(target_arch = "x86_64")]
@@ -36,6 +38,7 @@ use std::os::unix::io::RawFd;
 use std::result;
 #[cfg(target_arch = "x86_64")]
 use std::sync::atomic::{AtomicBool, Ordering};
+#[cfg(target_arch = "aarch64")]
 use std::sync::Mutex;
 use std::sync::{Arc, RwLock};
 use vmm_sys_util::eventfd::EventFd;
@@ -102,15 +105,6 @@ pub use {
 #[cfg(target_arch = "x86_64")]
 const KVM_CAP_SGX_ATTRIBUTE: u32 = 196;

-#[cfg(target_arch = "x86_64")]
-use vmm_sys_util::ioctl_io_nr;
-
-#[cfg(all(not(feature = "tdx"), target_arch = "x86_64"))]
-use vmm_sys_util::ioctl_ioc_nr;
-
-#[cfg(target_arch = "x86_64")]
-ioctl_io_nr!(KVM_NMI, kvm_bindings::KVMIO, 0x9a);
-
 #[cfg(feature = "tdx")]
 const KVM_EXIT_TDX: u32 = 50;
 #[cfg(feature = "tdx")]
@@ -321,7 +315,7 @@ impl From<CpuState> for VcpuKvmState {
 #[cfg(target_arch = "x86_64")]
 impl From<kvm_clock_data> for ClockData {
    fn from(d: kvm_clock_data) -> Self {
-        ClockData::Kvm(d)
+        ClockData::Kvm(d.into())
    }
 }

@@ -329,7 +323,7 @@ impl From<kvm_clock_data> for ClockData {
 impl From<ClockData> for kvm_clock_data {
    fn from(ms: ClockData) -> Self {
        match ms {
-            ClockData::Kvm(s) => s,
+            ClockData::Kvm(s) => s.into(),
            /* Needed in case other hypervisors are enabled */
            #[allow(unreachable_patterns)]
            _ => panic!("CpuState is not valid"),
@@ -454,12 +448,12 @@ impl vm::Vm for KvmVm {
        id: u8,
        vm_ops: Option<Arc<dyn VmOps>>,
    ) -> vm::Result<Arc<dyn cpu::Vcpu>> {
-        let fd = self
+        let vc = self
            .fd
            .create_vcpu(id as u64)
            .map_err(|e| vm::HypervisorVmError::CreateVcpu(e.into()))?;
        let vcpu = KvmVcpu {
-            fd: Arc::new(Mutex::new(fd)),
+            fd: vc,
            #[cfg(target_arch = "x86_64")]
            msrs: self.msrs.clone(),
            vm_ops,
@@ -535,9 +529,9 @@ impl vm::Vm for KvmVm {

                if self.check_extension(crate::kvm::Cap::MsiDevid) {
                    // On AArch64, there is limitation on the range of the 'devid',
-                    // it cannot be greater than 65536 (the max of u16).
+                    // it can not be greater than 65536 (the max of u16).
                    //
-                    // BDF cannot be used directly, because 'segment' is in high
+                    // BDF can not be used directly, because 'segment' is in high
                    // 16 bits. The layout of the u32 BDF is:
                    // |---- 16 bits ----|-- 8 bits --|-- 5 bits --|-- 3 bits --|
                    // |      segment    |     bus    |   device   |  function  |
@@ -1169,7 +1163,7 @@ impl hypervisor::Hypervisor for KvmHypervisor {

 /// Vcpu struct for KVM
 pub struct KvmVcpu {
-    fd: Arc<Mutex<VcpuFd>>,
+    fd: VcpuFd,
    #[cfg(target_arch = "x86_64")]
    msrs: Vec<MsrEntry>,
    vm_ops: Option<Arc<dyn vm::VmOps>>,
@@ -1197,8 +1191,6 @@ impl cpu::Vcpu for KvmVcpu {
    fn get_regs(&self) -> cpu::Result<StandardRegisters> {
        Ok(self
            .fd
-            .lock()
-            .unwrap()
            .get_regs()
            .map_err(|e| cpu::HypervisorCpuError::GetStandardRegs(e.into()))?
            .into())
@@ -1220,8 +1212,6 @@ impl cpu::Vcpu for KvmVcpu {
        for i in 0..31 {
            let mut bytes = [0_u8; 8];
            self.fd
-                .lock()
-                .unwrap()
                .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off), &mut bytes)
                .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?;
            state.regs.regs[i] = u64::from_le_bytes(bytes);
@@ -1233,8 +1223,6 @@ impl cpu::Vcpu for KvmVcpu {
        let off = offset_of!(user_pt_regs, sp);
        let mut bytes = [0_u8; 8];
        self.fd
-            .lock()
-            .unwrap()
            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off), &mut bytes)
            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?;
        state.regs.sp = u64::from_le_bytes(bytes);
@@ -1243,8 +1231,6 @@ impl cpu::Vcpu for KvmVcpu {
        let off = offset_of!(user_pt_regs, pc);
        let mut bytes = [0_u8; 8];
        self.fd
-            .lock()
-            .unwrap()
            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off), &mut bytes)
            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?;
        state.regs.pc = u64::from_le_bytes(bytes);
@@ -1253,8 +1239,6 @@ impl cpu::Vcpu for KvmVcpu {
        let off = offset_of!(user_pt_regs, pstate);
        let mut bytes = [0_u8; 8];
        self.fd
-            .lock()
-            .unwrap()
            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off), &mut bytes)
            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?;
        state.regs.pstate = u64::from_le_bytes(bytes);
@@ -1263,8 +1247,6 @@ impl cpu::Vcpu for KvmVcpu {
        let off = offset_of!(kvm_regs, sp_el1);
        let mut bytes = [0_u8; 8];
        self.fd
-            .lock()
-            .unwrap()
            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off), &mut bytes)
            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?;
        state.sp_el1 = u64::from_le_bytes(bytes);
@@ -1274,8 +1256,6 @@ impl cpu::Vcpu for KvmVcpu {
        let off = offset_of!(kvm_regs, elr_el1);
        let mut bytes = [0_u8; 8];
        self.fd
-            .lock()
-            .unwrap()
            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off), &mut bytes)
            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?;
        state.elr_el1 = u64::from_le_bytes(bytes);
@@ -1285,8 +1265,6 @@ impl cpu::Vcpu for KvmVcpu {
        for i in 0..KVM_NR_SPSR as usize {
            let mut bytes = [0_u8; 8];
            self.fd
-                .lock()
-                .unwrap()
                .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U64, off), &mut bytes)
                .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?;
            state.spsr[i] = u64::from_le_bytes(bytes);
@@ -1299,8 +1277,6 @@ impl cpu::Vcpu for KvmVcpu {
        for i in 0..32 {
            let mut bytes = [0_u8; 16];
            self.fd
-                .lock()
-                .unwrap()
                .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U128, off), &mut bytes)
                .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?;
            state.fp_regs.vregs[i] = u128::from_le_bytes(bytes);
@@ -1311,8 +1287,6 @@ impl cpu::Vcpu for KvmVcpu {
        let off = offset_of!(kvm_regs, fp_regs) + offset_of!(user_fpsimd_state, fpsr);
        let mut bytes = [0_u8; 4];
        self.fd
-            .lock()
-            .unwrap()
            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U32, off), &mut bytes)
            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?;
        state.fp_regs.fpsr = u32::from_le_bytes(bytes);
@@ -1321,8 +1295,6 @@ impl cpu::Vcpu for KvmVcpu {
        let off = offset_of!(kvm_regs, fp_regs) + offset_of!(user_fpsimd_state, fpcr);
        let mut bytes = [0_u8; 4];
        self.fd
-            .lock()
-            .unwrap()
            .get_one_reg(arm64_core_reg_id!(KVM_REG_SIZE_U32, off), &mut bytes)
            .map_err(|e| cpu::HypervisorCpuError::GetCoreRegister(e.into()))?;
        state.fp_regs.fpcr = u32::from_le_bytes(bytes);
@@ -1336,8 +1308,6 @@ impl cpu::Vcpu for KvmVcpu {
    fn set_regs(&self, regs: &StandardRegisters) -> cpu::Result<()> {
        let regs = (*regs).into();
        self.fd
-            .lock()
-            .unwrap()
            .set_regs(&regs)
            .map_err(|e| cpu::HypervisorCpuError::SetStandardRegs(e.into()))
    }
@@ -1354,8 +1324,6 @@ impl cpu::Vcpu for KvmVcpu {
        let mut off = offset_of!(user_pt_regs, regs);
        for i in 0..31 {
            self.fd
-                .lock()
-                .unwrap()
                .set_one_reg(
                    arm64_core_reg_id!(KVM_REG_SIZE_U64, off),
                    &state.regs.regs[i].to_le_bytes(),
@@ -1366,8 +1334,6 @@ impl cpu::Vcpu for KvmVcpu {

        let off = offset_of!(user_pt_regs, sp);
        self.fd
-            .lock()
-            .unwrap()
            .set_one_reg(
                arm64_core_reg_id!(KVM_REG_SIZE_U64, off),
                &state.regs.sp.to_le_bytes(),
@@ -1376,8 +1342,6 @@ impl cpu::Vcpu for KvmVcpu {

        let off = offset_of!(user_pt_regs, pc);
        self.fd
-            .lock()
-            .unwrap()
            .set_one_reg(
                arm64_core_reg_id!(KVM_REG_SIZE_U64, off),
                &state.regs.pc.to_le_bytes(),
@@ -1386,8 +1350,6 @@ impl cpu::Vcpu for KvmVcpu {

        let off = offset_of!(user_pt_regs, pstate);
        self.fd
-            .lock()
-            .unwrap()
            .set_one_reg(
                arm64_core_reg_id!(KVM_REG_SIZE_U64, off),
                &state.regs.pstate.to_le_bytes(),
@@ -1396,8 +1358,6 @@ impl cpu::Vcpu for KvmVcpu {

        let off = offset_of!(kvm_regs, sp_el1);
        self.fd
-            .lock()
-            .unwrap()
            .set_one_reg(
                arm64_core_reg_id!(KVM_REG_SIZE_U64, off),
                &state.sp_el1.to_le_bytes(),
@@ -1406,8 +1366,6 @@ impl cpu::Vcpu for KvmVcpu {

        let off = offset_of!(kvm_regs, elr_el1);
        self.fd
-            .lock()
-            .unwrap()
            .set_one_reg(
                arm64_core_reg_id!(KVM_REG_SIZE_U64, off),
                &state.elr_el1.to_le_bytes(),
@@ -1417,8 +1375,6 @@ impl cpu::Vcpu for KvmVcpu {
        let mut off = offset_of!(kvm_regs, spsr);
        for i in 0..KVM_NR_SPSR as usize {
            self.fd
-                .lock()
-                .unwrap()
                .set_one_reg(
                    arm64_core_reg_id!(KVM_REG_SIZE_U64, off),
                    &state.spsr[i].to_le_bytes(),
@@ -1430,8 +1386,6 @@ impl cpu::Vcpu for KvmVcpu {
        let mut off = offset_of!(kvm_regs, fp_regs) + offset_of!(user_fpsimd_state, vregs);
        for i in 0..32 {
            self.fd
-                .lock()
-                .unwrap()
                .set_one_reg(
                    arm64_core_reg_id!(KVM_REG_SIZE_U128, off),
                    &state.fp_regs.vregs[i].to_le_bytes(),
@@ -1442,8 +1396,6 @@ impl cpu::Vcpu for KvmVcpu {

        let off = offset_of!(kvm_regs, fp_regs) + offset_of!(user_fpsimd_state, fpsr);
        self.fd
-            .lock()
-            .unwrap()
            .set_one_reg(
                arm64_core_reg_id!(KVM_REG_SIZE_U32, off),
                &state.fp_regs.fpsr.to_le_bytes(),
@@ -1452,8 +1404,6 @@ impl cpu::Vcpu for KvmVcpu {

        let off = offset_of!(kvm_regs, fp_regs) + offset_of!(user_fpsimd_state, fpcr);
        self.fd
-            .lock()
-            .unwrap()
            .set_one_reg(
                arm64_core_reg_id!(KVM_REG_SIZE_U32, off),
                &state.fp_regs.fpcr.to_le_bytes(),
@@ -1469,8 +1419,6 @@ impl cpu::Vcpu for KvmVcpu {
    fn get_sregs(&self) -> cpu::Result<SpecialRegisters> {
        Ok(self
            .fd
-            .lock()
-            .unwrap()
            .get_sregs()
            .map_err(|e| cpu::HypervisorCpuError::GetSpecialRegs(e.into()))?
            .into())
@@ -1483,8 +1431,6 @@ impl cpu::Vcpu for KvmVcpu {
    fn set_sregs(&self, sregs: &SpecialRegisters) -> cpu::Result<()> {
        let sregs = (*sregs).into();
        self.fd
-            .lock()
-            .unwrap()
            .set_sregs(&sregs)
            .map_err(|e| cpu::HypervisorCpuError::SetSpecialRegs(e.into()))
    }
@@ -1496,8 +1442,6 @@ impl cpu::Vcpu for KvmVcpu {
    fn get_fpu(&self) -> cpu::Result<FpuState> {
        Ok(self
            .fd
-            .lock()
-            .unwrap()
            .get_fpu()
            .map_err(|e| cpu::HypervisorCpuError::GetFloatingPointRegs(e.into()))?
            .into())
@@ -1505,13 +1449,11 @@ impl cpu::Vcpu for KvmVcpu {

    #[cfg(target_arch = "x86_64")]
    ///
-    /// Set the floating point state (FPU) of a vCPU using the `KVM_SET_FPU` ioctl.
+    /// Set the floating point state (FPU) of a vCPU using the `KVM_SET_FPU` ioct.
    ///
    fn set_fpu(&self, fpu: &FpuState) -> cpu::Result<()> {
        let fpu: kvm_bindings::kvm_fpu = (*fpu).clone().into();
        self.fd
-            .lock()
-            .unwrap()
            .set_fpu(&fpu)
            .map_err(|e| cpu::HypervisorCpuError::SetFloatingPointRegs(e.into()))
    }
@@ -1527,8 +1469,6 @@ impl cpu::Vcpu for KvmVcpu {
            .map_err(|_| cpu::HypervisorCpuError::SetCpuid(anyhow!("failed to create CpuId")))?;

        self.fd
-            .lock()
-            .unwrap()
            .set_cpuid2(&kvm_cpuid)
            .map_err(|e| cpu::HypervisorCpuError::SetCpuid(e.into()))
    }
@@ -1547,8 +1487,6 @@ impl cpu::Vcpu for KvmVcpu {
            ..Default::default()
        };
        self.fd
-            .lock()
-            .unwrap()
            .enable_cap(&cap)
            .map_err(|e| cpu::HypervisorCpuError::EnableHyperVSyncIc(e.into()))
    }
@@ -1560,8 +1498,6 @@ impl cpu::Vcpu for KvmVcpu {
    fn get_cpuid2(&self, num_entries: usize) -> cpu::Result<Vec<CpuIdEntry>> {
        let kvm_cpuid = self
            .fd
-            .lock()
-            .unwrap()
            .get_cpuid2(num_entries)
            .map_err(|e| cpu::HypervisorCpuError::GetCpuid(e.into()))?;

@@ -1577,8 +1513,6 @@ impl cpu::Vcpu for KvmVcpu {
    fn get_lapic(&self) -> cpu::Result<LapicState> {
        Ok(self
            .fd
-            .lock()
-            .unwrap()
            .get_lapic()
            .map_err(|e| cpu::HypervisorCpuError::GetlapicState(e.into()))?
            .into())
@@ -1591,8 +1525,6 @@ impl cpu::Vcpu for KvmVcpu {
    fn set_lapic(&self, klapic: &LapicState) -> cpu::Result<()> {
        let klapic: kvm_bindings::kvm_lapic_state = (*klapic).clone().into();
        self.fd
-            .lock()
-            .unwrap()
            .set_lapic(&klapic)
            .map_err(|e| cpu::HypervisorCpuError::SetLapicState(e.into()))
    }
@@ -1606,8 +1538,6 @@ impl cpu::Vcpu for KvmVcpu {
        let mut kvm_msrs = MsrEntries::from_entries(&kvm_msrs).unwrap();
        let succ = self
            .fd
-            .lock()
-            .unwrap()
            .get_msrs(&mut kvm_msrs)
            .map_err(|e| cpu::HypervisorCpuError::GetMsrEntries(e.into()))?;

@@ -1630,8 +1560,6 @@ impl cpu::Vcpu for KvmVcpu {
        let kvm_msrs: Vec<kvm_msr_entry> = msrs.iter().map(|e| (*e).into()).collect();
        let kvm_msrs = MsrEntries::from_entries(&kvm_msrs).unwrap();
        self.fd
-            .lock()
-            .unwrap()
            .set_msrs(&kvm_msrs)
            .map_err(|e| cpu::HypervisorCpuError::SetMsrEntries(e.into()))
    }
@@ -1642,8 +1570,6 @@ impl cpu::Vcpu for KvmVcpu {
    fn get_mp_state(&self) -> cpu::Result<MpState> {
        Ok(self
            .fd
-            .lock()
-            .unwrap()
            .get_mp_state()
            .map_err(|e| cpu::HypervisorCpuError::GetMpState(e.into()))?
            .into())
@@ -1654,8 +1580,6 @@ impl cpu::Vcpu for KvmVcpu {
    ///
    fn set_mp_state(&self, mp_state: MpState) -> cpu::Result<()> {
        self.fd
-            .lock()
-            .unwrap()
            .set_mp_state(mp_state.into())
            .map_err(|e| cpu::HypervisorCpuError::SetMpState(e.into()))
    }
@@ -1667,8 +1591,6 @@ impl cpu::Vcpu for KvmVcpu {
    fn translate_gva(&self, gva: u64, _flags: u64) -> cpu::Result<(u64, u32)> {
        let tr = self
            .fd
-            .lock()
-            .unwrap()
            .translate_gva(gva)
            .map_err(|e| cpu::HypervisorCpuError::TranslateVirtualAddress(e.into()))?;
        // tr.valid is set if the GVA is mapped to valid GPA.
@@ -1685,7 +1607,7 @@ impl cpu::Vcpu for KvmVcpu {
    /// Triggers the running of the current virtual CPU returning an exit reason.
    ///
    fn run(&self) -> std::result::Result<cpu::VmExit, cpu::HypervisorCpuError> {
-        match self.fd.lock().unwrap().run() {
+        match self.fd.run() {
            Ok(run) => match run {
                #[cfg(target_arch = "x86_64")]
                VcpuExit::IoIn(addr, data) => {
@@ -1696,7 +1618,7 @@ impl cpu::Vcpu for KvmVcpu {
                            .map_err(|e| cpu::HypervisorCpuError::RunVcpu(e.into()));
                    }

-                    Ok(cpu::VmExit::Ignore)
+                    Ok(cpu::VmExit::IoIn(addr, data))
                }
                #[cfg(target_arch = "x86_64")]
                VcpuExit::IoOut(addr, data) => {
@@ -1707,7 +1629,7 @@ impl cpu::Vcpu for KvmVcpu {
                            .map_err(|e| cpu::HypervisorCpuError::RunVcpu(e.into()));
                    }

-                    Ok(cpu::VmExit::Ignore)
+                    Ok(cpu::VmExit::IoOut(addr, data))
                }
                #[cfg(target_arch = "x86_64")]
                VcpuExit::IoapicEoi(vector) => Ok(cpu::VmExit::IoapicEoi(vector)),
@@ -1740,7 +1662,7 @@ impl cpu::Vcpu for KvmVcpu {
                            .map_err(|e| cpu::HypervisorCpuError::RunVcpu(e.into()));
                    }

-                    Ok(cpu::VmExit::Ignore)
+                    Ok(cpu::VmExit::MmioRead(addr, data))
                }
                VcpuExit::MmioWrite(addr, data) => {
                    if let Some(vm_ops) = &self.vm_ops {
@@ -1750,7 +1672,7 @@ impl cpu::Vcpu for KvmVcpu {
                            .map_err(|e| cpu::HypervisorCpuError::RunVcpu(e.into()));
                    }

-                    Ok(cpu::VmExit::Ignore)
+                    Ok(cpu::VmExit::MmioWrite(addr, data))
                }
                VcpuExit::Hyperv => Ok(cpu::VmExit::Hyperv),
                #[cfg(feature = "tdx")]
@@ -1779,7 +1701,7 @@ impl cpu::Vcpu for KvmVcpu {
    /// potential soft lockups when being resumed.
    ///
    fn notify_guest_clock_paused(&self) -> cpu::Result<()> {
-        if let Err(e) = self.fd.lock().unwrap().kvmclock_ctrl() {
+        if let Err(e) = self.fd.kvmclock_ctrl() {
            // Linux kernel returns -EINVAL if the PV clock isn't yet initialised
            // which could be because we're still in firmware or the guest doesn't
            // use KVM clock.
@@ -1841,8 +1763,6 @@ impl cpu::Vcpu for KvmVcpu {
            }
        }
        self.fd
-            .lock()
-            .unwrap()
            .set_guest_debug(&dbg)
            .map_err(|e| cpu::HypervisorCpuError::SetDebugRegs(e.into()))
    }
@@ -1850,8 +1770,6 @@ impl cpu::Vcpu for KvmVcpu {
    #[cfg(target_arch = "aarch64")]
    fn vcpu_init(&self, kvi: &VcpuInit) -> cpu::Result<()> {
        self.fd
-            .lock()
-            .unwrap()
            .vcpu_init(kvi)
            .map_err(|e| cpu::HypervisorCpuError::VcpuInit(e.into()))
    }
@@ -1863,8 +1781,6 @@ impl cpu::Vcpu for KvmVcpu {
    #[cfg(target_arch = "aarch64")]
    fn get_reg_list(&self, reg_list: &mut RegList) -> cpu::Result<()> {
        self.fd
-            .lock()
-            .unwrap()
            .get_reg_list(reg_list)
            .map_err(|e| cpu::HypervisorCpuError::GetRegList(e.into()))
    }
@@ -1897,8 +1813,6 @@ impl cpu::Vcpu for KvmVcpu {
                    | KVM_REG_ARM64_SYSREG_OP2_MASK)) as u64);
        let mut bytes = [0_u8; 8];
        self.fd
-            .lock()
-            .unwrap()
            .get_one_reg(id, &mut bytes)
            .map_err(|e| cpu::HypervisorCpuError::GetSysRegister(e.into()))?;
        Ok(u64::from_le_bytes(bytes))
@@ -1926,8 +1840,6 @@ impl cpu::Vcpu for KvmVcpu {
        // Get the register index of the PSTATE (Processor State) register.
        let pstate = offset_of!(user_pt_regs, pstate) + kreg_off;
        self.fd
-            .lock()
-            .unwrap()
            .set_one_reg(
                arm64_core_reg_id!(KVM_REG_SIZE_U64, pstate),
                &PSTATE_FAULT_BITS_64.to_le_bytes(),
@@ -1939,8 +1851,6 @@ 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
-                .lock()
-                .unwrap()
                .set_one_reg(
                    arm64_core_reg_id!(KVM_REG_SIZE_U64, pc),
                    &boot_ip.to_le_bytes(),
@@ -1953,8 +1863,6 @@ impl cpu::Vcpu for KvmVcpu {
            // We are choosing to place it the end of DRAM. See `get_fdt_addr`.
            let regs0 = offset_of!(user_pt_regs, regs) + kreg_off;
            self.fd
-                .lock()
-                .unwrap()
                .set_one_reg(
                    arm64_core_reg_id!(KVM_REG_SIZE_U64, regs0),
                    &fdt_start.to_le_bytes(),
@@ -1986,7 +1894,7 @@ impl cpu::Vcpu for KvmVcpu {
    /// SREGS saves/restores a pending interrupt, similar to what
    /// VCPU_EVENTS also does.
    ///
-    /// GET_MSRS requires a prepopulated data structure to do something
+    /// GET_MSRS requires a pre-populated data structure to do something
    /// meaningful. For SET_MSRS it will then contain good data.
    ///
    /// # Example
@@ -2069,7 +1977,7 @@ impl cpu::Vcpu for KvmVcpu {
            msr_entries
        };

-        let vcpu_events = self.get_vcpu_events()?;
+        let vcpu_events = self.get_vcpu_events()?.into();
        let tsc_khz = self.tsc_khz()?;

        Ok(VcpuKvmState {
@@ -2106,8 +2014,6 @@ impl cpu::Vcpu for KvmVcpu {
        let mut sys_regs: Vec<Register> = Vec::new();
        let mut reg_list = RegList::new(500).unwrap();
        self.fd
-            .lock()
-            .unwrap()
            .get_reg_list(&mut reg_list)
            .map_err(|e| cpu::HypervisorCpuError::GetRegList(e.into()))?;

@@ -2126,8 +2032,6 @@ impl cpu::Vcpu for KvmVcpu {
        for index in indices.iter() {
            let mut bytes = [0_u8; 8];
            self.fd
-                .lock()
-                .unwrap()
                .get_one_reg(*index, &mut bytes)
                .map_err(|e| cpu::HypervisorCpuError::GetSysRegister(e.into()))?;
            sys_regs.push(kvm_bindings::kvm_one_reg {
@@ -2226,7 +2130,7 @@ impl cpu::Vcpu for KvmVcpu {
            }
        }

-        self.set_vcpu_events(&state.vcpu_events)?;
+        self.set_vcpu_events(&state.vcpu_events.into())?;

        Ok(())
    }
@@ -2242,8 +2146,6 @@ impl cpu::Vcpu for KvmVcpu {
        // Set system registers
        for reg in &state.sys_regs {
            self.fd
-                .lock()
-                .unwrap()
                .set_one_reg(reg.id, &reg.addr.to_le_bytes())
                .map_err(|e| cpu::HypervisorCpuError::SetSysRegister(e.into()))?;
        }
@@ -2258,20 +2160,15 @@ impl cpu::Vcpu for KvmVcpu {
    ///
    #[cfg(feature = "tdx")]
    fn tdx_init(&self, hob_address: u64) -> cpu::Result<()> {
-        tdx_command(
-            &self.fd.lock().unwrap().as_raw_fd(),
-            TdxCommand::InitVcpu,
-            0,
-            hob_address,
-        )
-        .map_err(cpu::HypervisorCpuError::InitializeTdx)
+        tdx_command(&self.fd.as_raw_fd(), TdxCommand::InitVcpu, 0, hob_address)
+            .map_err(cpu::HypervisorCpuError::InitializeTdx)
    }

    ///
    /// Set the "immediate_exit" state
    ///
    fn set_immediate_exit(&self, exit: bool) {
-        self.fd.lock().unwrap().set_kvm_immediate_exit(exit.into());
+        self.fd.set_kvm_immediate_exit(exit.into());
    }

    ///
@@ -2279,8 +2176,7 @@ impl cpu::Vcpu for KvmVcpu {
    ///
    #[cfg(feature = "tdx")]
    fn get_tdx_exit_details(&mut self) -> cpu::Result<TdxExitDetails> {
-        let mut fd = self.fd.as_ref().lock().unwrap();
-        let kvm_run = fd.get_kvm_run();
+        let kvm_run = self.fd.get_kvm_run();
        // SAFETY: accessing a union field in a valid structure
        let tdx_vmcall = unsafe {
            &mut (*((&mut kvm_run.__bindgen_anon_1) as *mut kvm_run__bindgen_ty_1
@@ -2309,8 +2205,7 @@ impl cpu::Vcpu for KvmVcpu {
    ///
    #[cfg(feature = "tdx")]
    fn set_tdx_status(&mut self, status: TdxExitStatus) {
-        let mut fd = self.fd.as_ref().lock().unwrap();
-        let kvm_run = fd.get_kvm_run();
+        let kvm_run = self.fd.get_kvm_run();
        // SAFETY: accessing a union field in a valid structure
        let tdx_vmcall = unsafe {
            &mut (*((&mut kvm_run.__bindgen_anon_1) as *mut kvm_run__bindgen_ty_1
@@ -2359,7 +2254,7 @@ impl cpu::Vcpu for KvmVcpu {
            addr: 0x0,
            flags: 0,
        };
-        self.fd.lock().unwrap().has_device_attr(&cpu_attr).is_ok()
+        self.fd.has_device_attr(&cpu_attr).is_ok()
    }

    #[cfg(target_arch = "aarch64")]
@@ -2377,13 +2272,9 @@ impl cpu::Vcpu for KvmVcpu {
            flags: 0,
        };
        self.fd
-            .lock()
-            .unwrap()
            .set_device_attr(&cpu_attr_irq)
            .map_err(|_| cpu::HypervisorCpuError::InitializePmu)?;
        self.fd
-            .lock()
-            .unwrap()
            .set_device_attr(&cpu_attr)
            .map_err(|_| cpu::HypervisorCpuError::InitializePmu)
    }
@@ -2393,7 +2284,7 @@ impl cpu::Vcpu for KvmVcpu {
    /// Get the frequency of the TSC if available
    ///
    fn tsc_khz(&self) -> cpu::Result<Option<u32>> {
-        match self.fd.lock().unwrap().get_tsc_khz() {
+        match self.fd.get_tsc_khz() {
            Err(e) => {
                if e.errno() == libc::EIO {
                    Ok(None)
@@ -2410,7 +2301,7 @@ impl cpu::Vcpu for KvmVcpu {
    /// Set the frequency of the TSC if available
    ///
    fn set_tsc_khz(&self, freq: u32) -> cpu::Result<()> {
-        match self.fd.lock().unwrap().set_tsc_khz(freq) {
+        match self.fd.set_tsc_khz(freq) {
            Err(e) => {
                if e.errno() == libc::EIO {
                    Ok(())
@@ -2421,23 +2312,6 @@ impl cpu::Vcpu for KvmVcpu {
            Ok(_) => Ok(()),
        }
    }
-
-    #[cfg(target_arch = "x86_64")]
-    ///
-    /// Trigger NMI interrupt
-    ///
-    fn nmi(&self) -> cpu::Result<()> {
-        match self.fd.lock().unwrap().nmi() {
-            Err(e) => {
-                if e.errno() == libc::EIO {
-                    Ok(())
-                } else {
-                    Err(cpu::HypervisorCpuError::Nmi(e.into()))
-                }
-            }
-            Ok(_) => Ok(()),
-        }
-    }
 }

 impl KvmVcpu {
@@ -2448,8 +2322,6 @@ impl KvmVcpu {
    fn get_xsave(&self) -> cpu::Result<XsaveState> {
        Ok(self
            .fd
-            .lock()
-            .unwrap()
            .get_xsave()
            .map_err(|e| cpu::HypervisorCpuError::GetXsaveState(e.into()))?
            .into())
@@ -2462,8 +2334,6 @@ impl KvmVcpu {
    fn set_xsave(&self, xsave: &XsaveState) -> cpu::Result<()> {
        let xsave: kvm_bindings::kvm_xsave = (*xsave).clone().into();
        self.fd
-            .lock()
-            .unwrap()
            .set_xsave(&xsave)
            .map_err(|e| cpu::HypervisorCpuError::SetXsaveState(e.into()))
    }
@@ -2474,8 +2344,6 @@ impl KvmVcpu {
    ///
    fn get_xcrs(&self) -> cpu::Result<ExtendedControlRegisters> {
        self.fd
-            .lock()
-            .unwrap()
            .get_xcrs()
            .map_err(|e| cpu::HypervisorCpuError::GetXcsr(e.into()))
    }
@@ -2486,8 +2354,6 @@ impl KvmVcpu {
    ///
    fn set_xcrs(&self, xcrs: &ExtendedControlRegisters) -> cpu::Result<()> {
        self.fd
-            .lock()
-            .unwrap()
            .set_xcrs(xcrs)
            .map_err(|e| cpu::HypervisorCpuError::SetXcsr(e.into()))
    }
@@ -2499,8 +2365,6 @@ impl KvmVcpu {
    ///
    fn get_vcpu_events(&self) -> cpu::Result<VcpuEvents> {
        self.fd
-            .lock()
-            .unwrap()
            .get_vcpu_events()
            .map_err(|e| cpu::HypervisorCpuError::GetVcpuEvents(e.into()))
    }
@@ -2512,8 +2376,6 @@ impl KvmVcpu {
    ///
    fn set_vcpu_events(&self, events: &VcpuEvents) -> cpu::Result<()> {
        self.fd
-            .lock()
-            .unwrap()
            .set_vcpu_events(events)
            .map_err(|e| cpu::HypervisorCpuError::SetVcpuEvents(e.into()))
    }
--- a/Show More
+++ b/Show More