build: Release v28.2 (bug fix release)

Signed-off-by: Bo Chen <chen.bo@intel.com>
.github: Don't try and create releases for created branches
2026-08-05 02:19:16 +00:00 · 2023-01-25 08:44:46 -08:00 · 2023-01-24 06:04:01 -08:00 · 2023-01-24 06:04:01 -08:00 · 2023-01-24 06:04:01 -08:00 · 2023-01-24 06:04:01 -08:00
105 changed files with 926 additions and 997 deletions
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -1,28 +1,28 @@
 name: Cloud Hypervisor Release
-on: [create]
+on: [pull_request, create]

 jobs:
  release:
-    if: github.event_name == 'create' && github.event.ref_type == 'tag'
+    if: (github.event_name == 'create' && github.event.ref_type == 'tag') || github.event_name == 'pull_request'
    name: Release
    runs-on: ubuntu-latest
    steps:
      - name: Code checkout
        uses: actions/checkout@v2
      - name: Install musl-gcc
-        run: sudo apt install -y musl-tools      
+        run: sudo apt install -y musl-tools
      - name: Create release directory
        run: rsync -rv --exclude=.git . ../cloud-hypervisor-${{ github.event.ref }}
      - name: Install Rust toolchain (x86_64-unknown-linux-gnu)
        uses: actions-rs/toolchain@v1
        with:
-            toolchain: "1.62"
-            target: x86_64-unknown-linux-gnu
+          toolchain: "1.62"
+          target: x86_64-unknown-linux-gnu
      - name: Install Rust toolchain (x86_64-unknown-linux-musl)
        uses: actions-rs/toolchain@v1
        with:
-            toolchain: "1.62"
-            target: x86_64-unknown-linux-musl
+          toolchain: "1.62"
+          target: x86_64-unknown-linux-musl
      - name: Build
        uses: actions-rs/cargo@v1
        with:
@@ -35,28 +35,14 @@ jobs:
            toolchain: "1.62"
            command: build
            args: --all --release --target=x86_64-unknown-linux-musl
-      - name: Strip cloud-hypervisor binaries
-        run: strip target/*/release/cloud-hypervisor
      - name: Install Rust toolchain (aarch64-unknown-linux-musl)
        uses: actions-rs/toolchain@v1
        with:
-            toolchain: "1.62"
-            target: aarch64-unknown-linux-musl
-            override: true
-      - name: Static Build (AArch64)
-        uses: actions-rs/cargo@v1
-        with:
-            use-cross: true
-            command: build
-            args: --all --release --target=aarch64-unknown-linux-musl
-      - name: Vendor
-        working-directory: ../cloud-hypervisor-${{ github.event.ref }}
-        run: |
-          mkdir ../vendor-cargo-home
-          export CARGO_HOME=$(realpath ../vendor-cargo-home)
-          mkdir .cargo
-          cargo vendor > .cargo/config.toml
+          toolchain: "1.62"
+          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:
@@ -66,20 +52,8 @@ jobs:
          release_name: ${{ github.ref }}
          draft: true
          prerelease: true
-      - name: Create vendored source archive
-        working-directory: ../
-        run:  tar cJf cloud-hypervisor-${{ github.event.ref }}.tar.xz cloud-hypervisor-${{ github.event.ref }}
-      - name: Upload cloud-hypervisor vendored source archive
-        id: upload-release-cloud-hypervisor-vendored-sources
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          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
      - 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:
@@ -90,6 +64,7 @@ jobs:
          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:
@@ -100,6 +75,7 @@ jobs:
          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:
@@ -110,6 +86,7 @@ jobs:
          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:
@@ -119,7 +96,18 @@ jobs:
          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:
@@ -130,6 +118,7 @@ jobs:
          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:
@@ -139,3 +128,24 @@ jobs:
          asset_path: target/aarch64-unknown-linux-musl/release/ch-remote
          asset_name: ch-remote-static-aarch64
          asset_content_type: application/octet-stream
+      - name: Vendor
+        working-directory: ../cloud-hypervisor-${{ github.event.ref }}
+        run: |
+          mkdir ../vendor-cargo-home
+          export CARGO_HOME=$(realpath ../vendor-cargo-home)
+          mkdir .cargo
+          cargo vendor > .cargo/config.toml
+      - name: Create vendored source archive
+        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'
+        id: upload-release-cloud-hypervisor-vendored-sources
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          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/Cargo.lock
+++ b/Cargo.lock
@@ -11,9 +11,9 @@ dependencies = [

 [[package]]
 name = "aho-corasick"
-version = "0.7.19"
+version = "0.7.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
 dependencies = [
 "memchr",
 ]
@@ -59,17 +59,6 @@ dependencies = [
 "vmm-sys-util",
 ]

-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -118,9 +107,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"

 [[package]]
 name = "cc"
-version = "1.0.73"
+version = "1.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"

 [[package]]
 name = "cfg-if"
@@ -130,13 +119,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "clap"
-version = "4.0.18"
+version = "4.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335867764ed2de42325fafe6d18b8af74ba97ee0c590fa016f157535b42ab04b"
+checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d"
 dependencies = [
- "atty",
 "bitflags",
 "clap_lex",
+ "is-terminal",
 "once_cell",
 "strsim",
 "termcolor",
@@ -154,7 +143,7 @@ dependencies = [

 [[package]]
 name = "cloud-hypervisor"
-version = "28.0.0"
+version = "28.2.0"
 dependencies = [
 "anyhow",
 "api_client",
@@ -276,12 +265,12 @@ dependencies = [

 [[package]]
 name = "env_logger"
-version = "0.9.3"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
+checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
 dependencies = [
- "atty",
 "humantime",
+ "is-terminal",
 "log",
 "regex",
 "termcolor",
@@ -365,9 +354,9 @@ dependencies = [

 [[package]]
 name = "getrandom"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
 dependencies = [
 "cfg-if",
 "libc",
@@ -382,9 +371,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"

 [[package]]
 name = "hermit-abi"
-version = "0.1.20"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7a30908dbce072eca83216eab939d2290080e00ca71611b96a09e5cdce5f3fa"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
 dependencies = [
 "libc",
 ]
@@ -444,15 +433,19 @@ dependencies = [

 [[package]]
 name = "io-lifetimes"
-version = "0.7.4"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6e481ccbe3dea62107216d0d1138bb8ad8e5e5c43009a098bd1990272c497b0"
+checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
+dependencies = [
+ "libc",
+ "windows-sys",
+]

 [[package]]
 name = "io-uring"
-version = "0.5.8"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00d78c9f2db2a9800dfd15c69543896dae2135112dde0d1944442e83da8ce23a"
+checksum = "7ba34abb5175052fc1a2227a10d2275b7386c9990167de9786c0b88d8b062330"
 dependencies = [
 "bitflags",
 "libc",
@@ -467,6 +460,18 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "is-terminal"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330"
+dependencies = [
+ "hermit-abi",
+ "io-lifetimes",
+ "rustix",
+ "windows-sys",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.4"
@@ -475,8 +480,8 @@ checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"

 [[package]]
 name = "kvm-bindings"
-version = "0.5.0"
-source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.5.0-tdx#52e56d0e8ef0f6ea32fc0492e6a175b73617a49f"
+version = "0.6.0"
+source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.6.0-tdx#7d9ffb47e5b9b1989577258800a0f57c93f1445f"
 dependencies = [
 "serde",
 "serde_derive",
@@ -485,8 +490,9 @@ dependencies = [

 [[package]]
 name = "kvm-ioctls"
-version = "0.11.0"
-source = "git+https://github.com/rust-vmm/kvm-ioctls?branch=main#e6739aeebcc56dfea62216b2cc4cddd13d0a1182"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3a321cabd827642499c77e27314f388dd83a717a5ca716b86476fb947f73ae4"
 dependencies = [
 "kvm-bindings",
 "libc",
@@ -501,9 +507,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.137"
+version = "0.2.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"

 [[package]]
 name = "libssh2-sys"
@@ -533,18 +539,18 @@ dependencies = [

 [[package]]
 name = "linux-loader"
-version = "0.7.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8242360c7d79a7713a28043c994b815e9820b0e97e44b228ec9bd913c16bdfe"
+checksum = "b9259ddbfbb52cc918f6bbc60390004ddd0228cf1d85f402009ff2b3d95de83f"
 dependencies = [
 "vm-memory",
 ]

 [[package]]
 name = "linux-raw-sys"
-version = "0.0.46"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
+checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f"

 [[package]]
 name = "lock_api"
@@ -580,7 +586,7 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 [[package]]
 name = "micro_http"
 version = "0.1.0"
-source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#863b0370ba7e57f7df5b908ada9e5b44809ccae9"
+source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#4b18a043e997da5b5f679e3defc279fec908753e"
 dependencies = [
 "libc",
 "vmm-sys-util",
@@ -589,7 +595,7 @@ dependencies = [
 [[package]]
 name = "mshv-bindings"
 version = "0.1.1"
-source = "git+https://github.com/rust-vmm/mshv?branch=main#1a9ca01801e78f8ddc2630660cbab3bc3300e39e"
+source = "git+https://github.com/rust-vmm/mshv?branch=main#10d0c5208cc41a3958e0fd31fabf2c88b18a97b5"
 dependencies = [
 "libc",
 "serde",
@@ -601,7 +607,7 @@ dependencies = [
 [[package]]
 name = "mshv-ioctls"
 version = "0.1.1"
-source = "git+https://github.com/rust-vmm/mshv?branch=main#1a9ca01801e78f8ddc2630660cbab3bc3300e39e"
+source = "git+https://github.com/rust-vmm/mshv?branch=main#10d0c5208cc41a3958e0fd31fabf2c88b18a97b5"
 dependencies = [
 "libc",
 "mshv-bindings",
@@ -672,9 +678,9 @@ dependencies = [

 [[package]]
 name = "openssl-sys"
-version = "0.9.77"
+version = "0.9.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a"
+checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4"
 dependencies = [
 "autocfg",
 "cc",
@@ -690,9 +696,9 @@ version = "0.1.0"

 [[package]]
 name = "os_str_bytes"
-version = "6.3.0"
+version = "6.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
+checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"

 [[package]]
 name = "parking_lot"
@@ -707,9 +713,9 @@ dependencies = [

 [[package]]
 name = "parking_lot_core"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
 dependencies = [
 "cfg-if",
 "instant",
@@ -721,9 +727,9 @@ dependencies = [

 [[package]]
 name = "paste"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1"
+checksum = "cf1c2c742266c2f1041c914ba65355a83ae8747b05f208319784083583494b4b"

 [[package]]
 name = "pci"
@@ -973,9 +979,9 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
+checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -984,9 +990,9 @@ dependencies = [

 [[package]]
 name = "regex-syntax"
-version = "0.6.27"
+version = "0.6.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
+checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"

 [[package]]
 name = "remain"
@@ -1010,16 +1016,16 @@ dependencies = [

 [[package]]
 name = "rustix"
-version = "0.35.12"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "985947f9b6423159c4726323f373be0a21bdb514c5af06a849cb3d2dce2d01e8"
+checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588"
 dependencies = [
 "bitflags",
 "errno",
 "io-lifetimes",
 "libc",
 "linux-raw-sys",
- "windows-sys 0.36.1",
+ "windows-sys",
 ]

 [[package]]
@@ -1051,18 +1057,18 @@ checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"

 [[package]]
 name = "serde"
-version = "1.0.147"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
+checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.147"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
+checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1071,9 +1077,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.87"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45"
+checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
 dependencies = [
 "itoa",
 "ryu",
@@ -1082,9 +1088,9 @@ dependencies = [

 [[package]]
 name = "serde_with"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368f2d60d049ea019a84dcd6687b0d1e0030fe663ae105039bdf967ed5e6a9a7"
+checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef"
 dependencies = [
 "serde",
 "serde_with_macros",
@@ -1092,9 +1098,9 @@ dependencies = [

 [[package]]
 name = "serde_with_macros"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ccadfacf6cf10faad22bbadf55986bdd0856edfb5d9210aa1dcf1f516e84e93"
+checksum = "e3452b4c0f6c1e357f73fdb87cd1efabaa12acf328c7a528e252893baeb3f4aa"
 dependencies = [
 "darling",
 "proc-macro2",
@@ -1163,9 +1169,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"

 [[package]]
 name = "syn"
-version = "1.0.103"
+version = "1.0.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1183,12 +1189,12 @@ dependencies = [

 [[package]]
 name = "terminal_size"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ca90c434fd12083d1a6bdcbe9f92a14f96c8a1ba600ba451734ac334521f7a"
+checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907"
 dependencies = [
 "rustix",
- "windows-sys 0.42.0",
+ "windows-sys",
 ]

 [[package]]
@@ -1257,9 +1263,9 @@ checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"

 [[package]]
 name = "uuid"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83"
+checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c"
 dependencies = [
 "getrandom",
 ]
@@ -1272,9 +1278,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"

 [[package]]
 name = "versionize"
-version = "0.1.6"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7429cf68de8f091b667d27323ed323afd39584a56d533995b12ddd748e5e6ca9"
+checksum = "d6e2495726cf917e7ba7ec8bf0f0fceab543dd38d0a4195ed6bef331e38a290f"
 dependencies = [
 "bincode",
 "crc64",
@@ -1299,17 +1305,16 @@ dependencies = [

 [[package]]
 name = "vfio-bindings"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43449b404c488f70507dca193debd4bea361fe8089869b947adc19720e464bce"
+version = "0.4.0"
+source = "git+https://github.com/rust-vmm/vfio?branch=main#7ef33f6759ae6d37a54cd66f749aa47c1c81509c"
 dependencies = [
 "vmm-sys-util",
 ]

 [[package]]
 name = "vfio-ioctls"
-version = "0.1.0"
-source = "git+https://github.com/rust-vmm/vfio?branch=main#ad86d843a22fbf98efa9c02a5689fe2bf17ed54a"
+version = "0.2.0"
+source = "git+https://github.com/rust-vmm/vfio?branch=main#7ef33f6759ae6d37a54cd66f749aa47c1c81509c"
 dependencies = [
 "byteorder",
 "kvm-bindings",
@@ -1354,8 +1359,9 @@ dependencies = [

 [[package]]
 name = "vhost"
-version = "0.5.0"
-source = "git+https://github.com/rust-vmm/vhost?branch=main#f87156b77662af63b9fc9f116a213dd69e16007b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9b791c5b0717a0558888a4cf7240cea836f39a99cb342e12ce633dcaa078072"
 dependencies = [
 "bitflags",
 "libc",
@@ -1365,9 +1371,9 @@ dependencies = [

 [[package]]
 name = "vhost-user-backend"
-version = "0.7.0"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a0fc7d5f8e2943cd9f2ecd58be3f2078add863a49573d14dd9d64e1ab26544c"
+checksum = "9f237b91db4ac339d639fb43398b52d785fa51e3c7760ac9425148863c1f4303"
 dependencies = [
 "libc",
 "log",
@@ -1459,9 +1465,9 @@ dependencies = [

 [[package]]
 name = "virtio-queue"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435dd49c7b38419729afd43675850c7b5dc4728f2fabd70c7a9079a331e4f8c6"
+checksum = "19e927d93d54c365034fd7f31a5f458a1f540de4a37c52e892670dad9692173c"
 dependencies = [
 "log",
 "virtio-bindings",
@@ -1494,13 +1500,13 @@ dependencies = [
 [[package]]
 name = "vm-fdt"
 version = "0.2.0"
-source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#d9425907389e1fbbfb803017d01824a4bb16e6a8"
+source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#c5a99ab71b130435927d19b50c85fcd5ce904a8c"

 [[package]]
 name = "vm-memory"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583f213899e8a5eea23d9c507252d4bed5bc88f0ecbe0783262f80034630744b"
+checksum = "688a70366615b45575a424d9c665561c1b5ab2224d494f706b6a6812911a827c"
 dependencies = [
 "arc-swap",
 "libc",
@@ -1580,9 +1586,9 @@ dependencies = [

 [[package]]
 name = "vmm-sys-util"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08604d7be03eb26e33b3cee3ed4aef2bf550b305d1cca60e84da5d28d3790b62"
+checksum = "cc06a16ee8ebf0d9269aed304030b0d20a866b8b3dd3d4ce532596ac567a0d24"
 dependencies = [
 "bitflags",
 "libc",
@@ -1636,19 +1642,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

-[[package]]
-name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.42.0"
@@ -1656,12 +1649,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
 dependencies = [
 "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.0",
- "windows_i686_gnu 0.42.0",
- "windows_i686_msvc 0.42.0",
- "windows_x86_64_gnu 0.42.0",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
 "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.0",
+ "windows_x86_64_msvc",
 ]

 [[package]]
@@ -1670,48 +1663,24 @@ version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"

-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"

-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"

-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"

-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.0"
@@ -1724,12 +1693,6 @@ version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"

-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.0"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cloud-hypervisor"
-version = "28.0.0"
+version = "28.2.0"
 authors = ["The Cloud Hypervisor Authors"]
 edition = "2021"
 default-run = "cloud-hypervisor"
@@ -16,42 +16,41 @@ rust-version = "1.60"
 lto = true
 codegen-units = 1
 opt-level = "s"
+strip = true

 [dependencies]
 anyhow = "1.0.66"
 api_client = { path = "api_client" }
-clap = { version = "4.0.18", features = ["wrap_help","cargo","string"] }
+clap = { version = "4.0.29", features = ["wrap_help","cargo","string"] }
 epoll = "4.3.1"
 event_monitor = { path = "event_monitor" }
 hypervisor = { path = "hypervisor" }
-libc = "0.2.137"
+libc = "0.2.138"
 log = { version = "0.4.17", features = ["std"] }
 option_parser = { path = "option_parser" }
 seccompiler = "0.3.0"
-serde_json = "1.0.87"
+serde_json = "1.0.89"
 signal-hook = "0.3.14"
 thiserror = "1.0.37"
 tpm = { path = "tpm"}
 tracer = { path = "tracer" }
 vmm = { path = "vmm" }
-vmm-sys-util = "0.10.0"
-vm-memory = "0.9.0"
+vmm-sys-util = "0.11.0"
+vm-memory = "0.10.0"

 [build-dependencies]
-clap = { version = "4.0.18", features = ["cargo"] }
+clap = { version = "4.0.29", features = ["cargo"] }

 # List of patched crates
 [patch.crates-io]
-kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.5.0-tdx" }
-kvm-ioctls = { git = "https://github.com/rust-vmm/kvm-ioctls", branch = "main" }
+kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.6.0-tdx" }
 versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch" }
-vhost = { git = "https://github.com/rust-vmm/vhost", branch = "main" }

 [dev-dependencies]
 dirs = "4.0.0"
 net_util = { path = "net_util" }
 once_cell = "1.16.0"
-serde_json = "1.0.87"
+serde_json = "1.0.89"
 test_infra = { path = "test_infra" }
 wait-timeout = "0.2.0"

--- a/README.md
+++ b/README.md
@@ -220,7 +220,7 @@ $ ./cloud-hypervisor \

 If earlier kernel messages are required the serial console should be used instead of `virtio-console`.

-```cloud-hypervisor \
+```./cloud-hypervisor \
 	--kernel ./linux-cloud-hypervisor/arch/x86/boot/compressed/vmlinux.bin \
 	--console off \
 	--serial tty \
--- a/acpi_tables/Cargo.toml
+++ b/acpi_tables/Cargo.toml
@@ -5,4 +5,4 @@ authors = ["The Cloud Hypervisor Authors"]
 edition = "2021"

 [dependencies]
-vm-memory = "0.9.0"
+vm-memory = "0.10.0"
--- a/api_client/Cargo.toml
+++ b/api_client/Cargo.toml
@@ -5,4 +5,4 @@ authors = ["The Cloud Hypervisor Authors"]
 edition = "2021"

 [dependencies]
-vmm-sys-util = "0.10.0"
+vmm-sys-util = "0.11.0"
--- a/api_client/src/lib.rs
+++ b/api_client/src/lib.rs
@@ -22,16 +22,16 @@ 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),
+            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),
+            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)
+                    write!(f, "Server responded with an error: {s:?}: {o}")
                } else {
-                    write!(f, "Server responded with an error: {:?}", s)
+                    write!(f, "Server responded with an error: {s:?}")
                }
            }
        }
@@ -79,7 +79,7 @@ impl StatusCode {
 }

 fn get_header<'a>(res: &'a str, header: &'a str) -> Option<&'a str> {
-    let header_str = format!("{}: ", header);
+    let header_str = format!("{header}: ");
    res.find(&header_str)
        .map(|o| &res[o + header_str.len()..o + res[o..].find('\r').unwrap()])
 }
@@ -153,8 +153,7 @@ pub fn simple_api_full_command_with_fds_and_response<T: Read + Write + ScmSocket
    socket
        .send_with_fds(
            &[format!(
-                "{} /api/v1/{} HTTP/1.1\r\nHost: localhost\r\nAccept: */*\r\n",
-                method, full_command
+                "{method} /api/v1/{full_command} HTTP/1.1\r\nHost: localhost\r\nAccept: */*\r\n"
            )
            .as_bytes()],
            &request_fds,
@@ -235,7 +234,7 @@ pub fn simple_api_command_with_fds<T: Read + Write + ScmSocket>(
 ) -> Result<(), Error> {
    // Create the full VM command. For VMM commands, use
    // simple_api_full_command().
-    let full_command = format!("vm.{}", c);
+    let full_command = format!("vm.{c}");

    simple_api_full_command_with_fds(socket, method, &full_command, request_body, request_fds)
 }
--- a/arch/Cargo.toml
+++ b/arch/Cargo.toml
@@ -12,17 +12,17 @@ tdx = []
 anyhow = "1.0.66"
 byteorder = "1.4.3"
 hypervisor = { path = "../hypervisor" }
-libc = "0.2.137"
-linux-loader = { version = "0.7.0", features = ["elf", "bzimage", "pe"] }
+libc = "0.2.138"
+linux-loader = { version = "0.8.1", features = ["elf", "bzimage", "pe"] }
 log = "0.4.17"
-serde = { version = "1.0.147", features = ["rc", "derive"] }
+serde = { version = "1.0.150", features = ["rc", "derive"] }
 thiserror = "1.0.37"
-uuid = "1.2.1"
-versionize = "0.1.6"
+uuid = "1.2.2"
+versionize = "0.1.9"
 versionize_derive = "0.1.4"
-vm-memory = { version = "0.9.0", features = ["backend-mmap", "backend-bitmap"] }
+vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-bitmap"] }
 vm-migration = { path = "../vm-migration" }
-vmm-sys-util = { version = "0.10.0", features = ["with-serde"] }
+vmm-sys-util = { version = "0.11.0", features = ["with-serde"] }

 [target.'cfg(target_arch = "aarch64")'.dependencies]
 fdt_parser = { version = "0.1.4", package = "fdt" }
--- a/arch/src/aarch64/fdt.rs
+++ b/arch/src/aarch64/fdt.rs
@@ -160,7 +160,7 @@ fn create_cpu_nodes(
    let num_cpus = vcpu_mpidr.len();

    for (cpu_id, mpidr) in vcpu_mpidr.iter().enumerate().take(num_cpus) {
-        let cpu_name = format!("cpu@{:x}", cpu_id);
+        let cpu_name = format!("cpu@{cpu_id:x}");
        let cpu_node = fdt.begin_node(&cpu_name)?;
        fdt.property_string("device_type", "cpu")?;
        fdt.property_string("compatible", "arm,arm-v8")?;
@@ -192,15 +192,15 @@ fn create_cpu_nodes(

        // Create device tree nodes with regard of above mapping.
        for cluster_idx in 0..packages {
-            let cluster_name = format!("cluster{:x}", cluster_idx);
+            let cluster_name = format!("cluster{cluster_idx:x}");
            let cluster_node = fdt.begin_node(&cluster_name)?;

            for core_idx in 0..cores_per_package {
-                let core_name = format!("core{:x}", core_idx);
+                let core_name = format!("core{core_idx:x}");
                let core_node = fdt.begin_node(&core_name)?;

                for thread_idx in 0..threads_per_core {
-                    let thread_name = format!("thread{:x}", thread_idx);
+                    let thread_name = format!("thread{thread_idx:x}");
                    let thread_node = fdt.begin_node(&thread_name)?;
                    let cpu_idx = threads_per_core * cores_per_package * cluster_idx
                        + threads_per_core * core_idx
@@ -247,7 +247,7 @@ fn create_memory_node(
                    node_memory_addr = memory_region_start_addr;
                }
            }
-            let memory_node_name = format!("memory@{:x}", node_memory_addr);
+            let memory_node_name = format!("memory@{node_memory_addr:x}");
            let memory_node = fdt.begin_node(&memory_node_name)?;
            fdt.property_string("device_type", "memory")?;
            fdt.property_array_u64("reg", &mem_reg_prop)?;
@@ -670,7 +670,7 @@ fn create_pci_nodes(

                // See kernel document Documentation/devicetree/bindings/virtio/iommu.txt
                // for virtio-iommu node settings.
-                let virtio_iommu_node_name = format!("virtio_iommu@{:x}", virtio_iommu_bdf);
+                let virtio_iommu_node_name = format!("virtio_iommu@{virtio_iommu_bdf:x}");
                let virtio_iommu_node = fdt.begin_node(&virtio_iommu_node_name)?;
                fdt.property_u32("#iommu-cells", 1)?;
                fdt.property_string("compatible", "virtio,pci-iommu")?;
--- a/arch/src/aarch64/uefi.rs
+++ b/arch/src/aarch64/uefi.rs
@@ -34,9 +34,7 @@ where
    if uefi_size > 0x300000 {
        return Err(Error::UefiTooBig);
    }
-    uefi_image
-        .seek(SeekFrom::Start(0))
-        .map_err(|_| Error::SeekUefiStart)?;
+    uefi_image.rewind().map_err(|_| Error::SeekUefiStart)?;
    guest_mem
        .read_exact_from(guest_addr, uefi_image, uefi_size)
        .map_err(|_| Error::ReadUefiImage)
--- a/arch/src/lib.rs
+++ b/arch/src/lib.rs
@@ -145,7 +145,7 @@ pub const PAGE_SIZE: usize = 4096;

 impl fmt::Display for DeviceType {
    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{:?}", self)
+        write!(f, "{self:?}")
    }
 }

--- a/arch/src/x86_64/mod.rs
+++ b/arch/src/x86_64/mod.rs
@@ -631,6 +631,20 @@ pub fn generate_common_cpuid(
                    }
                }
            }
+            // 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 {
+                    // SAFETY: cpuid called with valid leaves
+                    if unsafe { std::arch::x86_64::__cpuid(0x8000_0000).eax } >= 0x8000_0006 {
+                        // SAFETY: cpuid called with valid leaves
+                        let leaf = unsafe { std::arch::x86_64::__cpuid(0x8000_0006) };
+                        entry.eax = leaf.eax;
+                        entry.ebx = leaf.ebx;
+                        entry.ecx = leaf.ecx;
+                        entry.edx = leaf.edx;
+                    }
+                }
+            }
            // Set CPU physical bits
            0x8000_0008 => {
                entry.eax = (entry.eax & 0xffff_ff00) | (phys_bits as u32 & 0xff);
@@ -1302,6 +1316,6 @@ mod tests {
        add_memmap_entry(&mut memmap, 0, 0x1000, E820_RAM);
        add_memmap_entry(&mut memmap, 0x10000, 0xa000, E820_RESERVED);

-        assert_eq!(format!("{:?}", memmap), format!("{:?}", expected_memmap));
+        assert_eq!(format!("{memmap:?}"), format!("{expected_memmap:?}"));
    }
 }
--- a/arch/src/x86_64/mptable.rs
+++ b/arch/src/x86_64/mptable.rs
@@ -294,7 +294,7 @@ mod tests {
            mpspec::MP_IOAPIC => mem::size_of::<MpcIoapicWrapper>(),
            mpspec::MP_INTSRC => mem::size_of::<MpcIntsrcWrapper>(),
            mpspec::MP_LINTSRC => mem::size_of::<MpcLintsrcWrapper>(),
-            _ => panic!("unrecognized mpc table entry type: {}", type_),
+            _ => panic!("unrecognized mpc table entry type: {type_}"),
        }
    }

--- a/arch/src/x86_64/smbios.rs
+++ b/arch/src/x86_64/smbios.rs
@@ -48,10 +48,10 @@ impl Display for Error {
            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),
+            ParseUuid(e) => format!("Failure to parse uuid: {e}"),
        };

-        write!(f, "SMBIOS error: {}", description)
+        write!(f, "SMBIOS error: {description}")
    }
 }

--- a/arch/src/x86_64/tdx/mod.rs
+++ b/arch/src/x86_64/tdx/mod.rs
@@ -447,7 +447,7 @@ mod tests {
        let mut f = std::fs::File::open("tdvf.fd").unwrap();
        let sections = parse_tdvf_sections(&mut f).unwrap();
        for section in sections {
-            eprintln!("{:x?}", section)
+            eprintln!("{section:x?}")
        }
    }
 }
--- a/block_util/Cargo.toml
+++ b/block_util/Cargo.toml
@@ -8,17 +8,17 @@ edition = "2021"
 default = []

 [dependencies]
-io-uring = "0.5.8"
-libc = "0.2.137"
+io-uring = "0.5.9"
+libc = "0.2.138"
 log = "0.4.17"
 qcow = { path = "../qcow" }
 thiserror = "1.0.37"
-versionize = "0.1.6"
+versionize = "0.1.9"
 versionize_derive = "0.1.4"
 vhdx = { path = "../vhdx" }
 virtio-bindings = { version = "0.1.0", features = ["virtio-v5_0_0"] }
-virtio-queue = "0.6.1"
-vm-memory = { version = "0.9.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
+virtio-queue = "0.7.0"
+vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
 vm-virtio = { path = "../vm-virtio" }
-vmm-sys-util = "0.10.0"
+vmm-sys-util = "0.11.0"

--- a/build.rs
+++ b/build.rs
@@ -23,5 +23,5 @@ fn main() {
    // variable BUILT_VERSION, so that it can be reused from the binary.
    // Particularly, this is used from src/main.rs to display the exact
    // version.
-    println!("cargo:rustc-env=BUILT_VERSION={}", version);
+    println!("cargo:rustc-env=BUILT_VERSION={version}");
 }
--- a/devices/Cargo.toml
+++ b/devices/Cargo.toml
@@ -11,17 +11,17 @@ arch = { path = "../arch" }
 bitflags = "1.3.2"
 byteorder = "1.4.3"
 hypervisor = { path = "../hypervisor" }
-libc = "0.2.137"
+libc = "0.2.138"
 log = "0.4.17"
-phf = { version = "0.11", features = ["macros"] }
-thiserror = "1.0.30"
+phf = { version = "0.11.1", features = ["macros"] }
+thiserror = "1.0.37"
 tpm = { path = "../tpm" }
-versionize = "0.1.6"
+versionize = "0.1.9"
 versionize_derive = "0.1.4"
 vm-device = { path = "../vm-device" }
-vm-memory = "0.9.0"
+vm-memory = "0.10.0"
 vm-migration = { path = "../vm-migration" }
-vmm-sys-util = "0.10.0"
+vmm-sys-util = "0.11.0"

 [target.'cfg(target_arch = "aarch64")'.dependencies]
 arch = { path = "../arch" }
--- a/devices/src/legacy/debug_port.rs
+++ b/devices/src/legacy/debug_port.rs
@@ -40,11 +40,11 @@ impl DebugIoPortRange {
 impl fmt::Display for DebugIoPortRange {
    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
        match self {
-            DebugIoPortRange::Firmware => write!(f, "{}: Firmware", DEBUG_IOPORT_PREFIX),
-            DebugIoPortRange::Bootloader => write!(f, "{}: Bootloader", DEBUG_IOPORT_PREFIX),
-            DebugIoPortRange::Kernel => write!(f, "{}: Kernel", DEBUG_IOPORT_PREFIX),
-            DebugIoPortRange::Userspace => write!(f, "{}: Userspace", DEBUG_IOPORT_PREFIX),
-            DebugIoPortRange::Custom => write!(f, "{}: Custom", DEBUG_IOPORT_PREFIX),
+            DebugIoPortRange::Firmware => write!(f, "{DEBUG_IOPORT_PREFIX}: Firmware"),
+            DebugIoPortRange::Bootloader => write!(f, "{DEBUG_IOPORT_PREFIX}: Bootloader"),
+            DebugIoPortRange::Kernel => write!(f, "{DEBUG_IOPORT_PREFIX}: Kernel"),
+            DebugIoPortRange::Userspace => write!(f, "{DEBUG_IOPORT_PREFIX}: Userspace"),
+            DebugIoPortRange::Custom => write!(f, "{DEBUG_IOPORT_PREFIX}: Custom"),
        }
    }
 }
--- a/devices/src/legacy/gpio_pl061.rs
+++ b/devices/src/legacy/gpio_pl061.rs
@@ -51,13 +51,13 @@ pub enum 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::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)
+                write!(f, "Could not trigger GPIO interrupt: {e}.")
            }
            Error::GpioTriggerKeyFailure(key) => {
-                write!(f, "Invalid GPIO Input key triggerd: {}.", key)
+                write!(f, "Invalid GPIO Input key triggerd: {key}.")
            }
        }
    }
--- a/devices/src/legacy/rtc_pl031.rs
+++ b/devices/src/legacy/rtc_pl031.rs
@@ -48,8 +48,8 @@ pub enum 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),
+            Error::BadWriteOffset(offset) => write!(f, "Bad Write Offset: {offset}"),
+            Error::InterruptFailure(e) => write!(f, "Failed to trigger interrupt: {e}"),
        }
    }
 }
--- a/devices/src/legacy/uart_pl011.rs
+++ b/devices/src/legacy/uart_pl011.rs
@@ -60,11 +60,11 @@ pub enum 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::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),
+            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}"),
        }
    }
 }
--- a/devices/src/tpm.rs
+++ b/devices/src/tpm.rs
@@ -117,10 +117,7 @@ fn get_fields_map(reg: u32) -> phf::Map<&'static str, [u32; 2]> {
        CRB_INTF_ID2 => CRB_INTF_ID2_FIELDS,
        CRB_CTRL_STS => CRB_CTRL_STS_FIELDS,
        _ => {
-            panic!(
-                "Fields in '{:?}' register were accessed which are Invalid",
-                reg
-            );
+            panic!("Fields in '{reg:?}' register were accessed which are Invalid");
        }
    }
 }
--- a/docs/tpm.md
+++ b/docs/tpm.md
@@ -30,7 +30,7 @@ process should be started to listen at the input socket. Below is an
 example invocation of swtpm process.

 ```
-swtpm socket --tmpstate dir=/var/run/swtpm \
+swtpm socket --tpmstate dir=/var/run/swtpm \
 	--ctrl type=unixio,path="/var/run/swtpm.socket" \
 	--flags startup-clear \
 	--tpm2
--- a/event_monitor/Cargo.toml
+++ b/event_monitor/Cargo.toml
@@ -5,6 +5,6 @@ authors = ["The Cloud Hypervisor Authors"]
 edition = "2021"

 [dependencies]
-libc = "0.2.137"
-serde = { version = "1.0.147", features = ["rc", "derive"] }
-serde_json = "1.0.87"
+libc = "0.2.138"
+serde = { version = "1.0.150", features = ["rc", "derive"] }
+serde_json = "1.0.89"
--- a/fuzz/Cargo.lock
+++ b/fuzz/Cargo.lock
@@ -56,17 +56,6 @@ dependencies = [
 "vmm-sys-util",
 ]

-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -109,9 +98,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"

 [[package]]
 name = "cc"
-version = "1.0.73"
+version = "1.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4"
 dependencies = [
 "jobserver",
 ]
@@ -124,13 +113,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "clap"
-version = "4.0.18"
+version = "4.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335867764ed2de42325fafe6d18b8af74ba97ee0c590fa016f157535b42ab04b"
+checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d"
 dependencies = [
- "atty",
 "bitflags",
 "clap_lex",
+ "is-terminal",
 "once_cell",
 "strsim",
 "termcolor",
@@ -148,7 +137,7 @@ dependencies = [

 [[package]]
 name = "cloud-hypervisor"
-version = "27.0.0"
+version = "28.0.0"
 dependencies = [
 "anyhow",
 "api_client",
@@ -332,9 +321,9 @@ dependencies = [

 [[package]]
 name = "hermit-abi"
-version = "0.1.20"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7a30908dbce072eca83216eab939d2290080e00ca71611b96a09e5cdce5f3fa"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
 dependencies = [
 "libc",
 ]
@@ -376,9 +365,13 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"

 [[package]]
 name = "io-lifetimes"
-version = "0.7.5"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074"
+checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
+dependencies = [
+ "libc",
+ "windows-sys",
+]

 [[package]]
 name = "io-uring"
@@ -390,6 +383,18 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "is-terminal"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330"
+dependencies = [
+ "hermit-abi",
+ "io-lifetimes",
+ "rustix",
+ "windows-sys",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.4"
@@ -407,8 +412,8 @@ dependencies = [

 [[package]]
 name = "kvm-bindings"
-version = "0.5.0"
-source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.5.0-tdx#52e56d0e8ef0f6ea32fc0492e6a175b73617a49f"
+version = "0.6.0"
+source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.6.0-tdx#7d9ffb47e5b9b1989577258800a0f57c93f1445f"
 dependencies = [
 "serde",
 "serde_derive",
@@ -417,8 +422,9 @@ dependencies = [

 [[package]]
 name = "kvm-ioctls"
-version = "0.11.0"
-source = "git+https://github.com/rust-vmm/kvm-ioctls?branch=main#1e03e29cdfbb0cb108a98de7a78045a5a517f18e"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3a321cabd827642499c77e27314f388dd83a717a5ca716b86476fb947f73ae4"
 dependencies = [
 "kvm-bindings",
 "libc",
@@ -433,9 +439,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.137"
+version = "0.2.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"

 [[package]]
 name = "libfuzzer-sys"
@@ -450,18 +456,18 @@ dependencies = [

 [[package]]
 name = "linux-loader"
-version = "0.7.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8242360c7d79a7713a28043c994b815e9820b0e97e44b228ec9bd913c16bdfe"
+checksum = "b9259ddbfbb52cc918f6bbc60390004ddd0228cf1d85f402009ff2b3d95de83f"
 dependencies = [
 "vm-memory",
 ]

 [[package]]
 name = "linux-raw-sys"
-version = "0.0.46"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
+checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f"

 [[package]]
 name = "log"
@@ -475,7 +481,7 @@ dependencies = [
 [[package]]
 name = "micro_http"
 version = "0.1.0"
-source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#863b0370ba7e57f7df5b908ada9e5b44809ccae9"
+source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#4b18a043e997da5b5f679e3defc279fec908753e"
 dependencies = [
 "libc",
 "vmm-sys-util",
@@ -521,9 +527,9 @@ version = "0.1.0"

 [[package]]
 name = "os_str_bytes"
-version = "6.4.0"
+version = "6.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5bf27447411e9ee3ff51186bf7a08e16c341efdde93f4d823e8844429bed7e"
+checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"

 [[package]]
 name = "pci"
@@ -665,9 +671,9 @@ dependencies = [

 [[package]]
 name = "rustix"
-version = "0.35.13"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9"
+checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588"
 dependencies = [
 "bitflags",
 "errno",
@@ -700,18 +706,18 @@ checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4"

 [[package]]
 name = "serde"
-version = "1.0.147"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
+checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.147"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
+checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -720,9 +726,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.87"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45"
+checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db"
 dependencies = [
 "itoa",
 "ryu",
@@ -731,9 +737,9 @@ dependencies = [

 [[package]]
 name = "serde_with"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368f2d60d049ea019a84dcd6687b0d1e0030fe663ae105039bdf967ed5e6a9a7"
+checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef"
 dependencies = [
 "serde",
 "serde_with_macros",
@@ -741,9 +747,9 @@ dependencies = [

 [[package]]
 name = "serde_with_macros"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ccadfacf6cf10faad22bbadf55986bdd0856edfb5d9210aa1dcf1f516e84e93"
+checksum = "e3452b4c0f6c1e357f73fdb87cd1efabaa12acf328c7a528e252893baeb3f4aa"
 dependencies = [
 "darling",
 "proc-macro2",
@@ -794,9 +800,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"

 [[package]]
 name = "syn"
-version = "1.0.103"
+version = "1.0.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
+checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -814,9 +820,9 @@ dependencies = [

 [[package]]
 name = "terminal_size"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ca90c434fd12083d1a6bdcbe9f92a14f96c8a1ba600ba451734ac334521f7a"
+checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907"
 dependencies = [
 "rustix",
 "windows-sys",
@@ -882,9 +888,9 @@ dependencies = [

 [[package]]
 name = "versionize"
-version = "0.1.6"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7429cf68de8f091b667d27323ed323afd39584a56d533995b12ddd748e5e6ca9"
+checksum = "d6e2495726cf917e7ba7ec8bf0f0fceab543dd38d0a4195ed6bef331e38a290f"
 dependencies = [
 "bincode",
 "crc64",
@@ -909,17 +915,16 @@ dependencies = [

 [[package]]
 name = "vfio-bindings"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43449b404c488f70507dca193debd4bea361fe8089869b947adc19720e464bce"
+version = "0.4.0"
+source = "git+https://github.com/rust-vmm/vfio?branch=main#7ef33f6759ae6d37a54cd66f749aa47c1c81509c"
 dependencies = [
 "vmm-sys-util",
 ]

 [[package]]
 name = "vfio-ioctls"
-version = "0.1.0"
-source = "git+https://github.com/rust-vmm/vfio?branch=main#bf7c9b997b4ad0ca1ab4bfe96dc1b10d4bc5be24"
+version = "0.2.0"
+source = "git+https://github.com/rust-vmm/vfio?branch=main#7ef33f6759ae6d37a54cd66f749aa47c1c81509c"
 dependencies = [
 "byteorder",
 "kvm-bindings",
@@ -962,8 +967,9 @@ dependencies = [

 [[package]]
 name = "vhost"
-version = "0.5.0"
-source = "git+https://github.com/rust-vmm/vhost?branch=main#f87156b77662af63b9fc9f116a213dd69e16007b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9b791c5b0717a0558888a4cf7240cea836f39a99cb342e12ce633dcaa078072"
 dependencies = [
 "bitflags",
 "libc",
@@ -1014,9 +1020,9 @@ dependencies = [

 [[package]]
 name = "virtio-queue"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435dd49c7b38419729afd43675850c7b5dc4728f2fabd70c7a9079a331e4f8c6"
+checksum = "19e927d93d54c365034fd7f31a5f458a1f540de4a37c52e892670dad9692173c"
 dependencies = [
 "log",
 "virtio-bindings",
@@ -1048,14 +1054,14 @@ dependencies = [

 [[package]]
 name = "vm-fdt"
-version = "0.1.0"
-source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#720e48e435b791ec6cbe8d2b229448b71dcb1ab9"
+version = "0.2.0"
+source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#c5a99ab71b130435927d19b50c85fcd5ce904a8c"

 [[package]]
 name = "vm-memory"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583f213899e8a5eea23d9c507252d4bed5bc88f0ecbe0783262f80034630744b"
+checksum = "688a70366615b45575a424d9c665561c1b5ab2224d494f706b6a6812911a827c"
 dependencies = [
 "arc-swap",
 "libc",
@@ -1133,9 +1139,9 @@ dependencies = [

 [[package]]
 name = "vmm-sys-util"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08604d7be03eb26e33b3cee3ed4aef2bf550b305d1cca60e84da5d28d3790b62"
+checksum = "cc06a16ee8ebf0d9269aed304030b0d20a866b8b3dd3d4ce532596ac567a0d24"
 dependencies = [
 "bitflags",
 "libc",
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -20,10 +20,10 @@ qcow = { path = "../qcow" }
 seccompiler = "0.3.0"
 vhdx = { path = "../vhdx" }
 virtio-devices = { path = "../virtio-devices" }
-virtio-queue = "0.6.1"
+virtio-queue = "0.7.0"
 vmm = { path = "../vmm" }
-vmm-sys-util = "0.10.0"
-vm-memory = "0.9.0"
+vmm-sys-util = "0.11.0"
+vm-memory = "0.10.0"
 vm-device = { path = "../vm-device" }
 vm-virtio = { path = "../vm-virtio" }

@@ -31,10 +31,8 @@ vm-virtio = { path = "../vm-virtio" }
 path = ".."

 [patch.crates-io]
-kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.5.0-tdx" }
-kvm-ioctls = { git = "https://github.com/rust-vmm/kvm-ioctls", branch = "main" }
+kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.6.0-tdx" }
 versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch" }
-vhost = { git = "https://github.com/rust-vmm/vhost", branch = "main" }

 # Prevent this from interfering with workspaces
 [workspace]
--- a/hypervisor/Cargo.toml
+++ b/hypervisor/Cargo.toml
@@ -14,17 +14,17 @@ tdx = []
 anyhow = "1.0.66"
 byteorder = "1.4.3"
 thiserror = "1.0.37"
-libc = "0.2.137"
+libc = "0.2.138"
 log = "0.4.17"
-kvm-ioctls = { version = "0.11.0", optional = true }
-kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.5.0-tdx", features = ["with-serde", "fam-wrappers"], optional  = true }
+kvm-ioctls = { version = "0.12.0", optional = true }
+kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.6.0-tdx", features = ["with-serde", "fam-wrappers"], optional  = true }
 mshv-bindings = { git = "https://github.com/rust-vmm/mshv", branch = "main", features = ["with-serde", "fam-wrappers"], optional  = true }
 mshv-ioctls = { git = "https://github.com/rust-vmm/mshv", branch = "main", optional  = true}
-serde = { version = "1.0.147", features = ["rc", "derive"] }
-serde_with = { version = "2.0.1", default-features = false, features = ["macros"] }
+serde = { version = "1.0.150", features = ["rc", "derive"] }
+serde_with = { version = "2.1.0", default-features = false, features = ["macros"] }
 vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false }
-vm-memory = { version = "0.9.0", features = ["backend-mmap", "backend-atomic"] }
-vmm-sys-util = { version = "0.10.0", features = ["with-serde"] }
+vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic"] }
+vmm-sys-util = { version = "0.11.0", features = ["with-serde"] }

 [target.'cfg(target_arch = "x86_64")'.dependencies.iced-x86]
 version = "1.17.0"
@@ -32,4 +32,4 @@ default-features = false
 features = ["std", "decoder", "op_code_info", "instr_info", "fast_fmt"]

 [dev-dependencies]
-env_logger = "0.9.3"
+env_logger = "0.10.0"
--- a/hypervisor/src/arch/emulator/mod.rs
+++ b/hypervisor/src/arch/emulator/mod.rs
@@ -24,10 +24,10 @@ impl<T: Debug> Display for Exception<T> {
            self.vector,
            self.ip,
            self.error
-                .map(|e| format!(": error {:x}", e))
+                .map(|e| format!(": error {e:x}"))
                .unwrap_or_else(|| "".to_owned()),
            self.payload
-                .map(|payload| format!(": payload {:x}", payload))
+                .map(|payload| format!(": payload {payload:x}"))
                .unwrap_or_else(|| "".to_owned())
        )
    }
--- a/hypervisor/src/kvm/aarch64/mod.rs
+++ b/hypervisor/src/kvm/aarch64/mod.rs
@@ -97,8 +97,7 @@ pub fn is_system_register(regid: u64) -> bool {

    assert!(
        !(size != KVM_REG_SIZE_U32 && size != KVM_REG_SIZE_U64),
-        "Unexpected register size for system register {}",
-        size
+        "Unexpected register size for system register {size}"
    );

    true
--- a/hypervisor/src/lib.rs
+++ b/hypervisor/src/lib.rs
@@ -61,7 +61,7 @@ pub use vm::{
    Vm, VmOps,
 };

-#[derive(Debug, Copy, Clone)]
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
 pub enum HypervisorType {
    Kvm,
    Mshv,
--- a/net_gen/Cargo.toml
+++ b/net_gen/Cargo.toml
@@ -5,4 +5,4 @@ authors = ["The Chromium OS Authors"]
 edition = "2021"

 [dependencies]
-vmm-sys-util = "0.10.0"
+vmm-sys-util = "0.11.0"
--- a/net_util/Cargo.toml
+++ b/net_util/Cargo.toml
@@ -6,23 +6,23 @@ edition = "2021"

 [dependencies]
 epoll = "4.3.1"
-getrandom = "0.2.7"
-libc = "0.2.137"
+getrandom = "0.2.8"
+libc = "0.2.138"
 log = "0.4.17"
 net_gen = { path = "../net_gen" }
 rate_limiter = { path = "../rate_limiter" }
-serde = "1.0.147"
+serde = "1.0.150"
 thiserror = "1.0.37"
-versionize = "0.1.6"
+versionize = "0.1.9"
 versionize_derive = "0.1.4"
 virtio-bindings = "0.1.0"
-virtio-queue = "0.6.1"
-vm-memory = { version = "0.9.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
+virtio-queue = "0.7.0"
+vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
 vm-virtio = { path = "../vm-virtio" }
-vmm-sys-util = "0.10.0"
+vmm-sys-util = "0.11.0"

 [dev-dependencies]
 once_cell = "1.16.0"
 pnet = "0.31.0"
 pnet_datalink = "0.31.0"
-serde_json = "1.0.87"
+serde_json = "1.0.89"
--- a/net_util/src/mac.rs
+++ b/net_util/src/mac.rs
@@ -125,7 +125,7 @@ impl<'de> Deserialize<'de> for MacAddr {
    {
        let s = String::deserialize(deserializer)?;
        MacAddr::parse_str(&s)
-            .map_err(|e| D::Error::custom(format!("The provided MAC address is invalid: {}", e)))
+            .map_err(|e| D::Error::custom(format!("The provided MAC address is invalid: {e}")))
    }
 }

@@ -161,7 +161,7 @@ mod tests {

        let mac = MacAddr::parse_str("12:34:56:78:9a:BC").unwrap();

-        println!("parsed MAC address: {}", mac);
+        println!("parsed MAC address: {mac}");

        let bytes = mac.get_bytes();
        assert_eq!(bytes, [0x12u8, 0x34, 0x56, 0x78, 0x9a, 0xbc]);
--- a/net_util/src/open_tap.rs
+++ b/net_util/src/open_tap.rs
@@ -41,7 +41,7 @@ type Result<T> = std::result::Result<T, Error>;
 fn check_mq_support(if_name: &Option<&str>, queue_pairs: usize) -> Result<()> {
    if let Some(tap_name) = if_name {
        let mq = queue_pairs > 1;
-        let path = format!("/sys/class/net/{}/tun_flags", tap_name);
+        let path = format!("/sys/class/net/{tap_name}/tun_flags");
        // interface does not exist, check is not required
        if !Path::new(&path).exists() {
            return Ok(());
--- a/net_util/src/queue_pair.rs
+++ b/net_util/src/queue_pair.rs
@@ -104,6 +104,10 @@ impl TxVirtio {
                    return Err(NetQueuePairError::WriteTap(e));
                }

+                if (result as usize) < vnet_hdr_len() {
+                    return Err(NetQueuePairError::InvalidVirtioNetHeader);
+                }
+
                self.counter_bytes += Wrapping(result as u64 - vnet_hdr_len() as u64);
                self.counter_frames += Wrapping(1);

@@ -185,7 +189,7 @@ impl RxVirtio {
                        .translate_gva(access_platform, desc.len() as usize),
                    10,
                )
-                .unwrap();
+                .ok_or(NetQueuePairError::DescriptorInvalidHeader)?;
            let mut next_desc = Some(desc);

            let mut iovecs = Vec::new();
@@ -238,6 +242,10 @@ impl RxVirtio {
                    return Err(NetQueuePairError::ReadTap(e));
                }

+                if (result as usize) < vnet_hdr_len() {
+                    return Err(NetQueuePairError::InvalidVirtioNetHeader);
+                }
+
                // Write num_buffers to guest memory. We simply write 1 as we
                // never spread the frame over more than one descriptor chain.
                desc_chain
@@ -312,6 +320,10 @@ pub enum NetQueuePairError {
    QueueEnableNotification(virtio_queue::Error),
    #[error("Failed to add used index to the queue: {0}")]
    QueueAddUsed(virtio_queue::Error),
+    #[error("Descriptor with invalid virtio-net header")]
+    DescriptorInvalidHeader,
+    #[error("Invalid virtio-net header")]
+    InvalidVirtioNetHeader,
 }

 pub struct NetQueuePair {
--- a/net_util/src/tap.rs
+++ b/net_util/src/tap.rs
@@ -586,7 +586,7 @@ mod tests {
        let _tap_ip_guard = TAP_IP_LOCK.lock().unwrap();

        let t = Tap::new(1).unwrap();
-        println!("created tap: {:?}", t);
+        println!("created tap: {t:?}");
    }

    #[test]
--- a/option_parser/src/lib.rs
+++ b/option_parser/src/lib.rs
@@ -28,10 +28,10 @@ pub enum OptionParserError {
 impl fmt::Display for OptionParserError {
    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
        match self {
-            OptionParserError::UnknownOption(s) => write!(f, "unknown option: {}", s),
-            OptionParserError::InvalidSyntax(s) => write!(f, "invalid syntax:{}", s),
+            OptionParserError::UnknownOption(s) => write!(f, "unknown option: {s}"),
+            OptionParserError::InvalidSyntax(s) => write!(f, "invalid syntax:{s}"),
            OptionParserError::Conversion(field, value) => {
-                write!(f, "unable to convert {} for {}", value, field)
+                write!(f, "unable to convert {value} for {field}")
            }
        }
    }
--- a/pci/Cargo.toml
+++ b/pci/Cargo.toml
@@ -13,20 +13,17 @@ mshv = ["vfio-ioctls/mshv"]
 anyhow = "1.0.66"
 byteorder = "1.4.3"
 hypervisor = { path = "../hypervisor" }
+vfio-bindings = { git = "https://github.com/rust-vmm/vfio", branch = "main", features = ["fam-wrappers"] }
 vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false }
 vfio_user = { path = "../vfio_user" }
-vmm-sys-util = "0.10.0"
-libc = "0.2.137"
+vmm-sys-util = "0.11.0"
+libc = "0.2.138"
 log = "0.4.17"
-serde = { version = "1.0.147", features = ["derive"] }
+serde = { version = "1.0.150", features = ["derive"] }
 thiserror = "1.0.37"
-versionize = "0.1.6"
+versionize = "0.1.9"
 versionize_derive = "0.1.4"
 vm-allocator = { path = "../vm-allocator" }
 vm-device = { path = "../vm-device" }
-vm-memory = "0.9.0"
-vm-migration = { path = "../vm-migration" }
-
-[dependencies.vfio-bindings]
-version = "0.3.1"
-features = ["fam-wrappers"]
+vm-memory = "0.10.0"
+vm-migration = { path = "../vm-migration" }
--- a/pci/src/configuration.rs
+++ b/pci/src/configuration.rs
@@ -514,9 +514,9 @@ impl Display for Error {
    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
        use self::Error::*;
        match self {
-            BarAddressInvalid(a, s) => write!(f, "address {} size {} too big", a, s),
-            BarInUse(b) => write!(f, "bar {} already used", b),
-            BarInUse64(b) => write!(f, "64bit bar {} already used(requires two regs)", b),
+            BarAddressInvalid(a, s) => write!(f, "address {a} size {s} too big"),
+            BarInUse(b) => write!(f, "bar {b} already used"),
+            BarInUse64(b) => write!(f, "64bit bar {b} already used(requires two regs)"),
            BarInvalid(b) => write!(f, "bar {} invalid, max {}", b, NUM_BAR_REGS - 1),
            BarInvalid64(b) => write!(
                f,
@@ -524,18 +524,18 @@ impl Display for Error {
                b,
                NUM_BAR_REGS - 1
            ),
-            BarSizeInvalid(s) => write!(f, "bar address {} not a power of two", s),
+            BarSizeInvalid(s) => write!(f, "bar address {s} not a power of two"),
            CapabilityEmpty => write!(f, "empty capabilities are invalid"),
-            CapabilityLengthInvalid(l) => write!(f, "Invalid capability length {}", l),
-            CapabilitySpaceFull(s) => write!(f, "capability of size {} doesn't fit", s),
+            CapabilityLengthInvalid(l) => write!(f, "Invalid capability length {l}"),
+            CapabilitySpaceFull(s) => write!(f, "capability of size {s} doesn't fit"),
            Decode32BarSize => write!(f, "failed to decode 32 bits BAR size"),
            Decode64BarSize => write!(f, "failed to decode 64 bits BAR size"),
            Encode32BarSize => write!(f, "failed to encode 32 bits BAR size"),
            Encode64BarSize => write!(f, "failed to encode 64 bits BAR size"),
-            RomBarAddressInvalid(a, s) => write!(f, "address {} size {} too big", a, s),
-            RomBarInUse(b) => write!(f, "rom bar {} already used", b),
+            RomBarAddressInvalid(a, s) => write!(f, "address {a} size {s} too big"),
+            RomBarInUse(b) => write!(f, "rom bar {b} already used"),
            RomBarInvalid(b) => write!(f, "rom bar {} invalid, max {}", b, NUM_BAR_REGS - 1),
-            RomBarSizeInvalid(s) => write!(f, "rom bar address {} not a power of two", s),
+            RomBarSizeInvalid(s) => write!(f, "rom bar address {s} not a power of two"),
        }
    }
 }
--- a/pci/src/device.rs
+++ b/pci/src/device.rs
@@ -31,15 +31,15 @@ impl Display for Error {
        use self::Error::*;

        match self {
-            CapabilitiesSetup(e) => write!(f, "failed to add capability {}", e),
+            CapabilitiesSetup(e) => write!(f, "failed to add capability {e}"),
            IoAllocationFailed(size) => {
-                write!(f, "failed to allocate space for an IO BAR, size={}", size)
+                write!(f, "failed to allocate space for an IO BAR, size={size}")
            }
            IoRegistrationFailed(addr, e) => {
-                write!(f, "failed to register an IO BAR, addr={} err={}", addr, e)
+                write!(f, "failed to register an IO BAR, addr={addr} err={e}")
            }
            MissingResource => write!(f, "failed to find expected resource"),
-            InvalidResource(r) => write!(f, "invalid resource {:?}", r),
+            InvalidResource(r) => write!(f, "invalid resource {r:?}"),
        }
    }
 }
--- a/pci/src/vfio_user.rs
+++ b/pci/src/vfio_user.rs
@@ -617,13 +617,13 @@ impl<M: GuestAddressSpace + Sync + Send> ExternalDmaMapping for VfioUserDmaMappi
                .map_err(|e| {
                    std::io::Error::new(
                        std::io::ErrorKind::Other,
-                        format!("Error mapping region: {}", e),
+                        format!("Error mapping region: {e}"),
                    )
                })
        } else {
            Err(std::io::Error::new(
                std::io::ErrorKind::Other,
-                format!("Region not found for 0x{:x}", gpa),
+                format!("Region not found for 0x{gpa:x}"),
            ))
        }
    }
@@ -636,7 +636,7 @@ impl<M: GuestAddressSpace + Sync + Send> ExternalDmaMapping for VfioUserDmaMappi
            .map_err(|e| {
                std::io::Error::new(
                    std::io::ErrorKind::Other,
-                    format!("Error unmapping region: {}", e),
+                    format!("Error unmapping region: {e}"),
                )
            })
    }
--- a/performance-metrics/Cargo.toml
+++ b/performance-metrics/Cargo.toml
@@ -6,13 +6,13 @@ edition = "2021"
 build = "build.rs"

 [dependencies]
-clap = { version = "4.0.18", features = ["wrap_help","cargo"] }
+clap = { version = "4.0.29", features = ["wrap_help","cargo"] }
 dirs = "4.0.0"
-serde = { version = "1.0.147", features = ["rc", "derive"] }
-serde_json = "1.0.87"
+serde = { version = "1.0.150", features = ["rc", "derive"] }
+serde_json = "1.0.89"
 test_infra = { path = "../test_infra" }
 thiserror = "1.0.37"
 wait-timeout = "0.2.0"

 [build-dependencies]
-clap = { version = "4.0.18", features = ["cargo"] }
+clap = { version = "4.0.29", features = ["cargo"] }
--- a/performance-metrics/build.rs
+++ b/performance-metrics/build.rs
@@ -22,5 +22,5 @@ fn main() {
    // variable GIT_HUMAN_READABLE, so that it can be reused from the binary.
    // Particularly, this is used from the main.rs to display the exact
    // version information.
-    println!("cargo:rustc-env=GIT_HUMAN_READABLE={}", git_human_readable);
+    println!("cargo:rustc-env=GIT_HUMAN_READABLE={git_human_readable}");
 }
--- a/performance-metrics/src/main.rs
+++ b/performance-metrics/src/main.rs
@@ -117,7 +117,7 @@ pub struct PerformanceTestOverrides {
 impl fmt::Display for PerformanceTestOverrides {
    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
        if let Some(test_iterations) = self.test_iterations {
-            write!(f, "test_iterations = {}", test_iterations)?;
+            write!(f, "test_iterations = {test_iterations}")?;
        }

        Ok(())
@@ -141,19 +141,19 @@ impl fmt::Display for PerformanceTestControl {
            self.test_timeout, self.test_iterations
        );
        if let Some(o) = self.num_queues {
-            output = format!("{}, num_queues = {}", output, o);
+            output = format!("{output}, num_queues = {o}");
        }
        if let Some(o) = self.queue_size {
-            output = format!("{}, queue_size = {}", output, o);
+            output = format!("{output}, queue_size = {o}");
        }
        if let Some(o) = self.net_rx {
-            output = format!("{}, net_rx = {}", output, o);
+            output = format!("{output}, net_rx = {o}");
        }
        if let Some(o) = &self.fio_ops {
-            output = format!("{}, fio_ops = {}", output, o);
+            output = format!("{output}, fio_ops = {o}");
        }

-        write!(f, "{}", output)
+        write!(f, "{output}")
    }
 }

@@ -569,7 +569,7 @@ fn main() {
                    metrics_report.results.push(r);
                }
                Err(e) => {
-                    eprintln!("Aborting test due to error: '{:?}'", e);
+                    eprintln!("Aborting test due to error: '{e:?}'");
                    std::process::exit(1);
                }
            };
@@ -583,7 +583,7 @@ fn main() {
            Box::new(
                std::fs::File::create(std::path::Path::new(file))
                    .map_err(|e| {
-                        eprintln!("Error opening report file: {}: {}", file, e);
+                        eprintln!("Error opening report file: {file}: {e}");
                        std::process::exit(1);
                    })
                    .unwrap(),
@@ -599,7 +599,7 @@ fn main() {
                .as_bytes(),
        )
        .map_err(|e| {
-            eprintln!("Error writing report file: {}", e);
+            eprintln!("Error writing report file: {e}");
            std::process::exit(1);
        })
        .unwrap();
--- a/performance-metrics/src/performance_tests.rs
+++ b/performance-metrics/src/performance_tests.rs
@@ -37,8 +37,7 @@ pub fn init_tests() {
    // The test image can not be created on tmpfs (e.g. /tmp) filesystem,
    // as tmpfs does not support O_DIRECT
    assert!(exec_host_command_output(&format!(
-        "dd if=/dev/zero of={} bs=1M count=4096",
-        BLK_IO_TEST_IMG
+        "dd if=/dev/zero of={BLK_IO_TEST_IMG} bs=1M count=4096"
    ))
    .status
    .success());
@@ -46,7 +45,7 @@ pub fn init_tests() {

 pub fn cleanup_tests() {
    fs::remove_file(BLK_IO_TEST_IMG)
-        .unwrap_or_else(|_| panic!("Failed to remove file '{}'.", BLK_IO_TEST_IMG));
+        .unwrap_or_else(|_| panic!("Failed to remove file '{BLK_IO_TEST_IMG}'."));
 }

 // Performance tests are expected to be executed sequentially, so we can
@@ -92,7 +91,7 @@ pub fn performance_net_throughput(control: &PerformanceTestControl) -> f64 {
    );

    let mut child = GuestCommand::new(&guest)
-        .args(["--cpus", &format!("boot={}", num_queues)])
+        .args(["--cpus", &format!("boot={num_queues}")])
        .args(["--memory", "size=4G"])
        .args(["--kernel", direct_kernel_boot_path().to_str().unwrap()])
        .args(["--cmdline", DIRECT_KERNEL_BOOT_CMDLINE])
@@ -133,7 +132,7 @@ pub fn performance_net_latency(control: &PerformanceTestControl) -> f64 {
    );

    let mut child = GuestCommand::new(&guest)
-        .args(["--cpus", &format!("boot={}", num_queues)])
+        .args(["--cpus", &format!("boot={num_queues}")])
        .args(["--memory", "size=4G"])
        .args(["--kernel", direct_kernel_boot_path().to_str().unwrap()])
        .args(["--cmdline", DIRECT_KERNEL_BOOT_CMDLINE])
@@ -349,7 +348,7 @@ pub fn performance_block_io(control: &PerformanceTestControl) -> f64 {
        .to_string();

    let mut child = GuestCommand::new(&guest)
-        .args(["--cpus", &format!("boot={}", num_queues)])
+        .args(["--cpus", &format!("boot={num_queues}")])
        .args(["--memory", "size=4G"])
        .args(["--kernel", direct_kernel_boot_path().to_str().unwrap()])
        .args(["--cmdline", DIRECT_KERNEL_BOOT_CMDLINE])
@@ -365,7 +364,7 @@ pub fn performance_block_io(control: &PerformanceTestControl) -> f64 {
                guest.disk_config.disk(DiskType::CloudInit).unwrap()
            )
            .as_str(),
-            format!("path={}", BLK_IO_TEST_IMG).as_str(),
+            format!("path={BLK_IO_TEST_IMG}").as_str(),
        ])
        .default_net()
        .args(["--api-socket", &api_socket])
@@ -381,8 +380,7 @@ pub fn performance_block_io(control: &PerformanceTestControl) -> f64 {
        let fio_command = format!(
            "sudo fio --filename=/dev/vdc --name=test --output-format=json \
            --direct=1 --bs=4k --ioengine=io_uring --iodepth=64 \
-            --rw={} --runtime={} --numjobs={}",
-            fio_ops, test_timeout, num_queues
+            --rw={fio_ops} --runtime={test_timeout} --numjobs={num_queues}"
        );
        let output = guest
            .ssh_command(&fio_command)
--- a/qcow/Cargo.toml
+++ b/qcow/Cargo.toml
@@ -10,7 +10,7 @@ path = "src/qcow.rs"

 [dependencies]
 byteorder = "1.4.3"
-libc = "0.2.137"
+libc = "0.2.138"
 log = "0.4.17"
 remain = "0.2.5"
-vmm-sys-util = "0.10.0"
+vmm-sys-util = "0.11.0"
--- a/qcow/src/qcow.rs
+++ b/qcow/src/qcow.rs
@@ -80,45 +80,41 @@ impl Display for Error {
        match self {
            BackingFilesNotSupported => write!(f, "backing files not supported"),
            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),
+            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}"),
            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),
+            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),
+            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),
+            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),
+            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),
+            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),
+            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}"),
        }
    }
 }
@@ -190,7 +186,7 @@ pub struct QcowHeader {
 impl QcowHeader {
    /// Creates a QcowHeader from a reference to a file.
    pub fn new(f: &mut RawFile) -> Result<QcowHeader> {
-        f.seek(SeekFrom::Start(0)).map_err(Error::ReadingHeader)?;
+        f.rewind().map_err(Error::ReadingHeader)?;
        let magic = f.read_u32::<BigEndian>().map_err(Error::ReadingHeader)?;
        if magic != QCOW_MAGIC {
            return Err(Error::InvalidMagic);
@@ -559,7 +555,7 @@ impl QcowFile {
    /// Creates a new QcowFile at the given path.
    pub fn new(mut file: RawFile, version: u32, virtual_size: u64) -> Result<QcowFile> {
        let header = QcowHeader::create_for_size(version, virtual_size);
-        file.seek(SeekFrom::Start(0)).map_err(Error::SeekingFile)?;
+        file.rewind().map_err(Error::SeekingFile)?;
        header.write_to(&mut file)?;

        let mut qcow = Self::from(file)?;
@@ -777,10 +773,8 @@ impl QcowFile {
            refcounts: &mut [u16],
            cluster_size: u64,
            refblock_clusters: u64,
-            pointers_per_cluster: u64,
        ) -> Result<Vec<u64>> {
-            let refcount_table_entries = div_round_up_u64(refblock_clusters, pointers_per_cluster);
-            let mut ref_table = vec![0; refcount_table_entries as usize];
+            let mut ref_table = vec![0; refblock_clusters as usize];
            let mut first_free_cluster: u64 = 0;
            for refblock_addr in &mut ref_table {
                loop {
@@ -812,10 +806,7 @@ impl QcowFile {
        ) -> Result<()> {
            // Rewrite the header with lazy refcounts enabled while we are rebuilding the tables.
            header.compatible_features |= COMPATIBLE_FEATURES_LAZY_REFCOUNTS;
-            raw_file
-                .file_mut()
-                .seek(SeekFrom::Start(0))
-                .map_err(Error::SeekingFile)?;
+            raw_file.file_mut().rewind().map_err(Error::SeekingFile)?;
            header.write_to(raw_file.file_mut())?;

            for (i, refblock_addr) in ref_table.iter().enumerate() {
@@ -850,10 +841,7 @@ impl QcowFile {

            // Rewrite the header again, now with lazy refcounts disabled.
            header.compatible_features &= !COMPATIBLE_FEATURES_LAZY_REFCOUNTS;
-            raw_file
-                .file_mut()
-                .seek(SeekFrom::Start(0))
-                .map_err(Error::SeekingFile)?;
+            raw_file.file_mut().rewind().map_err(Error::SeekingFile)?;
            header.write_to(raw_file.file_mut())?;

            Ok(())
@@ -907,12 +895,7 @@ impl QcowFile {
        set_refcount_table_refcounts(&mut refcounts, header, cluster_size)?;

        // Allocate clusters to store the new reference count blocks.
-        let ref_table = alloc_refblocks(
-            &mut refcounts,
-            cluster_size,
-            refblock_clusters,
-            pointers_per_cluster,
-        )?;
+        let ref_table = alloc_refblocks(&mut refcounts, cluster_size, refblock_clusters)?;

        // Write updated reference counts and point the reftable at them.
        write_refblocks(
@@ -1240,7 +1223,7 @@ impl QcowFile {
            .map_err(|e| {
                io::Error::new(
                    io::ErrorKind::InvalidData,
-                    format!("failed to get cluster refcount: {}", e),
+                    format!("failed to get cluster refcount: {e}"),
                )
            })?;
        if refcount == 0 {
@@ -1656,9 +1639,7 @@ where
    R: Read + Seek + SeekHole,
 {
    let src_size = reader.seek(SeekFrom::End(0)).map_err(Error::SeekingFile)?;
-    reader
-        .seek(SeekFrom::Start(0))
-        .map_err(Error::SeekingFile)?;
+    reader.rewind().map_err(Error::SeekingFile)?;

    // Ensure the destination file is empty before writing to it.
    dst_file.set_len(0).map_err(Error::SettingFileSize)?;
@@ -1700,10 +1681,8 @@ pub fn convert(mut src_file: RawFile, dst_file: RawFile, dst_type: ImageType) ->

 /// Detect the type of an image file by checking for a valid qcow2 header.
 pub fn detect_image_type(file: &mut RawFile) -> Result<ImageType> {
-    let orig_seek = file
-        .seek(SeekFrom::Current(0))
-        .map_err(Error::SeekingFile)?;
-    file.seek(SeekFrom::Start(0)).map_err(Error::SeekingFile)?;
+    let orig_seek = file.stream_position().map_err(Error::SeekingFile)?;
+    file.rewind().map_err(Error::SeekingFile)?;
    let magic = file.read_u32::<BigEndian>().map_err(Error::ReadingHeader)?;
    let image_type = if magic == QCOW_MAGIC {
        ImageType::Qcow2
@@ -1794,7 +1773,7 @@ mod tests {
        let mut disk_file: RawFile = RawFile::new(TempFile::new().unwrap().into_file(), false);
        disk_file.write_all(header).unwrap();
        disk_file.set_len(0x1_0000_0000).unwrap();
-        disk_file.seek(SeekFrom::Start(0)).unwrap();
+        disk_file.rewind().unwrap();

        testfn(disk_file); // File closed when the function exits.
    }
@@ -1816,7 +1795,7 @@ mod tests {
        header
            .write_to(&mut disk_file)
            .expect("Failed to write header to temporary file.");
-        disk_file.seek(SeekFrom::Start(0)).unwrap();
+        disk_file.rewind().unwrap();
        QcowFile::from(disk_file).expect("Failed to create Qcow from default Header");
    }

@@ -1827,7 +1806,7 @@ mod tests {
        header
            .write_to(&mut disk_file)
            .expect("Failed to write header to temporary file.");
-        disk_file.seek(SeekFrom::Start(0)).unwrap();
+        disk_file.rewind().unwrap();
        QcowFile::from(disk_file).expect("Failed to create Qcow from default Header");
    }

@@ -1955,7 +1934,7 @@ mod tests {
            q.write_all(b"test first bytes")
                .expect("Failed to write test string.");
            let mut buf = [0u8; 4];
-            q.seek(SeekFrom::Start(0)).expect("Failed to seek.");
+            q.rewind().expect("Failed to seek.");
            q.read_exact(&mut buf).expect("Failed to read.");
            assert_eq!(&buf, b"test");
        });
@@ -2007,15 +1986,15 @@ mod tests {
            let mut q = QcowFile::from(disk_file).unwrap();
            // Write some test data.
            let b = [0x55u8; CHUNK_SIZE];
-            q.seek(SeekFrom::Start(0)).expect("Failed to seek.");
+            q.rewind().expect("Failed to seek.");
            q.write_all(&b).expect("Failed to write test string.");
            // Overwrite the full cluster with zeroes.
-            q.seek(SeekFrom::Start(0)).expect("Failed to seek.");
+            q.rewind().expect("Failed to seek.");
            let nwritten = q.write_zeroes(CHUNK_SIZE).expect("Failed to write zeroes.");
            assert_eq!(nwritten, CHUNK_SIZE);
            // Verify that the data was zeroed out.
            let mut buf = [0u8; CHUNK_SIZE];
-            q.seek(SeekFrom::Start(0)).expect("Failed to seek.");
+            q.rewind().expect("Failed to seek.");
            q.read_exact(&mut buf).expect("Failed to read.");
            assert_eq!(buf[0], 0);
            assert_eq!(buf[CHUNK_SIZE - 1], 0);
@@ -2457,7 +2436,7 @@ mod tests {
                }
            }
            // Check that address 0 is still zeros.
-            qcow_file.seek(SeekFrom::Start(0)).expect("Failed to seek.");
+            qcow_file.rewind().expect("Failed to seek.");
            let nread = qcow_file.read(&mut readback).expect("Failed to read.");
            assert_eq!(nread, BLOCK_SIZE);
            for read in readback.iter() {
@@ -2481,7 +2460,7 @@ mod tests {
    }

    fn seek_cur(file: &mut QcowFile) -> u64 {
-        file.seek(SeekFrom::Current(0)).unwrap()
+        file.stream_position().unwrap()
    }

    #[test]
@@ -2545,7 +2524,7 @@ mod tests {
            assert_eq!(seek_cur(&mut file), 0xFFFF);

            // seek_hole at or after the end of the file should return None
-            file.seek(SeekFrom::Start(0)).unwrap();
+            file.rewind().unwrap();
            assert_eq!(file.seek_hole(0x30000).unwrap(), None);
            assert_eq!(seek_cur(&mut file), 0);
            assert_eq!(file.seek_hole(0x30001).unwrap(), None);
@@ -2563,33 +2542,33 @@ mod tests {
            assert_eq!(seek_cur(&mut file), 0xFFFF);

            // seek_hole within data should return the next hole
-            file.seek(SeekFrom::Start(0)).unwrap();
+            file.rewind().unwrap();
            assert_eq!(file.seek_hole(0x10000).unwrap(), Some(0x20000));
            assert_eq!(seek_cur(&mut file), 0x20000);
-            file.seek(SeekFrom::Start(0)).unwrap();
+            file.rewind().unwrap();
            assert_eq!(file.seek_hole(0x10001).unwrap(), Some(0x20000));
            assert_eq!(seek_cur(&mut file), 0x20000);
-            file.seek(SeekFrom::Start(0)).unwrap();
+            file.rewind().unwrap();
            assert_eq!(file.seek_hole(0x1FFFF).unwrap(), Some(0x20000));
            assert_eq!(seek_cur(&mut file), 0x20000);
-            file.seek(SeekFrom::Start(0)).unwrap();
+            file.rewind().unwrap();
            assert_eq!(file.seek_hole(0xFFFF).unwrap(), Some(0xFFFF));
            assert_eq!(seek_cur(&mut file), 0xFFFF);
-            file.seek(SeekFrom::Start(0)).unwrap();
+            file.rewind().unwrap();
            assert_eq!(file.seek_hole(0x10000).unwrap(), Some(0x20000));
            assert_eq!(seek_cur(&mut file), 0x20000);
-            file.seek(SeekFrom::Start(0)).unwrap();
+            file.rewind().unwrap();
            assert_eq!(file.seek_hole(0x1FFFF).unwrap(), Some(0x20000));
            assert_eq!(seek_cur(&mut file), 0x20000);
-            file.seek(SeekFrom::Start(0)).unwrap();
+            file.rewind().unwrap();
            assert_eq!(file.seek_hole(0x20000).unwrap(), Some(0x20000));
            assert_eq!(seek_cur(&mut file), 0x20000);
-            file.seek(SeekFrom::Start(0)).unwrap();
+            file.rewind().unwrap();
            assert_eq!(file.seek_hole(0x20001).unwrap(), Some(0x20001));
            assert_eq!(seek_cur(&mut file), 0x20001);

            // seek_hole at EOF should return None
-            file.seek(SeekFrom::Start(0)).unwrap();
+            file.rewind().unwrap();
            assert_eq!(file.seek_hole(0x30000).unwrap(), None);
            assert_eq!(seek_cur(&mut file), 0);

@@ -2600,10 +2579,10 @@ mod tests {
            // seek_hole within [0x20000, 0x30000) should now find the hole at EOF
            assert_eq!(file.seek_hole(0x20000).unwrap(), Some(0x30000));
            assert_eq!(seek_cur(&mut file), 0x30000);
-            file.seek(SeekFrom::Start(0)).unwrap();
+            file.rewind().unwrap();
            assert_eq!(file.seek_hole(0x20001).unwrap(), Some(0x30000));
            assert_eq!(seek_cur(&mut file), 0x30000);
-            file.seek(SeekFrom::Start(0)).unwrap();
+            file.rewind().unwrap();
            assert_eq!(file.seek_hole(0x30000).unwrap(), None);
            assert_eq!(seek_cur(&mut file), 0);
        });
--- a/qcow/src/refcount.rs
+++ b/qcow/src/refcount.rs
@@ -31,16 +31,14 @@ impl Display for Error {
        use self::Error::*;

        match self {
-            EvictingRefCounts(e) => write!(
-                f,
-                "failed to write a refblock from the cache to disk: {}",
-                e
-            ),
+            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={} needs to be read", addr),
+            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)
+                write!(f, "failed to read the file into the refcount cache: {e}")
            }
        }
    }
--- a/rate_limiter/Cargo.toml
+++ b/rate_limiter/Cargo.toml
@@ -4,6 +4,6 @@ version = "0.1.0"
 edition = "2021"

 [dependencies]
-libc = "0.2.137"
+libc = "0.2.138"
 log = "0.4.17"
-vmm-sys-util = "0.10.0"
+vmm-sys-util = "0.11.0"
--- a/rate_limiter/src/lib.rs
+++ b/rate_limiter/src/lib.rs
@@ -888,7 +888,7 @@ pub(crate) mod tests {
    fn test_rate_limiter_debug() {
        let l = RateLimiter::new(1, 2, 3, 4, 5, 6).unwrap();
        assert_eq!(
-            format!("{:?}", l),
+            format!("{l:?}"),
            format!(
                "RateLimiter {{ bandwidth: {:?}, ops: {:?} }}",
                l.bandwidth(),
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,3 +1,5 @@
+- [v28.2](#v282)
+- [v28.1](#v281)
 - [v28.0](#v280)
    - [Community Engagement (Reminder)](#community-engagement-reminder)
    - [Long Term Support (LTS) Release](#long-term-support-lts-release)
@@ -247,6 +249,23 @@
    - [Unit testing](#unit-testing)
    - [Integration tests parallelization](#integration-tests-parallelization)

+# v28.2
+This is a bug fix release. The following issues have been addressed:
+
+* Fix QCOW2 refcount table size (#5034)
+* Fix unpause support on MSHV in dual binary (#5037)
+* Threads inside `virtio` devices are now shutdown on reboot (#5095)
+
+# v28.1
+This is a bug fix release. The following issues have been addressed:
+
+* Update dependencies including a version of `linux-loader` that
+addresses an infinite loop issue ([details](https://github.com/rust-vmm/linux-loader/security/advisories/GHSA-52h2-m2cf-9jh6))
+* Fix bugs related to `virtio-net` including an integer overflow issue
+  (#4924, #4949)
+* Use host `cpuid` information for L2 cache for older KVM on x86 (#4920)
+* Improve README and documentation
+
 # v28.0

 This release has been tracked in our new [roadmap
--- a/src/bin/ch-remote.rs
+++ b/src/bin/ch-remote.rs
@@ -41,21 +41,21 @@ impl fmt::Display for Error {
        use Error::*;
        match self {
            ApiClient(e) => e.fmt(f),
-            Connect(e) => write!(f, "Error opening HTTP socket: {}", e),
-            InvalidCpuCount(e) => write!(f, "Error parsing CPU count: {}", e),
-            InvalidMemorySize(e) => write!(f, "Error parsing memory size: {:?}", e),
-            InvalidBalloonSize(e) => write!(f, "Error parsing balloon size: {:?}", e),
-            AddDeviceConfig(e) => write!(f, "Error parsing device syntax: {}", e),
-            AddDiskConfig(e) => write!(f, "Error parsing disk syntax: {}", e),
-            AddFsConfig(e) => write!(f, "Error parsing filesystem syntax: {}", e),
-            AddPmemConfig(e) => write!(f, "Error parsing persistent memory syntax: {}", e),
-            AddNetConfig(e) => write!(f, "Error parsing network syntax: {}", e),
-            AddUserDeviceConfig(e) => write!(f, "Error parsing user device syntax: {}", e),
-            AddVdpaConfig(e) => write!(f, "Error parsing vDPA device syntax: {}", e),
-            AddVsockConfig(e) => write!(f, "Error parsing vsock syntax: {}", e),
-            Restore(e) => write!(f, "Error parsing restore syntax: {}", e),
-            ReadingStdin(e) => write!(f, "Error reading from stdin: {}", e),
-            ReadingFile(e) => write!(f, "Error reading from file: {}", e),
+            Connect(e) => write!(f, "Error opening HTTP socket: {e}"),
+            InvalidCpuCount(e) => write!(f, "Error parsing CPU count: {e}"),
+            InvalidMemorySize(e) => write!(f, "Error parsing memory size: {e:?}"),
+            InvalidBalloonSize(e) => write!(f, "Error parsing balloon size: {e:?}"),
+            AddDeviceConfig(e) => write!(f, "Error parsing device syntax: {e}"),
+            AddDiskConfig(e) => write!(f, "Error parsing disk syntax: {e}"),
+            AddFsConfig(e) => write!(f, "Error parsing filesystem syntax: {e}"),
+            AddPmemConfig(e) => write!(f, "Error parsing persistent memory syntax: {e}"),
+            AddNetConfig(e) => write!(f, "Error parsing network syntax: {e}"),
+            AddUserDeviceConfig(e) => write!(f, "Error parsing user device syntax: {e}"),
+            AddVdpaConfig(e) => write!(f, "Error parsing vDPA device syntax: {e}"),
+            AddVsockConfig(e) => write!(f, "Error parsing vsock syntax: {e}"),
+            Restore(e) => write!(f, "Error parsing restore syntax: {e}"),
+            ReadingStdin(e) => write!(f, "Error reading from stdin: {e}"),
+            ReadingFile(e) => write!(f, "Error reading from file: {e}"),
        }
    }
 }
@@ -680,7 +680,7 @@ fn main() {
    let matches = app.get_matches();

    if let Err(e) = do_command(&matches) {
-        eprintln!("Error running command: {}", e);
+        eprintln!("Error running command: {e}");
        process::exit(1)
    };
 }
--- a/src/main.rs
+++ b/src/main.rs
@@ -477,7 +477,7 @@ fn start_vmm(cmd_arguments: ArgMatches) -> Result<Option<String>, Error> {
            "log" => SeccompAction::Log,
            _ => {
                // The user providing an invalid value will be rejected by clap
-                panic!("Invalid parameter {} for \"--seccomp\" flag", seccomp_value);
+                panic!("Invalid parameter {seccomp_value} for \"--seccomp\" flag");
            }
        }
    } else {
@@ -497,7 +497,7 @@ fn start_vmm(cmd_arguments: ArgMatches) -> Result<Option<String>, Error> {
                signal_hook::low_level::emulate_default_handler(SIGSYS).unwrap();
            })
        }
-        .map_err(|e| eprintln!("Error adding SIGSYS signal handler: {}", e))
+        .map_err(|e| eprintln!("Error adding SIGSYS signal handler: {e}"))
        .ok();
    }

@@ -506,13 +506,13 @@ fn start_vmm(cmd_arguments: ArgMatches) -> Result<Option<String>, Error> {
    // dedicated signal handling thread we'll start in a bit.
    for sig in &vmm::vm::Vm::HANDLED_SIGNALS {
        if let Err(e) = block_signal(*sig) {
-            eprintln!("Error blocking signals: {}", e);
+            eprintln!("Error blocking signals: {e}");
        }
    }

    for sig in &vmm::Vmm::HANDLED_SIGNALS {
        if let Err(e) = block_signal(*sig) {
-            eprintln!("Error blocking signals: {}", e);
+            eprintln!("Error blocking signals: {e}");
        }
    }

@@ -602,7 +602,7 @@ fn main() {
            0
        }
        Err(e) => {
-            eprintln!("{}", e);
+            eprintln!("{e}");
            1
        }
    };
--- a/test_infra/Cargo.toml
+++ b/test_infra/Cargo.toml
@@ -7,10 +7,10 @@ edition = "2021"
 [dependencies]
 dirs = "4.0.0"
 epoll = "4.3.1"
-libc = "0.2.137"
+libc = "0.2.138"
 once_cell = "1.16.0"
-serde = { version = "1.0.147", features = ["rc", "derive"] }
-serde_json = "1.0.87"
+serde = { version = "1.0.150", features = ["rc", "derive"] }
+serde_json = "1.0.89"
 ssh2 = { version = "0.9.3", features = ["vendored-openssl"] }
-vmm-sys-util = "0.10.0"
+vmm-sys-util = "0.11.0"
 wait-timeout = "0.2.0"
--- a/test_infra/src/lib.rs
+++ b/test_infra/src/lib.rs
@@ -146,13 +146,12 @@ impl GuestNetworkConfig {
                let duration = start.elapsed();
                eprintln!(
                    "\n\n==== Start 'wait_vm_boot' (FAILED) ====\n\n\
-                 duration =\"{:?}, timeout = {}s\"\n\
-                 listen_addr=\"{}\"\n\
-                 expected_guest_addr=\"{}\"\n\
-                 message=\"{}\"\n\
-                 error=\"{:?}\"\n\
-                 \n==== End 'wait_vm_boot' outout ====\n\n",
-                    duration, timeout, listen_addr, expected_guest_addr, s, e
+                 duration =\"{duration:?}, timeout = {timeout}s\"\n\
+                 listen_addr=\"{listen_addr}\"\n\
+                 expected_guest_addr=\"{expected_guest_addr}\"\n\
+                 message=\"{s}\"\n\
+                 error=\"{e:?}\"\n\
+                 \n==== End 'wait_vm_boot' outout ====\n\n"
                );

                Err(e)
@@ -433,7 +432,7 @@ impl DiskConfig for WindowsDiskConfig {
            .output()
            .expect("Expect device mapper nodes to be ready");

-        self.osdisk_path = format!("/dev/mapper/{}", windows_snapshot);
+        self.osdisk_path = format!("/dev/mapper/{windows_snapshot}");
        self.windows_snapshot_cow = windows_snapshot_cow;
        self.windows_snapshot = windows_snapshot;
    }
@@ -461,10 +460,7 @@ pub fn rate_limited_copy<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> io::

        // Make sure there is at least 6 GiB of space
        if free_bytes < 6 << 30 {
-            eprintln!(
-                "Not enough space on disk ({}). Attempt {} of 10. Sleeping.",
-                free_bytes, i
-            );
+            eprintln!("Not enough space on disk ({free_bytes}). Attempt {i} of 10. Sleeping.");
            thread::sleep(std::time::Duration::new(60, 0));
            continue;
        }
@@ -473,7 +469,7 @@ pub fn rate_limited_copy<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> io::
            Err(e) => {
                if let Some(errno) = e.raw_os_error() {
                    if errno == libc::ENOSPC {
-                        eprintln!("Copy returned ENOSPC. Attempt {} of 10. Sleeping.", i);
+                        eprintln!("Copy returned ENOSPC. Attempt {i} of 10. Sleeping.");
                        thread::sleep(std::time::Duration::new(60, 0));
                        continue;
                    }
@@ -508,7 +504,7 @@ pub fn handle_child_output(
            );
        }
        Some(code) => {
-            eprintln!("\n\n==== child exit code: {} ====", code);
+            eprintln!("\n\n==== child exit code: {code} ====");
        }
    }

@@ -562,7 +558,7 @@ fn scp_to_guest_with_auth(
    loop {
        match (|| -> Result<(), SshCommandError> {
            let tcp =
-                TcpStream::connect(format!("{}:22", ip)).map_err(SshCommandError::Connection)?;
+                TcpStream::connect(format!("{ip}:22")).map_err(SshCommandError::Connection)?;
            let mut sess = Session::new().unwrap();
            sess.set_tcp_stream(tcp);
            sess.handshake().map_err(SshCommandError::Handshake)?;
@@ -600,13 +596,12 @@ fn scp_to_guest_with_auth(
                if counter >= retries {
                    eprintln!(
                        "\n\n==== Start scp command output (FAILED) ====\n\n\
-                         path =\"{:?}\"\n\
-                         remote_path =\"{:?}\"\n\
-                         auth=\"{:#?}\"\n\
-                         ip=\"{}\"\n\
-                         error=\"{:?}\"\n\
-                         \n==== End scp command outout ====\n\n",
-                        path, remote_path, auth, ip, e
+                         path =\"{path:?}\"\n\
+                         remote_path =\"{remote_path:?}\"\n\
+                         auth=\"{auth:#?}\"\n\
+                         ip=\"{ip}\"\n\
+                         error=\"{e:?}\"\n\
+                         \n==== End scp command outout ====\n\n"
                    );

                    return Err(e);
@@ -651,7 +646,7 @@ pub fn ssh_command_ip_with_auth(
    loop {
        match (|| -> Result<(), SshCommandError> {
            let tcp =
-                TcpStream::connect(format!("{}:22", ip)).map_err(SshCommandError::Connection)?;
+                TcpStream::connect(format!("{ip}:22")).map_err(SshCommandError::Connection)?;
            let mut sess = Session::new().unwrap();
            sess.set_tcp_stream(tcp);
            sess.handshake().map_err(SshCommandError::Handshake)?;
@@ -685,13 +680,12 @@ pub fn ssh_command_ip_with_auth(
                if counter >= retries {
                    eprintln!(
                        "\n\n==== Start ssh command output (FAILED) ====\n\n\
-                         command=\"{}\"\n\
-                         auth=\"{:#?}\"\n\
-                         ip=\"{}\"\n\
-                         output=\"{}\"\n\
-                         error=\"{:?}\"\n\
-                         \n==== End ssh command outout ====\n\n",
-                        command, auth, ip, s, e
+                         command=\"{command}\"\n\
+                         auth=\"{auth:#?}\"\n\
+                         ip=\"{ip}\"\n\
+                         output=\"{s}\"\n\
+                         error=\"{e:?}\"\n\
+                         \n==== End ssh command outout ====\n\n"
                    );

                    return Err(e);
@@ -725,14 +719,14 @@ pub fn exec_host_command_status(command: &str) -> ExitStatus {
    std::process::Command::new("bash")
        .args(["-c", command])
        .status()
-        .unwrap_or_else(|_| panic!("Expected '{}' to run", command))
+        .unwrap_or_else(|_| panic!("Expected '{command}' to run"))
 }

 pub fn exec_host_command_output(command: &str) -> Output {
    std::process::Command::new("bash")
        .args(["-c", command])
        .output()
-        .unwrap_or_else(|_| panic!("Expected '{}' to run", command))
+        .unwrap_or_else(|_| panic!("Expected '{command}' to run"))
 }

 pub const PIPE_SIZE: i32 = 32 << 20;
@@ -753,15 +747,15 @@ impl Guest {
        let tmp_dir = TempDir::new_with_prefix("/tmp/ch").unwrap();

        let network = GuestNetworkConfig {
-            guest_ip: format!("{}.{}.2", class, id),
-            l2_guest_ip1: format!("{}.{}.3", class, id),
-            l2_guest_ip2: format!("{}.{}.4", class, id),
-            l2_guest_ip3: format!("{}.{}.5", class, id),
-            host_ip: format!("{}.{}.1", class, id),
-            guest_mac: format!("12:34:56:78:90:{:02x}", id),
-            l2_guest_mac1: format!("de:ad:be:ef:12:{:02x}", id),
-            l2_guest_mac2: format!("de:ad:be:ef:34:{:02x}", id),
-            l2_guest_mac3: format!("de:ad:be:ef:56:{:02x}", id),
+            guest_ip: format!("{class}.{id}.2"),
+            l2_guest_ip1: format!("{class}.{id}.3"),
+            l2_guest_ip2: format!("{class}.{id}.4"),
+            l2_guest_ip3: format!("{class}.{id}.5"),
+            host_ip: format!("{class}.{id}.1"),
+            guest_mac: format!("12:34:56:78:90:{id:02x}"),
+            l2_guest_mac1: format!("de:ad:be:ef:12:{id:02x}"),
+            l2_guest_mac2: format!("de:ad:be:ef:34:{id:02x}"),
+            l2_guest_mac3: format!("de:ad:be:ef:56:{id:02x}"),
            tcp_listener_port: DEFAULT_TCP_LISTENER_PORT + id as u16,
        };

@@ -898,9 +892,8 @@ impl Guest {
    pub fn get_numa_node_memory(&self, node_id: usize) -> Result<u32, Error> {
        self.ssh_command(
            format!(
-                "grep MemTotal /sys/devices/system/node/node{}/meminfo \
-                        | cut -d \":\" -f 2 | grep -o \"[0-9]*\"",
-                node_id
+                "grep MemTotal /sys/devices/system/node/node{node_id}/meminfo \
+                        | cut -d \":\" -f 2 | grep -o \"[0-9]*\""
            )
            .as_str(),
        )?
@@ -917,10 +910,7 @@ impl Guest {

    pub fn check_numa_node_cpus(&self, node_id: usize, cpus: Vec<usize>) -> Result<(), Error> {
        for cpu in cpus.iter() {
-            let cmd = format!(
-                "[ -d \"/sys/devices/system/node/node{}/cpu{}\" ]",
-                node_id, cpu
-            );
+            let cmd = format!("[ -d \"/sys/devices/system/node/node{node_id}/cpu{cpu}\" ]");
            self.ssh_command(cmd.as_str())?;
        }

@@ -932,7 +922,7 @@ impl Guest {
        node_id: usize,
        distances: &str,
    ) -> Result<bool, Error> {
-        let cmd = format!("cat /sys/devices/system/node/node{}/distance", node_id);
+        let cmd = format!("cat /sys/devices/system/node/node{node_id}/distance");
        if self.ssh_command(cmd.as_str())?.trim() == distances {
            Ok(true)
        } else {
@@ -1045,8 +1035,7 @@ impl Guest {

        // Write something to vsock from the host
        assert!(exec_host_command_status(&format!(
-            "echo -e \"CONNECT 16\\nHelloWorld!\" | socat - UNIX-CONNECT:{}",
-            socket
+            "echo -e \"CONNECT 16\\nHelloWorld!\" | socat - UNIX-CONNECT:{socket}"
        ))
        .success());

@@ -1131,7 +1120,7 @@ impl Guest {
        }
        // Check if the console is usable
        if let Some(console_text) = console_text {
-            let console_cmd = format!("echo {} | sudo tee /dev/hvc0", console_text);
+            let console_cmd = format!("echo {console_text} | sudo tee /dev/hvc0");
            self.ssh_command(&console_cmd).unwrap();
        }
        // The net device is 'automatically' exercised through the above 'ssh' commands
@@ -1139,13 +1128,11 @@ impl Guest {
        // Check if the pmem device is usable
        if let Some(pmem_path) = pmem_path {
            assert_eq!(
-                self.ssh_command(&format!("ls {}", pmem_path))
-                    .unwrap()
-                    .trim(),
+                self.ssh_command(&format!("ls {pmem_path}")).unwrap().trim(),
                pmem_path
            );
            assert_eq!(
-                self.ssh_command(&format!("sudo mount {} /mnt", pmem_path))
+                self.ssh_command(&format!("sudo mount {pmem_path} /mnt"))
                    .unwrap(),
                ""
            );
@@ -1156,7 +1143,7 @@ impl Guest {
            assert_eq!(self.ssh_command("ls /mnt").unwrap(), "");

            assert_eq!(
-                self.ssh_command(&format!("sudo mount {} /mnt", pmem_path))
+                self.ssh_command(&format!("sudo mount {pmem_path} /mnt"))
                    .unwrap(),
                ""
            );
@@ -1279,8 +1266,7 @@ impl<'a> GuestCommand<'a> {
                Err(std::io::Error::new(
                    std::io::ErrorKind::Other,
                    format!(
-                        "resizing pipe w/ 'fnctl' failed: stdout pipesize {}, stderr pipesize {}",
-                        pipesize, pipesize1
+                        "resizing pipe w/ 'fnctl' failed: stdout pipesize {pipesize}, stderr pipesize {pipesize1}"
                    ),
                ))
            }
@@ -1338,8 +1324,8 @@ impl<'a> GuestCommand<'a> {

 pub fn clh_command(cmd: &str) -> String {
    env::var("BUILD_TARGET").map_or(
-        format!("target/x86_64-unknown-linux-gnu/release/{}", cmd),
-        |target| format!("target/{}/release/{}", target, cmd),
+        format!("target/x86_64-unknown-linux-gnu/release/{cmd}"),
+        |target| format!("target/{target}/release/{cmd}"),
    )
 }

@@ -1440,8 +1426,7 @@ pub fn parse_fio_output(output: &str, fio_ops: &FioOps, num_jobs: u32) -> Result
    })
    .map_err(|_| {
        eprintln!(
-            "=============== Fio output ===============\n\n{}\n\n===========end============\n\n",
-            output
+            "=============== Fio output ===============\n\n{output}\n\n===========end============\n\n"
        );
        Error::FioOutputParse
    })
@@ -1496,8 +1481,7 @@ pub fn parse_fio_output_iops(output: &str, fio_ops: &FioOps, num_jobs: u32) -> R
    })
    .map_err(|_| {
        eprintln!(
-            "=============== Fio output ===============\n\n{}\n\n===========end============\n\n",
-            output
+            "=============== Fio output ===============\n\n{output}\n\n===========end============\n\n"
        );
        Error::FioOutputParse
    })
@@ -1550,7 +1534,7 @@ pub fn measure_virtio_net_throughput(
            "-p",
            &format!("{}", default_port + n),
            "-t",
-            &format!("{}", test_timeout),
+            &format!("{test_timeout}"),
        ]);
        // For measuring the guest transmit throughput (as a sender),
        // use reverse mode of the iperf3 client on the host
@@ -1644,7 +1628,7 @@ pub fn measure_virtio_net_latency(guest: &Guest, test_timeout: u32) -> Result<Ve
    )?;

    // Start the ethr server on the guest
-    guest.ssh_command(&format!("{} -s &> /dev/null &", ethr_remote_path))?;
+    guest.ssh_command(&format!("{ethr_remote_path} -s &> /dev/null &"))?;

    thread::sleep(Duration::new(10, 0));

@@ -1665,7 +1649,7 @@ pub fn measure_virtio_net_latency(guest: &Guest, test_timeout: u32) -> Result<Ve
            "-o",
            &log_file, // file output is JSON format
            "-d",
-            &format!("{}s", test_timeout),
+            &format!("{test_timeout}s"),
        ])
        .stderr(Stdio::piped())
        .stdout(Stdio::piped())
--- a/tests/integration.rs
+++ b/tests/integration.rs
--- a/tpm/Cargo.toml
+++ b/tpm/Cargo.toml
@@ -6,9 +6,9 @@ license = "Apache-2.0"
 version = "0.1.0"

 [dependencies]
-anyhow = "1.0.56"
+anyhow = "1.0.66"
 byteorder = "1.4.3"
-libc = "0.2.133"
-log = "0.4.14"
-thiserror = "1.0.30"
-vmm-sys-util = "0.10.0"
+libc = "0.2.138"
+log = "0.4.17"
+thiserror = "1.0.37"
+vmm-sys-util = "0.11.0"
--- a/tracer/Cargo.toml
+++ b/tracer/Cargo.toml
@@ -5,11 +5,11 @@ authors = ["The Cloud Hypervisor Authors"]
 edition = "2021"

 [dependencies]
-libc = "0.2.137"
+libc = "0.2.138"
 log = "0.4.17"
 once_cell = "1.16.0"
-serde = { version = "1.0.147", features = ["rc", "derive"] }
-serde_json = "1.0.87"
+serde = { version = "1.0.150", features = ["rc", "derive"] }
+serde_json = "1.0.89"

 [features]
 tracing = []
--- a/tracer/src/tracer.rs
+++ b/tracer/src/tracer.rs
@@ -79,7 +79,7 @@ impl Tracer {
        if let Some(depth) = self.thread_depths.get_mut(thread_name) {
            depth.fetch_sub(1, Ordering::SeqCst);
        } else {
-            panic!("Unmatched decreas for thread: {}", thread_name);
+            panic!("Unmatched decreas for thread: {thread_name}");
        }
    }

--- a/vfio_user/Cargo.toml
+++ b/vfio_user/Cargo.toml
@@ -5,15 +5,13 @@ authors = ["The Cloud Hypervisor Authors"]
 edition = "2021"

 [dependencies]
-libc = "0.2.137"
+libc = "0.2.138"
 log = "0.4.17"
-serde = { version = "1.0.147", features = ["rc"] }
-serde_derive = "1.0.142"
-serde_json = "1.0.87"
+serde = { version = "1.0.150", features = ["rc"] }
+serde_derive = "1.0.150"
+serde_json = "1.0.89"
 thiserror = "1.0.37"
-vm-memory = { version = "0.9.0", features = ["backend-mmap", "backend-atomic"] }
-vmm-sys-util = "0.10.0"
+vfio-bindings = { git = "https://github.com/rust-vmm/vfio", branch = "main", features = ["fam-wrappers"] }
+vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic"] }
+vmm-sys-util = "0.11.0"

-[dependencies.vfio-bindings]
-version = "0.3.1"
-features = ["fam-wrappers"]
--- a/vhdx/Cargo.toml
+++ b/vhdx/Cargo.toml
@@ -8,8 +8,8 @@ license = "Apache-2.0"
 [dependencies]
 byteorder = "1.4.3"
 crc32c = "0.6.3"
-libc = "0.2.137"
+libc = "0.2.138"
 log = "0.4.17"
 remain = "0.2.5"
 thiserror = "1.0.37"
-uuid = { version = "1.2.1", features = ["v4"] }
+uuid = { version = "1.2.2", features = ["v4"] }
--- a/vhdx/src/vhdx.rs
+++ b/vhdx/src/vhdx.rs
@@ -105,8 +105,7 @@ impl Read for Vhdx {
            std::io::Error::new(
                std::io::ErrorKind::Other,
                format!(
-                    "Failed reading {} sectors from VHDx at index {}: {}",
-                    sector_count, sector_index, e
+                    "Failed reading {sector_count} sectors from VHDx at index {sector_index}: {e}"
                ),
            )
        })
@@ -130,7 +129,7 @@ impl Write for Vhdx {
            self.vhdx_header.update(&mut self.file).map_err(|e| {
                std::io::Error::new(
                    std::io::ErrorKind::Other,
-                    format!("Failed to update VHDx header: {}", e),
+                    format!("Failed to update VHDx header: {e}"),
                )
            })?;
        }
@@ -148,8 +147,7 @@ impl Write for Vhdx {
            std::io::Error::new(
                std::io::ErrorKind::Other,
                format!(
-                    "Failed writing {} sectors on VHDx at index {}: {}",
-                    sector_count, sector_index, e
+                    "Failed writing {sector_count} sectors on VHDx at index {sector_index}: {e}"
                ),
            )
        })
--- a/vhost_user_block/Cargo.toml
+++ b/vhost_user_block/Cargo.toml
@@ -6,19 +6,19 @@ edition = "2021"

 [dependencies]
 block_util = { path = "../block_util" }
-clap = { version = "4.0.18", features = ["wrap_help","cargo"] }
-env_logger = "0.9.3"
+clap = { version = "4.0.29", features = ["wrap_help","cargo"] }
+env_logger = "0.10.0"
 epoll = "4.3.1"
-libc = "0.2.137"
+libc = "0.2.138"
 log = "0.4.17"
 option_parser = { path = "../option_parser" }
 qcow = { path = "../qcow" }
-vhost = { version = "0.5.0", features = ["vhost-user-slave"] }
-vhost-user-backend = "0.7.0"
+vhost = { version = "0.6.0", features = ["vhost-user-slave"] }
+vhost-user-backend = "0.8.0"
 virtio-bindings = "0.1.0"
-virtio-queue = "0.6.1"
-vm-memory = "0.9.0"
-vmm-sys-util = "0.10.0"
+virtio-queue = "0.7.0"
+vm-memory = "0.10.0"
+vmm-sys-util = "0.11.0"

 [build-dependencies]
-clap = { version = "4.0.18", features = ["cargo"] }
+clap = { version = "4.0.29", features = ["cargo"] }
--- a/vhost_user_block/src/lib.rs
+++ b/vhost_user_block/src/lib.rs
@@ -79,7 +79,7 @@ pub const SYNTAX: &str = "vhost-user-block backend parameters \

 impl fmt::Display for Error {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "vhost_user_block_error: {:?}", self)
+        write!(f, "vhost_user_block_error: {self:?}")
    }
 }

@@ -504,7 +504,7 @@ pub fn start_block_backend(backend_command: &str) {
    let backend_config = match VhostUserBlkBackendConfig::parse(backend_command) {
        Ok(config) => config,
        Err(e) => {
-            println!("Failed parsing parameters {:?}", e);
+            println!("Failed parsing parameters {e:?}");
            process::exit(1);
        }
    };
--- a/vhost_user_net/Cargo.toml
+++ b/vhost_user_net/Cargo.toml
@@ -5,18 +5,18 @@ authors = ["The Cloud Hypervisor Authors"]
 edition = "2021"

 [dependencies]
-clap = { version = "4.0.18", features = ["wrap_help","cargo"] }
-env_logger = "0.9.3"
+clap = { version = "4.0.29", features = ["wrap_help","cargo"] }
+env_logger = "0.10.0"
 epoll = "4.3.1"
-libc = "0.2.137"
+libc = "0.2.138"
 log = "0.4.17"
 net_util = { path = "../net_util" }
 option_parser = { path = "../option_parser" }
-vhost = { version = "0.5.0", features = ["vhost-user-slave"] }
-vhost-user-backend = "0.7.0"
+vhost = { version = "0.6.0", features = ["vhost-user-slave"] }
+vhost-user-backend = "0.8.0"
 virtio-bindings = "0.1.0"
-vm-memory = "0.9.0"
-vmm-sys-util = "0.10.0"
+vm-memory = "0.10.0"
+vmm-sys-util = "0.11.0"

 [build-dependencies]
-clap = { version = "4.0.18", features = ["cargo"] }
+clap = { version = "4.0.29", features = ["cargo"] }
--- a/vhost_user_net/src/lib.rs
+++ b/vhost_user_net/src/lib.rs
@@ -64,7 +64,7 @@ num_queues=<number_of_queues>,queue_size=<size_of_each_queue>,tap=<if_name>\"";

 impl fmt::Display for Error {
    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "vhost_user_net_error: {:?}", self)
+        write!(f, "vhost_user_net_error: {self:?}")
    }
 }

@@ -348,7 +348,7 @@ pub fn start_net_backend(backend_command: &str) {
    let backend_config = match VhostUserNetBackendConfig::parse(backend_command) {
        Ok(config) => config,
        Err(e) => {
-            eprintln!("Failed parsing parameters {:?}", e);
+            eprintln!("Failed parsing parameters {e:?}");
            process::exit(1);
        }
    };
--- a/virtio-devices/Cargo.toml
+++ b/virtio-devices/Cargo.toml
@@ -14,26 +14,26 @@ block_util = { path = "../block_util" }
 byteorder = "1.4.3"
 epoll = "4.3.1"
 event_monitor = { path = "../event_monitor" }
-io-uring = "0.5.8"
-libc = "0.2.137"
+io-uring = "0.5.9"
+libc = "0.2.138"
 log = "0.4.17"
 net_gen = { path = "../net_gen" }
 net_util = { path = "../net_util" }
 pci = { path = "../pci" }
 rate_limiter = { path = "../rate_limiter" }
 seccompiler = "0.3.0"
-serde = { version = "1.0.147", features = ["derive"] }
-serde_json = "1.0.87"
+serde = { version = "1.0.150", features = ["derive"] }
+serde_json = "1.0.89"
 serial_buffer = { path = "../serial_buffer" }
 thiserror = "1.0.37"
-versionize = "0.1.6"
+versionize = "0.1.9"
 versionize_derive = "0.1.4"
-vhost = { version = "0.5.0", features = ["vhost-user-master", "vhost-user-slave", "vhost-kern", "vhost-vdpa"] }
+vhost = { version = "0.6.0", features = ["vhost-user-master", "vhost-user-slave", "vhost-kern", "vhost-vdpa"] }
 virtio-bindings = { version = "0.1.0", features = ["virtio-v5_0_0"] }
-virtio-queue = "0.6.1"
+virtio-queue = "0.7.0"
 vm-allocator = { path = "../vm-allocator" }
 vm-device = { path = "../vm-device" }
-vm-memory = { version = "0.9.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
+vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
 vm-migration = { path = "../vm-migration" }
 vm-virtio = { path = "../vm-virtio" }
-vmm-sys-util = "0.10.0"
+vmm-sys-util = "0.11.0"
--- a/virtio-devices/src/balloon.rs
+++ b/virtio-devices/src/balloon.rs
@@ -443,6 +443,7 @@ impl Drop for Balloon {
            // Ignore the result because there is nothing we can do about it.
            let _ = kill_evt.write(1);
        }
+        self.common.wait_for_epoll_threads();
    }
 }

--- a/virtio-devices/src/block.rs
+++ b/virtio-devices/src/block.rs
@@ -454,7 +454,7 @@ impl Block {
            let disk_size = disk_image.size().map_err(|e| {
                io::Error::new(
                    io::ErrorKind::Other,
-                    format!("Failed getting disk size: {}", e),
+                    format!("Failed getting disk size: {e}"),
                )
            })?;
            if disk_size % SECTOR_SIZE != 0 {
@@ -581,6 +581,7 @@ impl Drop for Block {
            // Ignore the result because there is nothing we can do about it.
            let _ = kill_evt.write(1);
        }
+        self.common.wait_for_epoll_threads();
    }
 }

--- a/virtio-devices/src/console.rs
+++ b/virtio-devices/src/console.rs
@@ -705,6 +705,7 @@ impl Drop for Console {
            // Ignore the result because there is nothing we can do about it.
            let _ = kill_evt.write(1);
        }
+        self.common.wait_for_epoll_threads();
    }
 }

--- a/virtio-devices/src/iommu.rs
+++ b/virtio-devices/src/iommu.rs
@@ -781,7 +781,7 @@ impl DmaRemapping for IommuMapping {

        Err(io::Error::new(
            io::ErrorKind::Other,
-            format!("failed to translate GVA addr 0x{:x}", addr),
+            format!("failed to translate GVA addr 0x{addr:x}"),
        ))
    }

@@ -809,7 +809,7 @@ impl DmaRemapping for IommuMapping {

        Err(io::Error::new(
            io::ErrorKind::Other,
-            format!("failed to translate GPA addr 0x{:x}", addr),
+            format!("failed to translate GPA addr 0x{addr:x}"),
        ))
    }
 }
@@ -985,6 +985,7 @@ impl Drop for Iommu {
            // Ignore the result because there is nothing we can do about it.
            let _ = kill_evt.write(1);
        }
+        self.common.wait_for_epoll_threads();
    }
 }

--- a/virtio-devices/src/mem.rs
+++ b/virtio-devices/src/mem.rs
@@ -727,10 +727,7 @@ impl Mem {
        if region_len != region_len / VIRTIO_MEM_ALIGN_SIZE * VIRTIO_MEM_ALIGN_SIZE {
            return Err(io::Error::new(
                io::ErrorKind::Other,
-                format!(
-                    "Virtio-mem size is not aligned with {}",
-                    VIRTIO_MEM_ALIGN_SIZE
-                ),
+                format!("Virtio-mem size is not aligned with {VIRTIO_MEM_ALIGN_SIZE}"),
            ));
        }

@@ -756,8 +753,7 @@ impl Mem {
                    io::Error::new(
                        io::ErrorKind::Other,
                        format!(
-                            "Failed to resize virtio-mem configuration to {}: {:?}",
-                            initial_size, e
+                            "Failed to resize virtio-mem configuration to {initial_size}: {e:?}"
                        ),
                    )
                })?;
@@ -773,7 +769,7 @@ impl Mem {
            config.validate().map_err(|e| {
                io::Error::new(
                    io::ErrorKind::Other,
-                    format!("Invalid virtio-mem configuration: {:?}", e),
+                    format!("Invalid virtio-mem configuration: {e:?}"),
                )
            })?;

@@ -898,6 +894,7 @@ impl Drop for Mem {
            // Ignore the result because there is nothing we can do about it.
            let _ = kill_evt.write(1);
        }
+        self.common.wait_for_epoll_threads();
    }
 }

--- a/virtio-devices/src/net.rs
+++ b/virtio-devices/src/net.rs
@@ -633,6 +633,11 @@ impl Drop for Net {
        }
        // Needed to ensure all references to tap FDs are dropped (#4868)
        self.common.wait_for_epoll_threads();
+        if let Some(thread) = self.ctrl_queue_epoll_thread.take() {
+            if let Err(e) = thread.join() {
+                error!("Error joining thread: {:?}", e);
+            }
+        }
    }
 }

--- a/virtio-devices/src/pmem.rs
+++ b/virtio-devices/src/pmem.rs
@@ -358,6 +358,7 @@ impl Drop for Pmem {
            // Ignore the result because there is nothing we can do about it.
            let _ = kill_evt.write(1);
        }
+        self.common.wait_for_epoll_threads();
    }
 }

--- a/virtio-devices/src/rng.rs
+++ b/virtio-devices/src/rng.rs
@@ -227,6 +227,7 @@ impl Drop for Rng {
            // Ignore the result because there is nothing we can do about it.
            let _ = kill_evt.write(1);
        }
+        self.common.wait_for_epoll_threads();
    }
 }

--- a/virtio-devices/src/vdpa.rs
+++ b/virtio-devices/src/vdpa.rs
@@ -544,9 +544,8 @@ impl<M: GuestAddressSpace + Sync + Send> ExternalDmaMapping for VdpaDmaMapping<M
            return Err(io::Error::new(
                io::ErrorKind::Other,
                format!(
-                    "failed to convert guest address 0x{:x} into \
-                     host user virtual address",
-                    gpa
+                    "failed to convert guest address 0x{gpa:x} into \
+                     host user virtual address"
                ),
            ));
        };
@@ -564,8 +563,7 @@ impl<M: GuestAddressSpace + Sync + Send> ExternalDmaMapping for VdpaDmaMapping<M
                    io::ErrorKind::Other,
                    format!(
                        "failed to map memory for vDPA device, \
-                         iova 0x{:x}, gpa 0x{:x}, size 0x{:x}: {:?}",
-                        iova, gpa, size, e
+                         iova 0x{iova:x}, gpa 0x{gpa:x}, size 0x{size:x}: {e:?}"
                    ),
                )
            })
@@ -582,8 +580,7 @@ impl<M: GuestAddressSpace + Sync + Send> ExternalDmaMapping for VdpaDmaMapping<M
                    io::ErrorKind::Other,
                    format!(
                        "failed to unmap memory for vDPA device, \
-                     iova 0x{:x}, size 0x{:x}: {:?}",
-                        iova, size, e
+                     iova 0x{iova:x}, size 0x{size:x}: {e:?}"
                    ),
                )
            })
--- a/virtio-devices/src/vhost_user/blk.rs
+++ b/virtio-devices/src/vhost_user/blk.rs
@@ -215,6 +215,12 @@ impl Drop for Blk {
                error!("failed to kill vhost-user-blk: {:?}", e);
            }
        }
+        self.common.wait_for_epoll_threads();
+        if let Some(thread) = self.epoll_thread.take() {
+            if let Err(e) = thread.join() {
+                error!("Error joining thread: {:?}", e);
+            }
+        }
    }
 }

--- a/virtio-devices/src/vhost_user/fs.rs
+++ b/virtio-devices/src/vhost_user/fs.rs
@@ -451,6 +451,12 @@ impl Drop for Fs {
            // Ignore the result because there is nothing we can do about it.
            let _ = kill_evt.write(1);
        }
+        self.common.wait_for_epoll_threads();
+        if let Some(thread) = self.epoll_thread.take() {
+            if let Err(e) = thread.join() {
+                error!("Error joining thread: {:?}", e);
+            }
+        }
    }
 }

--- a/virtio-devices/src/vhost_user/mod.rs
+++ b/virtio-devices/src/vhost_user/mod.rs
@@ -216,7 +216,7 @@ impl<S: VhostUserMasterReqHandler> VhostUserEpollHandler<S> {
        .map_err(|e| {
            EpollHelperError::IoError(std::io::Error::new(
                std::io::ErrorKind::Other,
-                format!("failed connecting vhost-user backend {:?}", e),
+                format!("failed connecting vhost-user backend {e:?}"),
            ))
        })?;

@@ -237,7 +237,7 @@ impl<S: VhostUserMasterReqHandler> VhostUserEpollHandler<S> {
            .map_err(|e| {
                EpollHelperError::IoError(std::io::Error::new(
                    std::io::ErrorKind::Other,
-                    format!("failed reconnecting vhost-user backend{:?}", e),
+                    format!("failed reconnecting vhost-user backend{e:?}"),
                ))
            })?;

--- a/virtio-devices/src/vhost_user/net.rs
+++ b/virtio-devices/src/vhost_user/net.rs
@@ -231,6 +231,19 @@ impl Drop for Net {
                error!("failed to kill vhost-user-net: {:?}", e);
            }
        }
+
+        self.common.wait_for_epoll_threads();
+
+        if let Some(thread) = self.epoll_thread.take() {
+            if let Err(e) = thread.join() {
+                error!("Error joining thread: {:?}", e);
+            }
+        }
+        if let Some(thread) = self.ctrl_queue_epoll_thread.take() {
+            if let Err(e) = thread.join() {
+                error!("Error joining thread: {:?}", e);
+            }
+        }
    }
 }

--- a/virtio-devices/src/vsock/csm/connection.rs
+++ b/virtio-devices/src/vsock/csm/connection.rs
@@ -853,7 +853,7 @@ mod tests {
                    assert_eq!(pkt.op(), uapi::VSOCK_OP_RESPONSE);
                    conn
                }
-                other => panic!("invalid ctx state: {:?}", other),
+                other => panic!("invalid ctx state: {other:?}"),
            };
            assert_eq!(conn.state, conn_state);
            Self {
@@ -971,7 +971,7 @@ mod tests {
        // There's no more data in the stream, so `recv_pkt` should yield `VsockError::NoData`.
        match ctx.conn.recv_pkt(&mut ctx.pkt) {
            Err(VsockError::NoData) => (),
-            other => panic!("{:?}", other),
+            other => panic!("{other:?}"),
        }

        // A recv attempt in an invalid state should yield an instant reset packet.
--- a/virtio-devices/src/vsock/csm/txbuf.rs
+++ b/virtio-devices/src/vsock/csm/txbuf.rs
@@ -234,7 +234,7 @@ mod tests {
        txbuf.push(tmp.as_slice()).unwrap();
        match txbuf.push(&[1, 2]) {
            Err(Error::TxBufFull) => (),
-            other => panic!("Unexpected result: {:?}", other),
+            other => panic!("Unexpected result: {other:?}"),
        }
    }

@@ -267,7 +267,7 @@ mod tests {
        sink.set_err(io_err);
        match txbuf.flush_to(&mut sink) {
            Err(Error::TxBufFlush(ref err)) if err.kind() == ErrorKind::PermissionDenied => (),
-            other => panic!("Unexpected result: {:?}", other),
+            other => panic!("Unexpected result: {other:?}"),
        }
    }
 }
--- a/virtio-devices/src/vsock/device.rs
+++ b/virtio-devices/src/vsock/device.rs
@@ -396,6 +396,7 @@ where
            // Ignore the result because there is nothing we can do about it.
            let _ = kill_evt.write(1);
        }
+        self.common.wait_for_epoll_threads();
    }
 }

@@ -597,7 +598,7 @@ mod tests {
                .activate(memory.clone(), Arc::new(NoopVirtioInterrupt {}), Vec::new());
        match bad_activate {
            Err(ActivateError::BadActivate) => (),
-            other => panic!("{:?}", other),
+            other => panic!("{other:?}"),
        }

        // Test a correct activation.
--- a/virtio-devices/src/vsock/unix/muxer.rs
+++ b/virtio-devices/src/vsock/unix/muxer.rs
@@ -851,7 +851,7 @@ mod tests {
                None,
            )
            .unwrap();
-            let uds_path = format!("test_vsock_{}.sock", name);
+            let uds_path = format!("test_vsock_{name}.sock");
            let muxer = VsockMuxer::new(PEER_CID, uds_path).unwrap();

            Self {
@@ -931,7 +931,7 @@ mod tests {
            let (local_lsn_count, _) = self.count_epoll_listeners();
            assert_eq!(local_lsn_count, init_local_lsn_count + 1);

-            let buf = format!("CONNECT {}\n", peer_port);
+            let buf = format!("CONNECT {peer_port}\n");
            stream.write_all(buf.as_bytes()).unwrap();
            // The muxer would now get notified that data is available for reading from the locally
            // initiated connection.
@@ -965,7 +965,7 @@ mod tests {

            let mut buf = vec![0u8; 32];
            let len = stream.read(&mut buf[..]).unwrap();
-            assert_eq!(&buf[..len], format!("OK {}\n", local_port).as_bytes());
+            assert_eq!(&buf[..len], format!("OK {local_port}\n").as_bytes());

            (stream, local_port)
        }
--- a/virtio-devices/src/watchdog.rs
+++ b/virtio-devices/src/watchdog.rs
@@ -276,6 +276,7 @@ impl Drop for Watchdog {
            // Ignore the result because there is nothing we can do about it.
            let _ = kill_evt.write(1);
        }
+        self.common.wait_for_epoll_threads();
    }
 }

--- a/vm-allocator/Cargo.toml
+++ b/vm-allocator/Cargo.toml
@@ -5,8 +5,8 @@ authors = ["The Chromium OS Authors"]
 edition = "2021"

 [dependencies]
-libc = "0.2.137"
-vm-memory = "0.9.0"
+libc = "0.2.138"
+vm-memory = "0.10.0"

 [target.'cfg(target_arch = "aarch64")'.dependencies]
 arch = { path = "../arch" }
--- a/vm-device/Cargo.toml
+++ b/vm-device/Cargo.toml
@@ -13,8 +13,8 @@ mshv = ["vfio-ioctls/mshv"]
 anyhow = "1.0.66"
 hypervisor = { path = "../hypervisor" }
 thiserror = "1.0.37"
-serde = { version = "1.0.147", features = ["rc", "derive"] }
+serde = { version = "1.0.150", features = ["rc", "derive"] }
 vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false }
-vm-memory = { version = "0.9.0", features = ["backend-mmap"] }
-vmm-sys-util = "0.10.0"
+vm-memory = { version = "0.10.0", features = ["backend-mmap"] }
+vmm-sys-util = "0.11.0"

--- a/vm-device/src/bus.rs
+++ b/vm-device/src/bus.rs
@@ -40,7 +40,7 @@ pub type Result<T> = result::Result<T, Error>;

 impl fmt::Display for Error {
    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "bus_error: {:?}", self)
+        write!(f, "bus_error: {self:?}")
    }
 }

@@ -275,7 +275,7 @@ mod tests {

        let result = bus.insert(dummy.clone(), 0x0f, 0x10);
        assert!(result.is_err());
-        assert_eq!(format!("{:?}", result), "Err(Overlap)");
+        assert_eq!(format!("{result:?}"), "Err(Overlap)");

        assert!(bus.insert(dummy.clone(), 0x10, 0x10).is_err());
        assert!(bus.insert(dummy.clone(), 0x10, 0x15).is_err());
--- a/vm-device/src/dma_mapping/vfio.rs
+++ b/vm-device/src/dma_mapping/vfio.rs
@@ -37,9 +37,8 @@ impl<M: GuestAddressSpace + Sync + Send> ExternalDmaMapping for VfioDmaMapping<M
            return Err(io::Error::new(
                io::ErrorKind::Other,
                format!(
-                    "failed to convert guest address 0x{:x} into \
-                     host user virtual address",
-                    gpa
+                    "failed to convert guest address 0x{gpa:x} into \
+                     host user virtual address"
                ),
            ));
        };
@@ -51,8 +50,7 @@ impl<M: GuestAddressSpace + Sync + Send> ExternalDmaMapping for VfioDmaMapping<M
                    io::ErrorKind::Other,
                    format!(
                        "failed to map memory for VFIO container, \
-                         iova 0x{:x}, gpa 0x{:x}, size 0x{:x}: {:?}",
-                        iova, gpa, size, e
+                         iova 0x{iova:x}, gpa 0x{gpa:x}, size 0x{size:x}: {e:?}"
                    ),
                )
            })
@@ -64,8 +62,7 @@ impl<M: GuestAddressSpace + Sync + Send> ExternalDmaMapping for VfioDmaMapping<M
                io::ErrorKind::Other,
                format!(
                    "failed to unmap memory for VFIO container, \
-                     iova 0x{:x}, size 0x{:x}: {:?}",
-                    iova, size, e
+                     iova 0x{iova:x}, size 0x{size:x}: {e:?}"
                ),
            )
        })
--- a/vm-migration/Cargo.toml
+++ b/vm-migration/Cargo.toml
@@ -7,8 +7,8 @@ edition = "2021"
 [dependencies]
 anyhow = "1.0.66"
 thiserror = "1.0.37"
-serde = { version = "1.0.147", features = ["rc", "derive"] }
-serde_json = "1.0.87"
-versionize = "0.1.6"
+serde = { version = "1.0.150", features = ["rc", "derive"] }
+serde_json = "1.0.89"
+versionize = "0.1.9"
 versionize_derive = "0.1.4"
-vm-memory = { version = "0.9.0", features = ["backend-mmap", "backend-atomic"] }
+vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic"] }
--- a/vm-migration/src/lib.rs
+++ b/vm-migration/src/lib.rs
@@ -13,7 +13,7 @@ pub mod protocol;

 /// Global VMM version for versioning
 const MAJOR_VERSION: u16 = 28;
-const MINOR_VERSION: u16 = 0;
+const MINOR_VERSION: u16 = 2;
 const VMM_VERSION: u16 = MAJOR_VERSION << 12 | MINOR_VERSION & 0b1111;

 pub trait VersionMapped {
@@ -121,7 +121,7 @@ impl SnapshotDataSection {
            .map_err(|e| MigratableError::Snapshot(anyhow!("Error serialising: {} {}", id, e)))?;

        let snapshot_data = SnapshotDataSection {
-            id: format!("{}-section", id),
+            id: format!("{id}-section"),
            snapshot,
        };

@@ -139,7 +139,7 @@ impl SnapshotDataSection {
            .map_err(|e| MigratableError::Snapshot(anyhow!("Error serialising: {} {}", id, e)))?;

        let snapshot_data = SnapshotDataSection {
-            id: format!("{}-section", id),
+            id: format!("{id}-section"),
            snapshot,
        };

@@ -219,7 +219,7 @@ impl Snapshot {
        T: Deserialize<'a>,
    {
        self.snapshot_data
-            .get(&format!("{}-section", id))
+            .get(&format!("{id}-section"))
            .ok_or_else(|| MigratableError::Restore(anyhow!("Missing section for {}", id)))?
            .to_state()
    }
@@ -230,7 +230,7 @@ impl Snapshot {
        T: Versionize + VersionMapped,
    {
        self.snapshot_data
-            .get(&format!("{}-section", id))
+            .get(&format!("{id}-section"))
            .ok_or_else(|| MigratableError::Restore(anyhow!("Missing section for {}", id)))?
            .to_versioned_state()
    }
--- a/vm-virtio/Cargo.toml
+++ b/vm-virtio/Cargo.toml
@@ -9,5 +9,5 @@ default = []

 [dependencies]
 log = "0.4.17"
-virtio-queue = "0.6.1"
-vm-memory = { version = "0.9.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
+virtio-queue = "0.7.0"
+vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
--- a/vm-virtio/src/lib.rs
+++ b/vm-virtio/src/lib.rs
@@ -87,7 +87,7 @@ impl fmt::Display for VirtioDeviceType {
            VirtioDeviceType::Watchdog => "watchdog",
            VirtioDeviceType::Unknown => "UNKNOWN",
        };
-        write!(f, "{}", output)
+        write!(f, "{output}")
    }
 }

--- a/vmm/Cargo.toml
+++ b/vmm/Cargo.toml
@@ -19,15 +19,15 @@ arc-swap = "1.5.1"
 arch = { path = "../arch" }
 bitflags = "1.3.2"
 block_util = { path = "../block_util" }
-clap = "4.0.18"
+clap = "4.0.29"
 devices = { path = "../devices" }
 epoll = "4.3.1"
 event_monitor = { path = "../event_monitor" }
 gdbstub = { version = "0.6.3", optional = true }
 gdbstub_arch = { version = "0.2.4", optional = true }
 hypervisor = { path = "../hypervisor" }
-libc = "0.2.137"
-linux-loader = { version = "0.7.0", features = ["elf", "bzimage", "pe"] }
+libc = "0.2.138"
+linux-loader = { version = "0.8.1", features = ["elf", "bzimage", "pe"] }
 log = "0.4.17"
 micro_http = { git = "https://github.com/firecracker-microvm/micro-http", branch = "main" }
 net_util = { path = "../net_util" }
@@ -36,23 +36,23 @@ option_parser = { path = "../option_parser" }
 pci = { path = "../pci" }
 qcow = { path = "../qcow" }
 seccompiler = "0.3.0"
-serde = { version = "1.0.147", features = ["rc", "derive"] }
-serde_json = "1.0.87"
+serde = { version = "1.0.150", features = ["rc", "derive"] }
+serde_json = "1.0.89"
 serial_buffer = { path = "../serial_buffer" }
 signal-hook = "0.3.14"
 thiserror = "1.0.37"
 tracer = { path = "../tracer" }
-uuid = "1.2.1"
-versionize = "0.1.6"
+uuid = "1.2.2"
+versionize = "0.1.9"
 versionize_derive = "0.1.4"
 vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false }
 vfio_user = { path = "../vfio_user" }
 vhdx = { path = "../vhdx" }
 virtio-devices = { path = "../virtio-devices" }
-virtio-queue = "0.6.1"
+virtio-queue = "0.7.0"
 vm-allocator = { path = "../vm-allocator" }
 vm-device = { path = "../vm-device" }
-vm-memory = { version = "0.9.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
+vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
 vm-migration = { path = "../vm-migration" }
 vm-virtio = { path = "../vm-virtio" }
-vmm-sys-util = { version = "0.10.0", features = ["with-serde"] }
+vmm-sys-util = { version = "0.11.0", features = ["with-serde"] }
--- a/vmm/src/api/http.rs
+++ b/vmm/src/api/http.rs
@@ -52,7 +52,7 @@ const HTTP_ROOT: &str = "/api/v1";

 pub fn error_response(error: HttpError, status: StatusCode) -> Response {
    let mut response = Response::new(Version::Http11, status);
-    response.set_body(Body::new(format!("{:?}", error)));
+    response.set_body(Body::new(format!("{error:?}")));

    response
 }
@@ -342,8 +342,10 @@ pub fn start_http_path_thread(
 ) -> Result<thread::JoinHandle<Result<()>>> {
    let socket_path = PathBuf::from(path);
    let socket_fd = UnixListener::bind(socket_path).map_err(VmmError::CreateApiServerSocket)?;
-    let server =
-        HttpServer::new_from_fd(socket_fd.into_raw_fd()).map_err(VmmError::CreateApiServer)?;
+    // SAFETY: Valid FD just opened
+    let server = unsafe {
+        HttpServer::new_from_fd(socket_fd.into_raw_fd()).map_err(VmmError::CreateApiServer)?
+    };
    start_http_thread(
        server,
        api_notifier,
@@ -362,7 +364,8 @@ pub fn start_http_fd_thread(
    exit_evt: EventFd,
    hypervisor_type: HypervisorType,
 ) -> Result<thread::JoinHandle<Result<()>>> {
-    let server = HttpServer::new_from_fd(fd).map_err(VmmError::CreateApiServer)?;
+    // SAFETY: Valid FD
+    let server = unsafe { HttpServer::new_from_fd(fd).map_err(VmmError::CreateApiServer)? };
    start_http_thread(
        server,
        api_notifier,
--- a/vmm/src/config.rs
+++ b/vmm/src/config.rs
@@ -209,7 +209,7 @@ impl fmt::Display for ValidationError {
                write!(f, "Huge page size specified but huge pages not enabled")
            }
            InvalidHugePageSize(s) => {
-                write!(f, "Huge page size is not power of 2: {}", s)
+                write!(f, "Huge page size is not power of 2: {s}")
            }
            #[cfg(feature = "tdx")]
            TdxNoCpuHotplug => {
@@ -231,56 +231,50 @@ impl fmt::Display for ValidationError {
            MemoryZoneReused(s, u1, u2) => {
                write!(
                    f,
-                    "Memory zone: {} belongs to multiple NUMA nodes {} and {}",
-                    s, u1, u2
+                    "Memory zone: {s} belongs to multiple NUMA nodes {u1} and {u2}"
                )
            }
            InvalidNumPciSegments(n) => {
                write!(
                    f,
-                    "Number of PCI segments ({}) not in range of 1 to {}",
-                    n, MAX_NUM_PCI_SEGMENTS
+                    "Number of PCI segments ({n}) not in range of 1 to {MAX_NUM_PCI_SEGMENTS}"
                )
            }
            InvalidPciSegment(pci_segment) => {
-                write!(f, "Invalid PCI segment id: {}", pci_segment)
+                write!(f, "Invalid PCI segment id: {pci_segment}")
            }
            BalloonLargerThanRam(balloon_size, ram_size) => {
                write!(
                    f,
-                    "Ballon size ({}) greater than RAM ({})",
-                    balloon_size, ram_size
+                    "Ballon size ({balloon_size}) greater than RAM ({ram_size})"
                )
            }
            OnIommuSegment(pci_segment) => {
                write!(
                    f,
-                    "Device is on an IOMMU PCI segment ({}) but not placed behind IOMMU",
-                    pci_segment
+                    "Device is on an IOMMU PCI segment ({pci_segment}) but not placed behind IOMMU"
                )
            }
            IommuNotSupportedOnSegment(pci_segment) => {
                write!(
                    f,
-                    "Device is on an IOMMU PCI segment ({}) but does not support being placed behind IOMMU",
-                    pci_segment
+                    "Device is on an IOMMU PCI segment ({pci_segment}) but does not support being placed behind IOMMU"
                )
            }
            IdentifierNotUnique(s) => {
-                write!(f, "Identifier {} is not unique", s)
+                write!(f, "Identifier {s} is not unique")
            }
            InvalidIdentifier(s) => {
-                write!(f, "Identifier {} is invalid", s)
+                write!(f, "Identifier {s} is invalid")
            }
            IommuNotSupported => {
                write!(f, "Device does not support being placed behind IOMMU")
            }
-            DuplicateDevicePath(p) => write!(f, "Duplicated device path: {}", p),
+            DuplicateDevicePath(p) => write!(f, "Duplicated device path: {p}"),
            &InvalidMtu(mtu) => {
                write!(
                    f,
-                    "Provided MTU {} is lower than 1280 (expected by VIRTIO specification)",
-                    mtu
+                    "Provided MTU {mtu} is lower than 1280 (expected by VIRTIO specification)"
                )
            }
        }
@@ -291,51 +285,51 @@ impl fmt::Display for Error {
    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
        use self::Error::*;
        match self {
-            ParseConsole(o) => write!(f, "Error parsing --console: {}", o),
+            ParseConsole(o) => write!(f, "Error parsing --console: {o}"),
            ParseConsoleInvalidModeGiven => {
                write!(f, "Error parsing --console: invalid console mode given")
            }
-            ParseCpus(o) => write!(f, "Error parsing --cpus: {}", o),
-            InvalidCpuFeatures(o) => write!(f, "Invalid feature in --cpus features list: {}", o),
-            ParseDevice(o) => write!(f, "Error parsing --device: {}", o),
+            ParseCpus(o) => write!(f, "Error parsing --cpus: {o}"),
+            InvalidCpuFeatures(o) => write!(f, "Invalid feature in --cpus features list: {o}"),
+            ParseDevice(o) => write!(f, "Error parsing --device: {o}"),
            ParseDevicePathMissing => write!(f, "Error parsing --device: path missing"),
-            ParseFileSystem(o) => write!(f, "Error parsing --fs: {}", o),
+            ParseFileSystem(o) => write!(f, "Error parsing --fs: {o}"),
            ParseFsSockMissing => write!(f, "Error parsing --fs: socket missing"),
            ParseFsTagMissing => write!(f, "Error parsing --fs: tag missing"),
-            ParsePersistentMemory(o) => write!(f, "Error parsing --pmem: {}", o),
+            ParsePersistentMemory(o) => write!(f, "Error parsing --pmem: {o}"),
            ParsePmemFileMissing => write!(f, "Error parsing --pmem: file missing"),
-            ParseVsock(o) => write!(f, "Error parsing --vsock: {}", o),
+            ParseVsock(o) => write!(f, "Error parsing --vsock: {o}"),
            ParseVsockCidMissing => write!(f, "Error parsing --vsock: cid missing"),
            ParseVsockSockMissing => write!(f, "Error parsing --vsock: socket missing"),
-            ParseMemory(o) => write!(f, "Error parsing --memory: {}", o),
-            ParseMemoryZone(o) => write!(f, "Error parsing --memory-zone: {}", o),
+            ParseMemory(o) => write!(f, "Error parsing --memory: {o}"),
+            ParseMemoryZone(o) => write!(f, "Error parsing --memory-zone: {o}"),
            ParseMemoryZoneIdMissing => write!(f, "Error parsing --memory-zone: id missing"),
-            ParseNetwork(o) => write!(f, "Error parsing --net: {}", o),
-            ParseDisk(o) => write!(f, "Error parsing --disk: {}", o),
-            ParseRng(o) => write!(f, "Error parsing --rng: {}", o),
-            ParseBalloon(o) => write!(f, "Error parsing --balloon: {}", o),
-            ParseRestore(o) => write!(f, "Error parsing --restore: {}", o),
+            ParseNetwork(o) => write!(f, "Error parsing --net: {o}"),
+            ParseDisk(o) => write!(f, "Error parsing --disk: {o}"),
+            ParseRng(o) => write!(f, "Error parsing --rng: {o}"),
+            ParseBalloon(o) => write!(f, "Error parsing --balloon: {o}"),
+            ParseRestore(o) => write!(f, "Error parsing --restore: {o}"),
            #[cfg(target_arch = "x86_64")]
-            ParseSgxEpc(o) => write!(f, "Error parsing --sgx-epc: {}", o),
+            ParseSgxEpc(o) => write!(f, "Error parsing --sgx-epc: {o}"),
            #[cfg(target_arch = "x86_64")]
            ParseSgxEpcIdMissing => write!(f, "Error parsing --sgx-epc: id missing"),
-            ParseNuma(o) => write!(f, "Error parsing --numa: {}", o),
+            ParseNuma(o) => write!(f, "Error parsing --numa: {o}"),
            ParseRestoreSourceUrlMissing => {
                write!(f, "Error parsing --restore: source_url missing")
            }
            ParseUserDeviceSocketMissing => {
                write!(f, "Error parsing --user-device: socket missing")
            }
-            ParseUserDevice(o) => write!(f, "Error parsing --user-device: {}", o),
-            Validation(v) => write!(f, "Error validating configuration: {}", v),
+            ParseUserDevice(o) => write!(f, "Error parsing --user-device: {o}"),
+            Validation(v) => write!(f, "Error validating configuration: {v}"),
            #[cfg(feature = "tdx")]
-            ParseTdx(o) => write!(f, "Error parsing --tdx: {}", o),
+            ParseTdx(o) => write!(f, "Error parsing --tdx: {o}"),
            #[cfg(feature = "tdx")]
            FirmwarePathMissing => write!(f, "TDX firmware missing"),
-            ParsePlatform(o) => write!(f, "Error parsing --platform: {}", o),
-            ParseVdpa(o) => write!(f, "Error parsing --vdpa: {}", o),
+            ParsePlatform(o) => write!(f, "Error parsing --platform: {o}"),
+            ParseVdpa(o) => write!(f, "Error parsing --vdpa: {o}"),
            ParseVdpaPathMissing => write!(f, "Error parsing --vdpa: path missing"),
-            ParseTpm(o) => write!(f, "Error parsing --tpm: {}", o),
+            ParseTpm(o) => write!(f, "Error parsing --tpm: {o}"),
            ParseTpmPathMissing => write!(f, "Error parsing --tpm: path missing"),
        }
    }
--- a/vmm/src/cpu.rs
+++ b/vmm/src/cpu.rs
@@ -837,6 +837,8 @@ impl CpuManager {
    ) -> Result<()> {
        let reset_evt = self.reset_evt.try_clone().unwrap();
        let exit_evt = self.exit_evt.try_clone().unwrap();
+        #[cfg(feature = "kvm")]
+        let hypervisor_type = self.hypervisor_type;
        #[cfg(feature = "guest_debug")]
        let vm_debug_evt = self.vm_debug_evt.try_clone().unwrap();
        let panic_exit_evt = self.exit_evt.try_clone().unwrap();
@@ -871,7 +873,7 @@ impl CpuManager {

        let handle = Some(
            thread::Builder::new()
-                .name(format!("vcpu{}", vcpu_id))
+                .name(format!("vcpu{vcpu_id}"))
                .spawn(move || {
                    // Schedule the thread to run on the expected CPU set
                    if let Some(cpuset) = cpuset.as_ref() {
@@ -941,12 +943,14 @@ impl CpuManager {

                                #[cfg(feature = "kvm")]
                                {
-                                    vcpu.lock().as_ref().unwrap().vcpu.set_immediate_exit(true);
-                                    if !matches!(vcpu.lock().unwrap().run(), Ok(VmExit::Ignore)) {
-                                        error!("Unexpected VM exit on \"immediate_exit\" run");
-                                        break;
+                                    if matches!(hypervisor_type, HypervisorType::Kvm) {
+                                        vcpu.lock().as_ref().unwrap().vcpu.set_immediate_exit(true);
+                                        if !matches!(vcpu.lock().unwrap().run(), Ok(VmExit::Ignore)) {
+                                            error!("Unexpected VM exit on \"immediate_exit\" run");
+                                            break;
+                                        }
+                                        vcpu.lock().as_ref().unwrap().vcpu.set_immediate_exit(false);
                                    }
-                                    vcpu.lock().as_ref().unwrap().vcpu.set_immediate_exit(false);
                                }

                                vcpu_run_interrupted.store(true, Ordering::SeqCst);
@@ -1594,8 +1598,7 @@ impl CpuManager {
            6 => 52,
            _ => {
                return Err(Error::TranslateVirtualAddress(anyhow!(format!(
-                    "PA range not supported {}",
-                    pa_range
+                    "PA range not supported {pa_range}"
                ))))
            }
        };
--- a/vmm/src/device_manager.rs
+++ b/vmm/src/device_manager.rs
@@ -525,7 +525,7 @@ pub fn create_pty() -> io::Result<(File, File, PathBuf)> {
        return vmm_sys_util::errno::errno_result().map_err(|e| e.into());
    }

-    let proc_path = PathBuf::from(format!("/proc/self/fd/{}", sub_fd));
+    let proc_path = PathBuf::from(format!("/proc/self/fd/{sub_fd}"));
    let path = read_link(proc_path)?;

    // SAFETY: sub_fd is checked to be valid before being wrapped in File
@@ -673,15 +673,14 @@ impl DeviceRelocation for AddressManager {
                    return Err(io::Error::new(
                        io::ErrorKind::Other,
                        format!(
-                            "Couldn't find a resource with base 0x{:x} for device {}",
-                            old_base, id
+                            "Couldn't find a resource with base 0x{old_base:x} for device {id}"
                        ),
                    ));
                }
            } else {
                return Err(io::Error::new(
                    io::ErrorKind::Other,
-                    format!("Couldn't find device {} from device tree", id),
+                    format!("Couldn't find device {id} from device tree"),
                ));
            }
        }
@@ -695,7 +694,7 @@ impl DeviceRelocation for AddressManager {
                    self.vm.unregister_ioevent(event, &io_addr).map_err(|e| {
                        io::Error::new(
                            io::ErrorKind::Other,
-                            format!("failed to unregister ioevent: {:?}", e),
+                            format!("failed to unregister ioevent: {e:?}"),
                        )
                    })?;
                }
@@ -706,7 +705,7 @@ impl DeviceRelocation for AddressManager {
                        .map_err(|e| {
                            io::Error::new(
                                io::ErrorKind::Other,
-                                format!("failed to register ioevent: {:?}", e),
+                                format!("failed to register ioevent: {e:?}"),
                            )
                        })?;
                }
@@ -727,7 +726,7 @@ impl DeviceRelocation for AddressManager {
                        self.vm.remove_user_memory_region(mem_region).map_err(|e| {
                            io::Error::new(
                                io::ErrorKind::Other,
-                                format!("failed to remove user memory region: {:?}", e),
+                                format!("failed to remove user memory region: {e:?}"),
                            )
                        })?;

@@ -744,7 +743,7 @@ impl DeviceRelocation for AddressManager {
                        self.vm.create_user_memory_region(mem_region).map_err(|e| {
                            io::Error::new(
                                io::ErrorKind::Other,
-                                format!("failed to create user memory regions: {:?}", e),
+                                format!("failed to create user memory regions: {e:?}"),
                            )
                        })?;

@@ -753,7 +752,7 @@ impl DeviceRelocation for AddressManager {
                        virtio_dev.set_shm_regions(shm_regions).map_err(|e| {
                            io::Error::new(
                                io::ErrorKind::Other,
-                                format!("failed to update shared memory regions: {:?}", e),
+                                format!("failed to update shared memory regions: {e:?}"),
                            )
                        })?;
                    }
@@ -3385,7 +3384,7 @@ impl DeviceManager {
        pci_segment_id: u16,
        dma_handler: Option<Arc<dyn ExternalDmaMapping>>,
    ) -> DeviceManagerResult<PciBdf> {
-        let id = format!("{}-{}", VIRTIO_PCI_DEVICE_NAME_PREFIX, virtio_device_id);
+        let id = format!("{VIRTIO_PCI_DEVICE_NAME_PREFIX}-{virtio_device_id}");

        // Add the new virtio-pci node to the device tree.
        let mut node = device_node!(id);
@@ -4229,7 +4228,7 @@ impl Aml for DeviceManager {
        let mut pci_scan_methods = Vec::new();
        for i in 0..self.pci_segments.len() {
            pci_scan_methods.push(aml::MethodCall::new(
-                format!("\\_SB_.PCI{:X}.PCNT", i).as_str().into(),
+                format!("\\_SB_.PCI{i:X}.PCNT").as_str().into(),
                vec![],
            ));
        }
--- a/vmm/src/gdb.rs
+++ b/vmm/src/gdb.rs
@@ -291,8 +291,8 @@ impl MultiThreadBase for GdbStub {
                });
                Ok(())
            }
-            Ok(s) => Err(format!("Unexpected response for ActiveVcpus: {:?}", s)),
-            Err(e) => Err(format!("Failed to request ActiveVcpus: {:?}", e)),
+            Ok(s) => Err(format!("Unexpected response for ActiveVcpus: {s:?}")),
+            Err(e) => Err(format!("Failed to request ActiveVcpus: {e:?}")),
        }
    }

@@ -306,7 +306,7 @@ impl MultiThreadResume for GdbStub {
    fn resume(&mut self) -> Result<(), Self::Error> {
        match self.vm_request(GdbRequestPayload::Resume, 0) {
            Ok(_) => Ok(()),
-            Err(e) => Err(format!("Failed to resume the target: {:?}", e)),
+            Err(e) => Err(format!("Failed to resume the target: {e:?}")),
        }
    }

@@ -317,7 +317,7 @@ impl MultiThreadResume for GdbStub {
                    self.single_step = false;
                }
                Err(e) => {
-                    return Err(format!("Failed to request SetSingleStep: {:?}", e));
+                    return Err(format!("Failed to request SetSingleStep: {e:?}"));
                }
            }
        }
@@ -334,7 +334,7 @@ impl MultiThreadResume for GdbStub {
        }
        match self.vm_request(GdbRequestPayload::Resume, tid_to_cpuid(tid)) {
            Ok(_) => Ok(()),
-            Err(e) => Err(format!("Failed to resume the target: {:?}", e)),
+            Err(e) => Err(format!("Failed to resume the target: {e:?}")),
        }
    }

@@ -360,13 +360,13 @@ impl MultiThreadSingleStep for GdbStub {
                    self.single_step = true;
                }
                Err(e) => {
-                    return Err(format!("Failed to request SetSingleStep: {:?}", e));
+                    return Err(format!("Failed to request SetSingleStep: {e:?}"));
                }
            }
        }
        match self.vm_request(GdbRequestPayload::Resume, tid_to_cpuid(tid)) {
            Ok(_) => Ok(()),
-            Err(e) => Err(format!("Failed to resume the target: {:?}", e)),
+            Err(e) => Err(format!("Failed to resume the target: {e:?}")),
        }
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bo Chen	3b0d2e796b	build: Release v28.2 (bug fix release) Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-01-25 08:44:46 -08:00
Rob Bradford	42357c01f3	.github: Don't try and create releases for created branches Dependabot will create a branch on the repo for it's updates this triggers the release action (because it's the same event as a tag) which will then fail leading to dependabot PRs not being automerged. Instead only run the release check test on PRs or tag creation. Signed-off-by: Rob Bradford <robert.bradford@intel.com> (cherry picked from commit `f6c058da56`)	2023-01-24 06:04:01 -08:00
Rob Bradford	b7b5b9d7e6	.github: Re-order release steps to ensure binaries are available Since we run "cargo clean" before running the aarch64 build we need to create the release and upload the x86-64 assets before the clean. Signed-off-by: Rob Bradford <robert.bradford@intel.com> (cherry picked from commit `6e9172bf6f`) Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-01-24 06:04:01 -08:00
Rob Bradford	a63e064004	.github: Clean source tree before cross building release assets This address issues with leaking symbols into the cross build. Signed-off-by: Rob Bradford <robert.bradford@intel.com> (cherry picked from commit `547230bb77`) Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-01-24 06:04:01 -08:00
Rob Bradford	62c1f39ea2	.github: Run release style builds on all PRs Adjust the release workflow to move the conditional check on the tag creation into the steps that create the release/upload the assets. This allows us to ensure we're always in a releaseable state. Signed-off-by: Rob Bradford <robert.bradford@intel.com> (cherry picked from commit `ef7e177df2`) Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-01-24 06:04:01 -08:00
Bo Chen	460ba718d4	github,Cargo.toml: Strip release binaries using toolchain From Rust 1.59, the cargo command is now able to strip a binary [1]. This can be enabled in Cargo.toml by adding a `strip = "true"` to the `[profile.release]` section. Adding such binary stripping support in Cargo.toml of the project, also change the stripping process in the release workflow to the one using toolchain, so that the AArch64 release binaries can also be stripped. Fixes: https://github.com/cloud-hypervisor/cloud-hypervisor/issues/4916 [1] https://doc.rust-lang.org/beta/cargo/reference/profiles.html#strip Signed-off-by: Henry Wang <Henry.Wang@arm.com> (cherry picked from commit `1ff0191b30`) Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-01-24 06:04:01 -08:00
Bo Chen	c91a8e1324	misc: Automatically fix cargo clippy issues added in 1.65 (stable) The code of the stable branch diverges from the main branch, so we can't directly backport the corresponding commit to fix the clippy issues. See: commit `5e52729453` Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-01-19 09:12:38 -08:00
Philipp Schuster	1adfb7e9f8	virtio-devices: properly join all threads on Drop This change is important to do a proper resource cleanup. We decided to do this repetitive approach as VirtioCommon can't implement Drop without major changes to the corresponding code. Also, devices such as Net can't easily use the epoll_threads-abstraction from VirtioCommon as it has multiple threads with different semantics. Signed-off-by: Philipp Schuster <philipp.schuster@cyberus-technology.de> (cherry picked from commit `ad6c0ee52b`)	2023-01-19 09:12:38 -08:00
Muminul Islam	8dd4d42053	vmm: Ensure PIO/MMIO exits complete before pausing only for KVM MSHV does not require to ensure MMIO/PIO exits complete before pausing. This patch makes sure the above requirement by checking the hypervisor type run-time. Fixes #5037 Signed-off-by: Muminul Islam <muislam@microsoft.com> (cherry picked from commit `4e3bc20f2c`)	2023-01-19 09:12:38 -08:00
Sebastien Boeuf	3834b43878	qcow: Fix number of refcount table entries The number of entries in the refcount table was incorrectly calculated given there was no need for dividing the number of refblock clusters. The number of refblock clusters is the number of entries in the refcount table. Suggested-by: lv_mz <lv.mengzhao@zte.com.cn> Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com> (cherry picked from commit `0e7d5d2761`)	2023-01-19 09:12:38 -08:00
Bo Chen	52605cc0e4	build: Release v28.1 (bug fix release) Signed-off-by: Bo Chen <chen.bo@intel.com>	2022-12-13 13:02:57 -08:00
Rob Bradford	92beda1e32	README: Use consistent path to cloud-hypervisor binary Signed-off-by: Rob Bradford <robert.bradford@intel.com> (cherry picked from commit `00becda899`) Signed-off-by: Rob Bradford <robert.bradford@intel.com>	2022-12-13 15:12:40 +00:00
Bo Chen	167fef382a	net_util: queue_pair: Avoid integer overflow This integer overflow was triggered with fuzzing on the virtio-net device. The integer overflow is from the wrong assumption that the packets read from or written to the tap device is always larger than the size of a virtio-net header. Signed-off-by: Bo Chen <chen.bo@intel.com> (cherry picked from commit `559faa272a`) Signed-off-by: Rob Bradford <robert.bradford@intel.com>	2022-12-13 15:12:40 +00:00
Yuji Hagiwara	5126e9b26e	docs: Fix a typo on the doc for tpm swtpm accepts --tpmstate option Signed-off-by: Yuji Hagiwara <yuuzi41@gmail.com> (cherry picked from commit `47a7ebe434`) Signed-off-by: Rob Bradford <robert.bradford@intel.com>	2022-12-13 15:12:40 +00:00
Bo Chen	59bd682b1f	net_util: queue_pair: Avoid panic and handle error properly This panic was triggered with fuzzing on the virtio-net device. This commits handles the error explicitly to avoid the panic, which also makes the fuzzer happy (as panic is treated as bugs). Signed-off-by: Bo Chen <chen.bo@intel.com> (cherry picked from commit `4d9a2b17a7`) Signed-off-by: Rob Bradford <robert.bradford@intel.com>	2022-12-13 15:12:40 +00:00
Rob Bradford	8e3b351038	arch: x86_64: Use host cpuid information for L2 cache for older KVM If the KVM version is too old (pre Linux 5.7) then fetch the CPUID information from the host and use that in the guest. We prefer the KVM version over the host version as that would use the CPUID for the running CPU vs the CPU that runs this code which might be different due to a hybrid topology. Fixes: #4918 Signed-off-by: Rob Bradford <robert.bradford@intel.com> (cherry picked from commit `7c3110e6d5`) Signed-off-by: Rob Bradford <robert.bradford@intel.com>	2022-12-13 15:12:40 +00:00
Rob Bradford	3f8d06b47e	build: Update dependencies in v28.x stable branch Signed-off-by: Rob Bradford <robert.bradford@intel.com>	2022-12-13 14:29:22 +00:00