build: Release v31.2 (bug fix release)

Signed-off-by: Bo Chen <chen.bo@intel.com>
misc: Address clippy beta issues
2026-08-05 02:19:16 +00:00 · 2023-07-06 14:55:05 -07:00 · 2023-07-05 09:36:08 -07:00 · 2023-07-05 09:36:08 -07:00 · 2023-07-05 09:36:08 -07:00 · 2023-07-05 09:36:08 -07:00
52 changed files with 339 additions and 486 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,7 +5,7 @@ version = 3
 [[package]]
 name = "acpi_tables"
 version = "0.1.0"
-source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#98dcb0309d362dd83f6ffcac4f66914a2fbd5a73"
+source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#0b892e2c2053c4ecfac8d9e5a52babae75114702"
 dependencies = [
 "zerocopy",
 ]
@@ -36,9 +36,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.70"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
+checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"

 [[package]]
 name = "api_client"
@@ -179,7 +179,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "cloud-hypervisor"
-version = "32.1.0"
+version = "31.2.0"
 dependencies = [
 "anyhow",
 "api_client",
@@ -297,22 +297,22 @@ dependencies = [

 [[package]]
 name = "dirs"
-version = "5.0.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd"
+checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
 dependencies = [
 "dirs-sys",
 ]

 [[package]]
 name = "dirs-sys"
-version = "0.4.0"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b"
+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
 dependencies = [
 "libc",
 "redox_users",
- "windows-sys 0.45.0",
+ "winapi",
 ]

 [[package]]
@@ -340,13 +340,13 @@ dependencies = [

 [[package]]
 name = "errno"
-version = "0.3.1"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
 dependencies = [
 "errno-dragonfly",
 "libc",
- "windows-sys 0.48.0",
+ "winapi",
 ]

 [[package]]
@@ -487,13 +487,12 @@ dependencies = [

 [[package]]
 name = "io-lifetimes"
-version = "1.0.10"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
+checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
 dependencies = [
- "hermit-abi",
 "libc",
- "windows-sys 0.48.0",
+ "windows-sys 0.42.0",
 ]

 [[package]]
@@ -517,14 +516,14 @@ dependencies = [

 [[package]]
 name = "is-terminal"
-version = "0.4.7"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
+checksum = "8687c819457e979cc940d09cb16e42a1bf70aa6b60a549de6d3a62a0ee90c69e"
 dependencies = [
 "hermit-abi",
 "io-lifetimes",
 "rustix",
- "windows-sys 0.48.0",
+ "windows-sys 0.45.0",
 ]

 [[package]]
@@ -602,9 +601,9 @@ dependencies = [

 [[package]]
 name = "linux-raw-sys"
-version = "0.3.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f508063cc7bb32987c71511216bd5a32be15bccb6a80b52df8b9d7f01fc3aa2"
+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"

 [[package]]
 name = "lock_api"
@@ -668,7 +667,7 @@ dependencies = [
 [[package]]
 name = "mshv-bindings"
 version = "0.1.1"
-source = "git+https://github.com/rust-vmm/mshv?branch=main#c1230f282c2836ba89ee112146bf638343424de8"
+source = "git+https://github.com/rust-vmm/mshv?branch=main#66531ba242be0b744ee2e4cd602ab0000377bdf7"
 dependencies = [
 "libc",
 "serde",
@@ -680,7 +679,7 @@ dependencies = [
 [[package]]
 name = "mshv-ioctls"
 version = "0.1.1"
-source = "git+https://github.com/rust-vmm/mshv?branch=main#c1230f282c2836ba89ee112146bf638343424de8"
+source = "git+https://github.com/rust-vmm/mshv?branch=main#66531ba242be0b744ee2e4cd602ab0000377bdf7"
 dependencies = [
 "libc",
 "mshv-bindings",
@@ -1051,9 +1050,9 @@ dependencies = [

 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"

 [[package]]
 name = "rustc-hash"
@@ -1072,9 +1071,9 @@ dependencies = [

 [[package]]
 name = "rustix"
-version = "0.37.3"
+version = "0.36.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b24138615de35e32031d041a09032ef3487a616d901ca4db224e7d557efae2"
+checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644"
 dependencies = [
 "bitflags",
 "errno",
@@ -1113,18 +1112,18 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"

 [[package]]
 name = "serde"
-version = "1.0.156"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4"
+checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.156"
+version = "1.0.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d"
+checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1133,9 +1132,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.96"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
 dependencies = [
 "itoa",
 "ryu",
@@ -1144,9 +1143,9 @@ dependencies = [

 [[package]]
 name = "serde_with"
-version = "2.3.2"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "331bb8c3bf9b92457ab7abecf07078c13f7d270ba490103e84e8b014490cd0b0"
+checksum = "85456ffac572dc8826334164f2fb6fb40a7c766aebe195a2a21ee69ee2885ecf"
 dependencies = [
 "serde",
 "serde_with_macros",
@@ -1154,9 +1153,9 @@ dependencies = [

 [[package]]
 name = "serde_with_macros"
-version = "2.3.2"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859011bddcc11f289f07f467cc1fe01c7a941daa4d8f6c40d4d1c92eb6d9319c"
+checksum = "7cbcd6104f8a4ab6af7f6be2a0da6be86b9de3c401f6e86bb856ab2af739232f"
 dependencies = [
 "darling",
 "proc-macro2",
@@ -1383,7 +1382,7 @@ dependencies = [
 [[package]]
 name = "vfio_user"
 version = "0.1.0"
-source = "git+https://github.com/rust-vmm/vfio-user?branch=main#e75c9415d973769c5fd1d07716eb92d6e5be7c48"
+source = "git+https://github.com/rust-vmm/vfio-user?branch=main#afbbd5722885e961ce12baea12efe01d52ce14b0"
 dependencies = [
 "bitflags",
 "libc",
@@ -1707,13 +1706,13 @@ version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]

 [[package]]
@@ -1722,16 +1721,7 @@ version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
 dependencies = [
- "windows-targets 0.42.2",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.0",
+ "windows-targets",
 ]

 [[package]]
@@ -1740,28 +1730,13 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]

 [[package]]
@@ -1770,84 +1745,42 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"

-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"

-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"

-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"

-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"

-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"

-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"

-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
-
 [[package]]
 name = "zerocopy"
 version = "0.6.1"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cloud-hypervisor"
-version = "32.1.0"
+version = "31.2.0"
 authors = ["The Cloud Hypervisor Authors"]
 edition = "2021"
 default-run = "cloud-hypervisor"
@@ -29,7 +29,7 @@ strip = false
 debug = true

 [dependencies]
-anyhow = "1.0.70"
+anyhow = "1.0.69"
 api_client = { path = "api_client" }
 argh = "0.1.9"
 dhat = { version = "0.3.2", optional = true }
@@ -40,7 +40,7 @@ libc = "0.2.139"
 log = { version = "0.4.17", features = ["std"] }
 option_parser = { path = "option_parser" }
 seccompiler = "0.3.0"
-serde_json = "1.0.96"
+serde_json = "1.0.95"
 signal-hook = "0.3.15"
 thiserror = "1.0.39"
 tpm = { path = "tpm"}
@@ -56,10 +56,10 @@ kvm-ioctls = { git = "https://github.com/rust-vmm/kvm-ioctls", branch = "main" }
 versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch" }

 [dev-dependencies]
-dirs = "5.0.0"
+dirs = "4.0.0"
 net_util = { path = "net_util" }
 once_cell = "1.17.1"
-serde_json = "1.0.96"
+serde_json = "1.0.95"
 test_infra = { path = "test_infra" }
 wait-timeout = "0.2.0"

--- a/92
+++ b/92
@@ -192,52 +192,52 @@ pipeline {
                        }
                    }
                }
-                // stage('Worker build - Windows guest') {
-                //     agent { node { label 'jammy' } }
-                //     when {
-                //         beforeAgent true
-                //         expression {
-                //             return runWorkers
-                //         }
-                //     }
-                //     environment {
-                //             AZURE_CONNECTION_STRING = credentials('46b4e7d6-315f-4cc1-8333-b58780863b9b')
-                //     }
-                //     stages {
-                //         stage('Checkout') {
-                //             steps {
-                //                 checkout scm
-                //             }
-                //         }
-                //         stage('Install azure-cli') {
-                //             steps {
-                //                 installAzureCli('jammy', 'amd64')
-                //             }
-                //         }
-                //         stage('Download assets') {
-                //             steps {
-                //                 sh "mkdir ${env.HOME}/workloads"
-                //                 sh 'az storage blob download --container-name private-images --file "$HOME/workloads/windows-server-2022-amd64-2.raw" --name windows-server-2022-amd64-2.raw --connection-string "$AZURE_CONNECTION_STRING"'
-                //             }
-                //         }
-                //         stage('Run Windows guest integration tests') {
-                //             options {
-                //                 timeout(time: 1, unit: 'HOURS')
-                //             }
-                //             steps {
-                //                 sh 'scripts/dev_cli.sh tests --integration-windows'
-                //             }
-                //         }
-                //         stage('Run Windows guest integration tests for musl') {
-                //             options {
-                //                 timeout(time: 1, unit: 'HOURS')
-                //             }
-                //             steps {
-                //                 sh 'scripts/dev_cli.sh tests --integration-windows --libc musl'
-                //             }
-                //         }
-                //     }
-                // }
+                stage('Worker build - Windows guest') {
+                    agent { node { label 'jammy' } }
+                    when {
+                        beforeAgent true
+                        expression {
+                            return runWorkers
+                        }
+                    }
+                    environment {
+                            AZURE_CONNECTION_STRING = credentials('46b4e7d6-315f-4cc1-8333-b58780863b9b')
+                    }
+                    stages {
+                        stage('Checkout') {
+                            steps {
+                                checkout scm
+                            }
+                        }
+                        stage('Install azure-cli') {
+                            steps {
+                                installAzureCli('jammy', 'amd64')
+                            }
+                        }
+                        stage('Download assets') {
+                            steps {
+                                sh "mkdir ${env.HOME}/workloads"
+                                sh 'az storage blob download --container-name private-images --file "$HOME/workloads/windows-server-2022-amd64-2.raw" --name windows-server-2022-amd64-2.raw --connection-string "$AZURE_CONNECTION_STRING"'
+                            }
+                        }
+                        stage('Run Windows guest integration tests') {
+                            options {
+                                timeout(time: 1, unit: 'HOURS')
+                            }
+                            steps {
+                                sh 'scripts/dev_cli.sh tests --integration-windows'
+                            }
+                        }
+                        stage('Run Windows guest integration tests for musl') {
+                            options {
+                                timeout(time: 1, unit: 'HOURS')
+                            }
+                            steps {
+                                sh 'scripts/dev_cli.sh tests --integration-windows --libc musl'
+                            }
+                        }
+                    }
+                }
                stage('Worker build - Metrics') {
                    agent { node { label 'jammy-metrics' } }
                    when {
--- a/arch/Cargo.toml
+++ b/arch/Cargo.toml
@@ -9,13 +9,13 @@ default = []
 tdx = []

 [dependencies]
-anyhow = "1.0.70"
+anyhow = "1.0.69"
 byteorder = "1.4.3"
 hypervisor = { path = "../hypervisor" }
 libc = "0.2.139"
 linux-loader = { version = "0.8.1", features = ["elf", "bzimage", "pe"] }
 log = "0.4.17"
-serde = { version = "1.0.156", features = ["rc", "derive"] }
+serde = { version = "1.0.151", features = ["rc", "derive"] }
 thiserror = "1.0.39"
 uuid = "1.3.0"
 versionize = "0.1.10"
--- a/arch/src/x86_64/mod.rs
+++ b/arch/src/x86_64/mod.rs
@@ -210,6 +210,7 @@ impl From<Error> for super::Error {
    }
 }

+#[allow(clippy::upper_case_acronyms)]
 #[derive(Copy, Clone, Debug)]
 pub enum CpuidReg {
    EAX,
--- a/build.rs
+++ b/build.rs
@@ -17,8 +17,8 @@ fn main() {
    }

    // This println!() has a special behavior, as it will set the environment
-    // variable BUILD_VERSION, so that it can be reused from the binary.
+    // 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=BUILD_VERSION={version}");
+    println!("cargo:rustc-env=BUILT_VERSION={version}");
 }
--- a/devices/Cargo.toml
+++ b/devices/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"

 [dependencies]
 acpi_tables = { git = "https://github.com/rust-vmm/acpi_tables", branch = "main"  }
-anyhow = "1.0.70"
+anyhow = "1.0.69"
 arch = { path = "../arch" }
 bitflags = "1.3.2"
 byteorder = "1.4.3"
--- a/event_monitor/Cargo.toml
+++ b/event_monitor/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2021"

 [dependencies]
 libc = "0.2.139"
-serde = { version = "1.0.156", features = ["rc", "derive"] }
-serde_json = "1.0.96"
+serde = { version = "1.0.151", features = ["rc", "derive"] }
+serde_json = "1.0.95"
--- a/fuzz/Cargo.lock
+++ b/fuzz/Cargo.lock
@@ -5,16 +5,16 @@ version = 3
 [[package]]
 name = "acpi_tables"
 version = "0.1.0"
-source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#98dcb0309d362dd83f6ffcac4f66914a2fbd5a73"
+source = "git+https://github.com/rust-vmm/acpi_tables?branch=main#0b892e2c2053c4ecfac8d9e5a52babae75114702"
 dependencies = [
 "zerocopy",
 ]

 [[package]]
 name = "anyhow"
-version = "1.0.71"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"

 [[package]]
 name = "api_client"
@@ -143,7 +143,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "cloud-hypervisor"
-version = "31.0.0"
+version = "30.0.0"
 dependencies = [
 "anyhow",
 "api_client",
@@ -208,9 +208,9 @@ checksum = "55626594feae15d266d52440b26ff77de0e22230cf0c113abe619084c1ddc910"

 [[package]]
 name = "darling"
-version = "0.20.1"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0558d22a7b463ed0241e993f76f09f30b126687447751a8638587b864e4b3944"
+checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
 dependencies = [
 "darling_core",
 "darling_macro",
@@ -218,27 +218,27 @@ dependencies = [

 [[package]]
 name = "darling_core"
-version = "0.20.1"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab8bfa2e259f8ee1ce5e97824a3c55ec4404a0d772ca7fa96bf19f0752a046eb"
+checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
 dependencies = [
 "fnv",
 "ident_case",
 "proc-macro2",
 "quote",
 "strsim",
- "syn 2.0.15",
+ "syn 1.0.109",
 ]

 [[package]]
 name = "darling_macro"
-version = "0.20.1"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29a358ff9f12ec09c3e61fef9b5a9902623a695a46a917b07f269bff1445611a"
+checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
 dependencies = [
 "darling_core",
 "quote",
- "syn 2.0.15",
+ "syn 1.0.109",
 ]

 [[package]]
@@ -296,9 +296,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"

 [[package]]
 name = "getrandom"
-version = "0.2.9"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
 dependencies = [
 "cfg-if",
 "libc",
@@ -393,9 +393,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.144"
+version = "0.2.141"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
+checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"

 [[package]]
 name = "libfuzzer-sys"
@@ -498,9 +498,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.57"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4ec6d5fe0b140acb27c9a0444118cf55bfbb4e0b259739429abb4521dd67c16"
+checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
 dependencies = [
 "unicode-ident",
 ]
@@ -518,9 +518,9 @@ dependencies = [

 [[package]]
 name = "quote"
-version = "1.0.27"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500"
+checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
 dependencies = [
 "proc-macro2",
 ]
@@ -542,7 +542,7 @@ checksum = "e13cca257d068dd3a390d04b2c3009a3fad2ee5048dfa8f239d048372810470c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.15",
+ "syn 2.0.4",
 ]

 [[package]]
@@ -577,29 +577,29 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"

 [[package]]
 name = "serde"
-version = "1.0.163"
+version = "1.0.159"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
+checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.163"
+version = "1.0.159"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
+checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.15",
+ "syn 2.0.4",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.96"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744"
 dependencies = [
 "itoa",
 "ryu",
@@ -608,9 +608,9 @@ dependencies = [

 [[package]]
 name = "serde_with"
-version = "2.3.3"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe"
+checksum = "331bb8c3bf9b92457ab7abecf07078c13f7d270ba490103e84e8b014490cd0b0"
 dependencies = [
 "serde",
 "serde_with_macros",
@@ -618,14 +618,14 @@ dependencies = [

 [[package]]
 name = "serde_with_macros"
-version = "2.3.3"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f"
+checksum = "859011bddcc11f289f07f467cc1fe01c7a941daa4d8f6c40d4d1c92eb6d9319c"
 dependencies = [
 "darling",
 "proc-macro2",
 "quote",
- "syn 2.0.15",
+ "syn 1.0.109",
 ]

 [[package]]
@@ -676,9 +676,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.15"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "2c622ae390c9302e214c31013517c2061ecb2699935882c60a9b37f82f8625ae"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -702,7 +702,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.15",
+ "syn 2.0.4",
 ]

 [[package]]
@@ -737,9 +737,9 @@ checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"

 [[package]]
 name = "uuid"
-version = "1.3.3"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2"
+checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79"
 dependencies = [
 "getrandom",
 ]
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -12,7 +12,7 @@ cargo-fuzz = true
 block_util = { path = "../block_util" }
 devices = { path = "../devices" }
 epoll = "4.3.1"
-libc = "0.2.144"
+libc = "0.2.141"
 libfuzzer-sys = "0.4.6"
 linux-loader = { version = "0.8.1", features = ["elf", "bzimage", "pe"] }
 micro_http = { git = "https://github.com/firecracker-microvm/micro-http", branch = "main" }
--- a/hypervisor/Cargo.toml
+++ b/hypervisor/Cargo.toml
@@ -11,7 +11,7 @@ mshv = ["mshv-ioctls", "mshv-bindings", "vfio-ioctls/mshv"]
 tdx = []

 [dependencies]
-anyhow = "1.0.70"
+anyhow = "1.0.69"
 byteorder = "1.4.3"
 thiserror = "1.0.39"
 libc = "0.2.139"
@@ -20,8 +20,8 @@ kvm-ioctls = { version = "0.13.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.156", features = ["rc", "derive"] }
-serde_with = { version = "2.3.2", default-features = false, features = ["macros"] }
+serde = { version = "1.0.151", features = ["rc", "derive"] }
+serde_with = { version = "2.3.1", default-features = false, features = ["macros"] }
 vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false }
 vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic"] }
 vmm-sys-util = { version = "0.11.0", features = ["with-serde"] }
--- a/hypervisor/src/arch/x86/mod.rs
+++ b/hypervisor/src/arch/x86/mod.rs
@@ -26,6 +26,7 @@ pub const MTRR_MEM_TYPE_WB: u64 = 0x6;
 pub const NUM_IOAPIC_PINS: usize = 24;

 // X86 Exceptions
+#[allow(clippy::upper_case_acronyms)]
 #[derive(Clone, Debug)]
 pub enum Exception {
    DE = 0,  // Divide Error
--- a/hypervisor/src/kvm/aarch64/gic/mod.rs
+++ b/hypervisor/src/kvm/aarch64/gic/mod.rs
@@ -243,6 +243,7 @@ impl KvmGicV3Its {
    }

    /// Method to initialize the GIC device
+    #[allow(clippy::new_ret_no_self)]
    pub fn new(vm: &dyn Vm, config: VgicConfig) -> Result<KvmGicV3Its> {
        // This is inside KVM module
        let vm = vm.as_any().downcast_ref::<KvmVm>().expect("Wrong VM type?");
--- a/hypervisor/src/mshv/mod.rs
+++ b/hypervisor/src/mshv/mod.rs
@@ -461,10 +461,10 @@ impl cpu::Vcpu for MshvVcpu {
                            /* Advance RIP and update RAX */
                            let arr_reg_name_value = [
                                (
-                                    hv_register_name_HV_X64_REGISTER_RIP,
+                                    hv_x64_register_name_HV_X64_REGISTER_RIP,
                                    info.header.rip + insn_len,
                                ),
-                                (hv_register_name_HV_X64_REGISTER_RAX, ret_rax),
+                                (hv_x64_register_name_HV_X64_REGISTER_RAX, ret_rax),
                            ];
                            set_registers_64!(self.fd, arr_reg_name_value)
                                .map_err(|e| cpu::HypervisorCpuError::SetRegister(e.into()))?;
@@ -510,10 +510,10 @@ impl cpu::Vcpu for MshvVcpu {
                    /* Advance RIP and update RAX */
                    let arr_reg_name_value = [
                        (
-                            hv_register_name_HV_X64_REGISTER_RIP,
+                            hv_x64_register_name_HV_X64_REGISTER_RIP,
                            info.header.rip + insn_len,
                        ),
-                        (hv_register_name_HV_X64_REGISTER_RAX, ret_rax),
+                        (hv_x64_register_name_HV_X64_REGISTER_RAX, ret_rax),
                    ];
                    set_registers_64!(self.fd, arr_reg_name_value)
                        .map_err(|e| cpu::HypervisorCpuError::SetRegister(e.into()))?;
--- a/net_util/Cargo.toml
+++ b/net_util/Cargo.toml
@@ -11,7 +11,7 @@ libc = "0.2.139"
 log = "0.4.17"
 net_gen = { path = "../net_gen" }
 rate_limiter = { path = "../rate_limiter" }
-serde = "1.0.156"
+serde = "1.0.151"
 thiserror = "1.0.39"
 versionize = "0.1.10"
 versionize_derive = "0.1.4"
@@ -25,4 +25,4 @@ vmm-sys-util = "0.11.0"
 once_cell = "1.17.1"
 pnet = "0.33.0"
 pnet_datalink = "0.33.0"
-serde_json = "1.0.96"
+serde_json = "1.0.95"
--- a/pci/Cargo.toml
+++ b/pci/Cargo.toml
@@ -10,7 +10,7 @@ kvm = ["vfio-ioctls/kvm"]
 mshv = ["vfio-ioctls/mshv"]

 [dependencies]
-anyhow = "1.0.70"
+anyhow = "1.0.69"
 byteorder = "1.4.3"
 hypervisor = { path = "../hypervisor" }
 vfio-bindings = { git = "https://github.com/rust-vmm/vfio", branch = "main", features = ["fam-wrappers"] }
@@ -20,7 +20,7 @@ vfio_user = { git = "https://github.com/rust-vmm/vfio-user", branch = "main" }
 vmm-sys-util = "0.11.0"
 libc = "0.2.139"
 log = "0.4.17"
-serde = { version = "1.0.156", features = ["derive"] }
+serde = { version = "1.0.151", features = ["derive"] }
 thiserror = "1.0.39"
 versionize = "0.1.10"
 versionize_derive = "0.1.4"
--- a/performance-metrics/Cargo.toml
+++ b/performance-metrics/Cargo.toml
@@ -7,9 +7,9 @@ build = "../build.rs"

 [dependencies]
 argh = "0.1.9"
-dirs = "5.0.0"
-serde = { version = "1.0.156", features = ["rc", "derive"] }
-serde_json = "1.0.96"
+dirs = "4.0.0"
+serde = { version = "1.0.151", features = ["rc", "derive"] }
+serde_json = "1.0.95"
 test_infra = { path = "../test_infra" }
 thiserror = "1.0.39"
 wait-timeout = "0.2.0"
--- a/performance-metrics/src/main.rs
+++ b/performance-metrics/src/main.rs
@@ -671,7 +671,7 @@ fn main() {
    let opts: Options = argh::from_env();

    if opts.version {
-        println!("{} {}", env!("CARGO_BIN_NAME"), env!("BUILD_VERSION"));
+        println!("{} {}", env!("CARGO_BIN_NAME"), env!("BUILT_VERSION"));
        return;
    }

--- a/qcow/src/qcow_raw_file.rs
+++ b/qcow/src/qcow_raw_file.rs
@@ -92,7 +92,6 @@ impl QcowRawFile {
    pub fn write_refcount_block(&mut self, offset: u64, table: &[u16]) -> io::Result<()> {
        self.file.seek(SeekFrom::Start(offset))?;
        let mut buffer = BufWriter::with_capacity(std::mem::size_of_val(table), &mut self.file);
-
        for count in table {
            buffer.write_u16::<BigEndian>(*count)?;
        }
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,9 +1,4 @@
- [v32.1](#v321)
- [v32.0](#v320)
-    - [Increased PCI Segment Limit](#increased-pci-segment-limit)
-    - [API Changes](#api-changes)
-    - [Notable Bug Fixes](#notable-bug-fixes)
-    - [Contributors](#contributors)
+- [v31.2](#v312)
 - [v31.1](#v311)
 - [v31.0](#v310)
    - [Update to Latest `acpi_tables`](#update-to-latest-acpi_tables)
@@ -11,15 +6,15 @@
    - [Improvements on Console `SIGWINCH` Handler](#improvements-on-console-sigwinch-handler)
    - [Remove Directory Support from `MemoryZoneConfig::file`](#remove-directory-support-from-memoryzoneconfigfile)
    - [Documentation Improvements](#documentation-improvements)
-    - [Notable Bug Fixes](#notable-bug-fixes-1)
-    - [Contributors](#contributors-1)
+    - [Notable Bug Fixes](#notable-bug-fixes)
+    - [Contributors](#contributors)
 - [v30.0](#v300)
    - [Command Line Changes for Reduced Binary Size](#command-line-changes-for-reduced-binary-size)
    - [Basic vfio-user Server Support](#basic-vfio-user-server-support)
    - [Heap Profiling Support](#heap-profiling-support)
    - [Documentation Improvements](#documentation-improvements-1)
-    - [Notable Bug Fixes](#notable-bug-fixes-2)
-    - [Contributors](#contributors-2)
+    - [Notable Bug Fixes](#notable-bug-fixes-1)
+    - [Contributors](#contributors-1)
 - [v28.2](#v282)
 - [v29.0](#v290)
    - [Release Binary Supports Both MSHV and KVM](#release-binary-supports-both-mshv-and-kvm)
@@ -29,10 +24,10 @@
    - [`AArch64` Documentation Integration](#aarch64-documentation-integration)
    - [`virtio-block` Counters Enhancement](#virtio-block-counters-enhancement)
    - [TCP Offload Control](#tcp-offload-control)
-    - [Notable Bug Fixes](#notable-bug-fixes-3)
+    - [Notable Bug Fixes](#notable-bug-fixes-2)
    - [Removals](#removals)
    - [Deprecations](#deprecations)
-    - [Contributors](#contributors-3)
+    - [Contributors](#contributors-2)
 - [v28.1](#v281)
 - [v28.0](#v280)
    - [Community Engagement (Reminder)](#community-engagement-reminder)
@@ -40,9 +35,9 @@
    - [Virtualised TPM Support](#virtualised-tpm-support)
    - [Transparent Huge Page Support](#transparent-huge-page-support)
    - [README Quick Start Improved](#readme-quick-start-improved)
-    - [Notable Bug Fixes](#notable-bug-fixes-4)
+    - [Notable Bug Fixes](#notable-bug-fixes-3)
    - [Removals](#removals-1)
-    - [Contributors](#contributors-4)
+    - [Contributors](#contributors-3)
 - [v27.0](#v270)
    - [Community Engagement](#community-engagement)
    - [Prebuilt Packages](#prebuilt-packages)
@@ -51,41 +46,41 @@
    - [Simplified Build Feature Flags](#simplified-build-feature-flags)
    - [Asynchronous Kernel Loading](#asynchronous-kernel-loading)
    - [GDB Support for AArch64](#gdb-support-for-aarch64)
-    - [Notable Bug Fixes](#notable-bug-fixes-5)
+    - [Notable Bug Fixes](#notable-bug-fixes-4)
    - [Deprecations](#deprecations-1)
-    - [Contributors](#contributors-5)
+    - [Contributors](#contributors-4)
 - [v26.0](#v260)
    - [SMBIOS Improvements via `--platform`](#smbios-improvements-via---platform)
    - [Unified Binary MSHV and KVM Support](#unified-binary-mshv-and-kvm-support)
-    - [Notable Bug Fixes](#notable-bug-fixes-6)
+    - [Notable Bug Fixes](#notable-bug-fixes-5)
    - [Deprecations](#deprecations-2)
    - [Removals](#removals-2)
-    - [Contributors](#contributors-6)
+    - [Contributors](#contributors-5)
 - [v25.0](#v250)
    - [`ch-remote` Improvements](#ch-remote-improvements-1)
    - [VM "Coredump" Support](#vm-coredump-support)
-    - [Notable Bug Fixes](#notable-bug-fixes-7)
+    - [Notable Bug Fixes](#notable-bug-fixes-6)
    - [Removals](#removals-3)
-    - [Contributors](#contributors-7)
+    - [Contributors](#contributors-6)
 - [v24.0](#v240)
    - [Bypass Mode for `virtio-iommu`](#bypass-mode-for-virtio-iommu)
    - [Ensure Identifiers Uniqueness](#ensure-identifiers-uniqueness)
    - [Sparse Mmap support](#sparse-mmap-support)
    - [Expose Platform Serial Number](#expose-platform-serial-number)
-    - [Notable Bug Fixes](#notable-bug-fixes-8)
+    - [Notable Bug Fixes](#notable-bug-fixes-7)
    - [Notable Improvements](#notable-improvements)
    - [Deprecations](#deprecations-3)
    - [New on the Website](#new-on-the-website)
-    - [Contributors](#contributors-8)
+    - [Contributors](#contributors-7)
 - [v23.1](#v231)
 - [v23.0](#v230)
    - [vDPA Support](#vdpa-support)
    - [Updated OS Support list](#updated-os-support-list)
    - [`AArch64` Memory Map Improvements](#aarch64-memory-map-improvements)
    - [`AMX` Support](#amx-support)
-    - [Notable Bug Fixes](#notable-bug-fixes-9)
+    - [Notable Bug Fixes](#notable-bug-fixes-8)
    - [Deprecations](#deprecations-4)
-    - [Contributors](#contributors-9)
+    - [Contributors](#contributors-8)
 - [v22.1](#v221)
 - [v22.0](#v220)
    - [GDB Debug Stub Support](#gdb-debug-stub-support)
@@ -96,13 +91,13 @@
    - [PMU Support for AArch64](#pmu-support-for-aarch64)
    - [Documentation Under CC-BY-4.0 License](#documentation-under-cc-by-40-license)
    - [Deprecation of "Classic" `virtiofsd`](#deprecation-of-classic-virtiofsd)
-    - [Notable Bug Fixes](#notable-bug-fixes-10)
-    - [Contributors](#contributors-10)
+    - [Notable Bug Fixes](#notable-bug-fixes-9)
+    - [Contributors](#contributors-9)
 - [v21.0](#v210)
    - [Efficient Local Live Migration (for Live Upgrade)](#efficient-local-live-migration-for-live-upgrade)
    - [Recommended Kernel is Now 5.15](#recommended-kernel-is-now-515)
-    - [Notable Bug fixes](#notable-bug-fixes-11)
-    - [Contributors](#contributors-11)
+    - [Notable Bug fixes](#notable-bug-fixes-10)
+    - [Contributors](#contributors-10)
 - [v20.2](#v202)
 - [v20.1](#v201)
 - [v20.0](#v200)
@@ -111,8 +106,8 @@
    - [Improved VFIO support](#improved-vfio-support)
    - [Safer code](#safer-code)
    - [Extended documentation](#extended-documentation)
-    - [Notable bug fixes](#notable-bug-fixes-12)
-    - [Contributors](#contributors-12)
+    - [Notable bug fixes](#notable-bug-fixes-11)
+    - [Contributors](#contributors-11)
 - [v19.0](#v190)
    - [Improved PTY handling for serial and `virtio-console`](#improved-pty-handling-for-serial-and-virtio-console)
    - [PCI boot time optimisations](#pci-boot-time-optimisations)
@@ -120,8 +115,8 @@
    - [Live migration enhancements](#live-migration-enhancements)
    - [`virtio-mem` support with `vfio-user`](#virtio-mem-support-with-vfio-user)
    - [AArch64 for `virtio-iommu`](#aarch64-for-virtio-iommu)
-    - [Notable bug fixes](#notable-bug-fixes-13)
-    - [Contributors](#contributors-13)
+    - [Notable bug fixes](#notable-bug-fixes-12)
+    - [Contributors](#contributors-12)
 - [v18.0](#v180)
    - [Experimental User Device (`vfio-user`) support](#experimental-user-device-vfio-user-support)
    - [Migration support for `vhost-user` devices](#migration-support-for-vhost-user-devices)
@@ -131,23 +126,23 @@
    - [Live migration on MSHV hypervisor](#live-migration-on-mshv-hypervisor)
    - [AArch64 CPU topology support](#aarch64-cpu-topology-support)
    - [Power button support on AArch64](#power-button-support-on-aarch64)
-    - [Notable bug fixes](#notable-bug-fixes-14)
-    - [Contributors](#contributors-14)
+    - [Notable bug fixes](#notable-bug-fixes-13)
+    - [Contributors](#contributors-13)
 - [v17.0](#v170)
    - [ARM64 NUMA support using ACPI](#arm64-numa-support-using-acpi)
    - [`Seccomp` support for MSHV backend](#seccomp-support-for-mshv-backend)
    - [Hotplug of `macvtap` devices](#hotplug-of-macvtap-devices)
    - [Improved SGX support](#improved-sgx-support)
    - [Inflight tracking for `vhost-user` devices](#inflight-tracking-for-vhost-user-devices)
-    - [Notable bug fixes](#notable-bug-fixes-15)
-    - [Contributors](#contributors-15)
+    - [Notable bug fixes](#notable-bug-fixes-14)
+    - [Contributors](#contributors-14)
 - [v16.0](#v160)
    - [Improved live migration support](#improved-live-migration-support)
    - [Improved `vhost-user` support](#improved-vhost-user-support)
    - [ARM64 ACPI and UEFI support](#arm64-acpi-and-uefi-support)
-    - [Notable bug fixes](#notable-bug-fixes-16)
+    - [Notable bug fixes](#notable-bug-fixes-15)
    - [Removed functionality](#removed-functionality)
-    - [Contributors](#contributors-16)
+    - [Contributors](#contributors-15)
 - [v15.0](#v150)
    - [Version numbering and stability guarantees](#version-numbering-and-stability-guarantees)
    - [Network device rate limiting](#network-device-rate-limiting)
@@ -155,7 +150,7 @@
    - [`--api-socket` supports file descriptor parameter](#--api-socket-supports-file-descriptor-parameter)
    - [Bug fixes](#bug-fixes)
    - [Deprecations](#deprecations-5)
-    - [Contributors](#contributors-17)
+    - [Contributors](#contributors-16)
 - [v0.14.1](#v0141)
 - [v0.14.0](#v0140)
    - [Structured event monitoring](#structured-event-monitoring)
@@ -165,7 +160,7 @@
    - [PTY control for serial and `virtio-console`](#pty-control-for-serial-and-virtio-console)
    - [Block device rate limiting](#block-device-rate-limiting)
    - [Deprecations](#deprecations-6)
-    - [Contributors](#contributors-18)
+    - [Contributors](#contributors-17)
 - [v0.13.0](#v0130)
    - [Wider VFIO device support](#wider-vfio-device-support)
    - [Improved huge page support](#improved-huge-page-support)
@@ -173,13 +168,13 @@
    - [VHD disk image support](#vhd-disk-image-support)
    - [Improved Virtio device threading](#improved-virtio-device-threading)
    - [Clean shutdown support via synthetic power button](#clean-shutdown-support-via-synthetic-power-button)
-    - [Contributors](#contributors-19)
+    - [Contributors](#contributors-18)
 - [v0.12.0](#v0120)
    - [ARM64 enhancements](#arm64-enhancements)
    - [Removal of `vhost-user-net` and `vhost-user-block` self spawning](#removal-of-vhost-user-net-and-vhost-user-block-self-spawning)
    - [Migration of `vhost-user-fs` backend](#migration-of-vhost-user-fs-backend)
    - [Enhanced "info" API](#enhanced-info-api)
-    - [Contributors](#contributors-20)
+    - [Contributors](#contributors-19)
 - [v0.11.0](#v0110)
    - [`io_uring` support by default for `virtio-block`](#io_uring-support-by-default-for-virtio-block)
    - [Windows Guest Support](#windows-guest-support)
@@ -191,15 +186,15 @@
    - [Default Log Level Changed](#default-log-level-changed)
    - [New `--balloon` Parameter Added](#new---balloon-parameter-added)
    - [Experimental `virtio-watchdog` Support](#experimental-virtio-watchdog-support)
-    - [Notable Bug Fixes](#notable-bug-fixes-17)
-    - [Contributors](#contributors-21)
+    - [Notable Bug Fixes](#notable-bug-fixes-16)
+    - [Contributors](#contributors-20)
 - [v0.10.0](#v0100)
    - [`virtio-block` Support for Multiple Descriptors](#virtio-block-support-for-multiple-descriptors)
    - [Memory Zones](#memory-zones)
    - [`Seccomp` Sandbox Improvements](#seccomp-sandbox-improvements)
    - [Preliminary KVM HyperV Emulation Control](#preliminary-kvm-hyperv-emulation-control)
-    - [Notable Bug Fixes](#notable-bug-fixes-18)
-    - [Contributors](#contributors-22)
+    - [Notable Bug Fixes](#notable-bug-fixes-17)
+    - [Contributors](#contributors-21)
 - [v0.9.0](#v090)
    - [`io_uring` Based Block Device Support](#io_uring-based-block-device-support)
    - [Block and Network Device Statistics](#block-and-network-device-statistics)
@@ -212,17 +207,17 @@
    - [Enhancements to ARM64 Support](#enhancements-to-arm64-support)
    - [Intel SGX Support](#intel-sgx-support)
    - [`Seccomp` Sandbox Improvements](#seccomp-sandbox-improvements-1)
-    - [Notable Bug Fixes](#notable-bug-fixes-19)
-    - [Contributors](#contributors-23)
+    - [Notable Bug Fixes](#notable-bug-fixes-18)
+    - [Contributors](#contributors-22)
 - [v0.8.0](#v080)
    - [Experimental Snapshot and Restore Support](#experimental-snapshot-and-restore-support)
    - [Experimental ARM64 Support](#experimental-arm64-support)
    - [Support for Using 5-level Paging in Guests](#support-for-using-5-level-paging-in-guests)
    - [Virtio Device Interrupt Suppression for Network Devices](#virtio-device-interrupt-suppression-for-network-devices)
    - [`vhost_user_fs` Improvements](#vhost_user_fs-improvements)
-    - [Notable Bug Fixes](#notable-bug-fixes-20)
+    - [Notable Bug Fixes](#notable-bug-fixes-19)
    - [Command Line and API Changes](#command-line-and-api-changes)
-    - [Contributors](#contributors-24)
+    - [Contributors](#contributors-23)
 - [v0.7.0](#v070)
    - [Block, Network, Persistent Memory (PMEM), VirtioFS and Vsock hotplug](#block-network-persistent-memory-pmem-virtiofs-and-vsock-hotplug)
    - [Alternative `libc` Support](#alternative-libc-support)
@@ -232,14 +227,14 @@
    - [`Seccomp` Sandboxing](#seccomp-sandboxing)
    - [Updated Distribution Support](#updated-distribution-support)
    - [Command Line and API Changes](#command-line-and-api-changes-1)
-    - [Contributors](#contributors-25)
+    - [Contributors](#contributors-24)
 - [v0.6.0](#v060)
    - [Directly Assigned Devices Hotplug](#directly-assigned-devices-hotplug)
    - [Shared Filesystem Improvements](#shared-filesystem-improvements)
    - [Block and Networking IO Self Offloading](#block-and-networking-io-self-offloading)
    - [Command Line Interface](#command-line-interface)
    - [PVH Boot](#pvh-boot)
-    - [Contributors](#contributors-26)
+    - [Contributors](#contributors-25)
 - [v0.5.1](#v051)
 - [v0.5.0](#v050)
    - [Virtual Machine Dynamic Resizing](#virtual-machine-dynamic-resizing)
@@ -247,7 +242,7 @@
    - [New Interrupt Management Framework](#new-interrupt-management-framework)
    - [Development Tools](#development-tools)
    - [Kata Containers Integration](#kata-containers-integration)
-    - [Contributors](#contributors-27)
+    - [Contributors](#contributors-26)
 - [v0.4.0](#v040)
    - [Dynamic virtual CPUs addition](#dynamic-virtual-cpus-addition)
    - [Programmatic firmware tables generation](#programmatic-firmware-tables-generation)
@@ -256,7 +251,7 @@
    - [Userspace IOAPIC by default](#userspace-ioapic-by-default)
    - [PCI BAR reprogramming](#pci-bar-reprogramming)
    - [New `cloud-hypervisor` organization](#new-cloud-hypervisor-organization)
-    - [Contributors](#contributors-28)
+    - [Contributors](#contributors-27)
 - [v0.3.0](#v030)
    - [Block device offloading](#block-device-offloading)
    - [Network device backend](#network-device-backend)
@@ -283,10 +278,14 @@
    - [Unit testing](#unit-testing)
    - [Integration tests parallelization](#integration-tests-parallelization)

-# v32.1
+# v31.2

 This is a bug fix release. The following issues have been addressed:

+* The number of vCPUs is capped at the hypervisor maximum (#5357)
+* Fixes for TTY reset (#5414)
+* CPU topology fixes on MSHV (#5325)
+* Seccomp fixes for older distributions (#5397)
 * Report errors explicitly to users when VM failed to boot (#5453)
 * Fix VFIO on platforms with non-4k page size (#5450, #5469)
 * Fix TDX initialization (#5454)
@@ -296,49 +295,6 @@ This is a bug fix release. The following issues have been addressed:
 * Populate APIC ID properly (#5512)
 * Ignore and warn TAP FDs in more situations (#5522)

-# v32.0
-
-This release has been tracked in our [roadmap
-project](https://github.com/orgs/cloud-hypervisor/projects/6) as iteration
-v32.0. The following user visible changes have been made:
-
-### Increased PCI Segment Limit
-
-The maximum number of PCI segments that can be used is now 96 (up from 16).
-
-### API Changes
-
-* The VmmPingResponse now includes the PID as well as the build details.
-  (#5348)
-
-### Notable Bug Fixes
-
-* Ignore and warn TAP FDs sent via the HTTP request body (#5350)
-* Properly preserve and close valid FDs for TAP devices (#5373)
-* Only use `KVM_ARM_VCPU_PMU_V3` if available (#5360)
-* Only touch the tty flags if it's being used (#5343)
-* Fix seccomp filter lists for vhost-user devices (#5361)
-* The number of vCPUs is capped at the hypervisor maximum (#5357)
-* Fixes for TTY reset (#5414)
-* CPU topology fixes on MSHV (#5325)
-* Seccomp fixes for older distributions (#5397)
-
-### Contributors
-
-Many thanks to everyone who has contributed to our release:
-
-* Alyssa Ross <hi@alyssa.is>
-* Anatol Belski <anbelski@linux.microsoft.com>
-* Bo Chen <chen.bo@intel.com>
-* Hao Xu <howeyxu@tencent.com>
-* Muminul Islam <muislam@microsoft.com>
-* Omer Faruk Bayram <omer.faruk@sartura.hr>
-* Rafael Mendonca <rafaelmendsr@gmail.com>
-* Rob Bradford <rbradford@rivosinc.com>
-* Ruslan Mstoi <ruslan.mstoi@intel.com>
-* Smit Gardhariya <gardhariya.smit@gmail.com>
-* Wei Liu <liuwe@microsoft.com>
-
 # v31.1

 This is a bug fix release. The following issues have been addressed:
--- a/scripts/dev_cli.sh
+++ b/scripts/dev_cli.sh
@@ -539,7 +539,6 @@ cmd_tests() {
            --volume "$CLH_INTEGRATION_WORKLOADS:$CTR_CLH_INTEGRATION_WORKLOADS" \
            --env USER="root" \
            --env CH_LIBC="${libc}" \
-            --env RUST_BACKTRACE="${RUST_BACKTRACE}" \
            "$CTR_IMAGE" \
            ./scripts/run_metrics.sh "$@" || fix_dir_perms $? || exit $?
    fi
--- a/scripts/run_integration_tests_aarch64.sh
+++ b/scripts/run_integration_tests_aarch64.sh
@@ -225,8 +225,8 @@ fi

 BUILD_TARGET="aarch64-unknown-linux-${CH_LIBC}"
 if [[ "${BUILD_TARGET}" == "aarch64-unknown-linux-musl" ]]; then
-    export TARGET_CC="musl-gcc"
-    export RUSTFLAGS="-C link-arg=-lgcc -C link_arg=-specs -C link_arg=/usr/lib/aarch64-linux-musl/musl-gcc.specs"
+export TARGET_CC="musl-gcc"
+export RUSTFLAGS="-C link-arg=-lgcc -C link_arg=-specs -C link_arg=/usr/lib/aarch64-linux-musl/musl-gcc.specs"
 fi

 export RUST_BACKTRACE=1
--- a/scripts/run_integration_tests_sgx.sh
+++ b/scripts/run_integration_tests_sgx.sh
@@ -42,8 +42,8 @@ BUILD_TARGET="$(uname -m)-unknown-linux-${CH_LIBC}"
 CFLAGS=""
 TARGET_CC=""
 if [[ "${BUILD_TARGET}" == "x86_64-unknown-linux-musl" ]]; then
-    TARGET_CC="musl-gcc"
-    CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/"
+TARGET_CC="musl-gcc"
+CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/"
 fi

 cargo build --no-default-features --features "kvm,mshv" --all --release --target $BUILD_TARGET
--- a/scripts/run_integration_tests_windows_aarch64.sh
+++ b/scripts/run_integration_tests_windows_aarch64.sh
@@ -24,8 +24,8 @@ BUILD_TARGET="$(uname -m)-unknown-linux-${CH_LIBC}"
 CFLAGS=""
 TARGET_CC=""
 if [[ "${BUILD_TARGET}" == "aarch64-unknown-linux-musl" ]]; then
-    export TARGET_CC="musl-gcc"
-    export RUSTFLAGS="-C link-arg=-lgcc -C link_arg=-specs -C link_arg=/usr/lib/aarch64-linux-musl/musl-gcc.specs"
+export TARGET_CC="musl-gcc"
+export RUSTFLAGS="-C link-arg=-lgcc -C link_arg=-specs -C link_arg=/usr/lib/aarch64-linux-musl/musl-gcc.specs"
 fi

 # Check if the images are present
--- a/scripts/run_integration_tests_windows_x86_64.sh
+++ b/scripts/run_integration_tests_windows_x86_64.sh
@@ -26,8 +26,8 @@ BUILD_TARGET="$(uname -m)-unknown-linux-${CH_LIBC}"
 CFLAGS=""
 TARGET_CC=""
 if [[ "${BUILD_TARGET}" == "x86_64-unknown-linux-musl" ]]; then
-    TARGET_CC="musl-gcc"
-    CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/"
+TARGET_CC="musl-gcc"
+CFLAGS="-I /usr/include/x86_64-linux-musl/ -idirafter /usr/include/"
 fi

 # Check if the images are present
--- a/scripts/run_metrics.sh
+++ b/scripts/run_metrics.sh
@@ -107,12 +107,7 @@ fi
 # Ensure that git commands can be run in this directory (for metrics report)
 git config --global --add safe.directory $PWD

-RUST_BACKTRACE_VALUE=`echo $RUST_BACKTRACE`
-if [ -z $RUST_BACKTRACE_VALUE ];then
-	export RUST_BACKTRACE=1
-else
-	echo "RUST_BACKTRACE is set to: $RUST_BACKTRACE_VALUE"
-fi
+export RUST_BACKTRACE=1
 time target/$BUILD_TARGET/release/performance-metrics ${test_binary_args[*]}
 RES=$?

--- a/src/bin/ch-remote.rs
+++ b/src/bin/ch-remote.rs
@@ -688,7 +688,7 @@ fn main() {
    let toplevel: TopLevel = argh::from_env();

    if matches!(toplevel.command, SubCommandEnum::Version(_)) {
-        println!("{} {}", env!("CARGO_BIN_NAME"), env!("BUILD_VERSION"));
+        println!("{} {}", env!("CARGO_BIN_NAME"), env!("BUILT_VERSION"));
        return;
    }

--- a/src/main.rs
+++ b/src/main.rs
@@ -514,7 +514,7 @@ fn start_vmm(toplevel: TopLevel) -> Result<Option<String>, Error> {
    let exit_evt = EventFd::new(EFD_NONBLOCK).map_err(Error::CreateExitEventFd)?;

    let vmm_thread = vmm::start_vmm_thread(
-        vmm::VmmVersionInfo::new(env!("BUILD_VERSION"), env!("CARGO_PKG_VERSION")),
+        env!("CARGO_PKG_VERSION").to_string(),
        &api_socket_path,
        api_socket_fd,
        api_evt.try_clone().unwrap(),
@@ -587,7 +587,7 @@ fn main() {
    let toplevel: TopLevel = argh::from_env();

    if toplevel.version {
-        println!("{} {}", env!("CARGO_BIN_NAME"), env!("BUILD_VERSION"));
+        println!("{} {}", env!("CARGO_BIN_NAME"), env!("BUILT_VERSION"));
        return;
    }

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

 [dependencies]
-dirs = "5.0.0"
+dirs = "4.0.0"
 epoll = "4.3.1"
 libc = "0.2.139"
 once_cell = "1.17.1"
-serde = { version = "1.0.156", features = ["rc", "derive"] }
-serde_json = "1.0.96"
+serde = { version = "1.0.151", features = ["rc", "derive"] }
+serde_json = "1.0.95"
 ssh2 = { version = "0.9.4", features = ["vendored-openssl"] }
 vmm-sys-util = "0.11.0"
 wait-timeout = "0.2.0"
--- a/test_infra/src/lib.rs
+++ b/test_infra/src/lib.rs
@@ -868,6 +868,14 @@ impl Guest {
            .map_err(Error::Parsing)
    }

+    #[cfg(target_arch = "x86_64")]
+    pub fn get_initial_apicid(&self) -> Result<u32, Error> {
+        self.ssh_command("grep \"initial apicid\" /proc/cpuinfo | grep -o \"[0-9]*\"")?
+            .trim()
+            .parse()
+            .map_err(Error::Parsing)
+    }
+
    pub fn get_total_memory(&self) -> Result<u32, Error> {
        self.ssh_command("grep MemTotal /proc/meminfo | grep -o \"[0-9]*\"")?
            .trim()
--- a/tests/integration.rs
+++ b/tests/integration.rs
@@ -32,9 +32,6 @@ use test_infra::*;
 use vmm_sys_util::{tempdir::TempDir, tempfile::TempFile};
 use wait_timeout::ChildExt;

-// Constant taken from the VMM crate.
-const MAX_NUM_PCI_SEGMENTS: u16 = 96;
-
 #[cfg(target_arch = "x86_64")]
 mod x86_64 {
    pub const FOCAL_IMAGE_NAME: &str = "focal-server-cloudimg-amd64-custom-20210609-0.raw";
@@ -1209,10 +1206,7 @@ fn _test_virtio_fs(
        .default_net()
        .args(["--api-socket", &api_socket]);
    if pci_segment.is_some() {
-        guest_command.args([
-            "--platform",
-            &format!("num_pci_segments={MAX_NUM_PCI_SEGMENTS}"),
-        ]);
+        guest_command.args(["--platform", "num_pci_segments=16"]);
    }

    let fs_params = format!(
@@ -1948,6 +1942,7 @@ mod common_parallel {
            guest.wait_vm_boot(Some(120)).unwrap();

            assert_eq!(guest.get_cpu_count().unwrap_or_default(), 1);
+            assert_eq!(guest.get_initial_apicid().unwrap_or(1), 0);
            assert!(guest.get_total_memory().unwrap_or_default() > 480_000);
            assert_eq!(guest.get_pci_bridge_class().unwrap_or_default(), "0x060000");

@@ -2321,10 +2316,7 @@ mod common_parallel {
            .args(["--memory", "size=512M"])
            .args(["--kernel", direct_kernel_boot_path().to_str().unwrap()])
            .args(["--cmdline", DIRECT_KERNEL_BOOT_CMDLINE])
-            .args([
-                "--platform",
-                &format!("num_pci_segments={MAX_NUM_PCI_SEGMENTS},iommu_segments=[1]"),
-            ])
+            .args(["--platform", "num_pci_segments=16,iommu_segments=[1]"])
            .default_disks()
            .capture_output()
            .default_net();
@@ -2480,10 +2472,7 @@ mod common_parallel {
            .args(["--memory", "size=512M"])
            .args(["--kernel", direct_kernel_boot_path().to_str().unwrap()])
            .args(["--cmdline", DIRECT_KERNEL_BOOT_CMDLINE])
-            .args([
-                "--platform",
-                &format!("num_pci_segments={MAX_NUM_PCI_SEGMENTS}"),
-            ])
+            .args(["--platform", "num_pci_segments=16"])
            .args([
                "--disk",
                format!(
@@ -2510,15 +2499,15 @@ mod common_parallel {
        let grep_cmd = "lspci | grep \"Host bridge\" | wc -l";

        let r = std::panic::catch_unwind(|| {
-            // There should be MAX_NUM_PCI_SEGMENTS PCI host bridges in the guest.
+            // There should be 16 PCI host bridges in the guest.
            assert_eq!(
                guest
                    .ssh_command(grep_cmd)
                    .unwrap()
                    .trim()
-                    .parse::<u16>()
+                    .parse::<u32>()
                    .unwrap_or_default(),
-                MAX_NUM_PCI_SEGMENTS
+                16
            );

            // Check both if /dev/vdc exists and if the block size is 4M.
@@ -5307,10 +5296,7 @@ mod common_parallel {
            .capture_output();

        if pci_segment.is_some() {
-            cmd.args([
-                "--platform",
-                &format!("num_pci_segments={MAX_NUM_PCI_SEGMENTS}"),
-            ]);
+            cmd.args(["--platform", "num_pci_segments=16"]);
        }

        let mut child = cmd.spawn().unwrap();
@@ -5446,10 +5432,7 @@ mod common_parallel {
            .capture_output();

        if pci_segment.is_some() {
-            cmd.args([
-                "--platform",
-                &format!("num_pci_segments={MAX_NUM_PCI_SEGMENTS}"),
-            ]);
+            cmd.args(["--platform", "num_pci_segments=16"]);
        }

        let mut child = cmd.spawn().unwrap();
@@ -6277,13 +6260,11 @@ mod common_parallel {
    }

    #[test]
-    #[cfg_attr(target_arch = "aarch64", ignore = "See #5443")]
    fn test_macvtap() {
        _test_macvtap(false, "guestmacvtap0", "hostmacvtap0")
    }

    #[test]
-    #[cfg_attr(target_arch = "aarch64", ignore = "See #5443")]
    fn test_macvtap_hotplug() {
        _test_macvtap(true, "guestmacvtap1", "hostmacvtap1")
    }
--- a/tracer/Cargo.toml
+++ b/tracer/Cargo.toml
@@ -8,8 +8,8 @@ edition = "2021"
 libc = "0.2.139"
 log = "0.4.17"
 once_cell = "1.17.1"
-serde = { version = "1.0.156", features = ["rc", "derive"] }
-serde_json = "1.0.96"
+serde = { version = "1.0.151", features = ["rc", "derive"] }
+serde_json = "1.0.95"

 [features]
 tracing = []
--- a/vhost_user_block/src/main.rs
+++ b/vhost_user_block/src/main.rs
@@ -32,7 +32,7 @@ fn main() {
    let toplevel: TopLevel = argh::from_env();

    if toplevel.version {
-        println!("{} {}", env!("CARGO_BIN_NAME"), env!("BUILD_VERSION"));
+        println!("{} {}", env!("CARGO_BIN_NAME"), env!("BUILT_VERSION"));
        return;
    }

--- a/vhost_user_net/src/main.rs
+++ b/vhost_user_net/src/main.rs
@@ -28,7 +28,7 @@ fn main() {
    let toplevel: TopLevel = argh::from_env();

    if toplevel.version {
-        println!("{} {}", env!("CARGO_BIN_NAME"), env!("BUILD_VERSION"));
+        println!("{} {}", env!("CARGO_BIN_NAME"), env!("BUILT_VERSION"));
        return;
    }

--- a/virtio-devices/Cargo.toml
+++ b/virtio-devices/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 default = []

 [dependencies]
-anyhow = "1.0.70"
+anyhow = "1.0.69"
 arc-swap = "1.5.1"
 block_util = { path = "../block_util" }
 byteorder = "1.4.3"
@@ -22,8 +22,8 @@ net_util = { path = "../net_util" }
 pci = { path = "../pci" }
 rate_limiter = { path = "../rate_limiter" }
 seccompiler = "0.3.0"
-serde = { version = "1.0.156", features = ["derive"] }
-serde_json = "1.0.96"
+serde = { version = "1.0.151", features = ["derive"] }
+serde_json = "1.0.95"
 serial_buffer = { path = "../serial_buffer" }
 thiserror = "1.0.39"
 versionize = "0.1.10"
--- a/virtio-devices/src/lib.rs
+++ b/virtio-devices/src/lib.rs
@@ -91,8 +91,8 @@ pub enum ActivateError {
    ThreadSpawn(std::io::Error),
    #[error("Failed to setup vhost-user-fs daemon: {0}")]
    VhostUserFsSetup(vhost_user::Error),
-    #[error("Failed to setup vhost-user daemon: {0}")]
-    VhostUserSetup(vhost_user::Error),
+    #[error("Failed to setup vhost-user-blk daemon: {0}")]
+    VhostUserBlkSetup(vhost_user::Error),
    #[error("Failed to create seccomp filter: {0}")]
    CreateSeccompFilter(seccompiler::Error),
    #[error("Failed to create rate limiter: {0}")]
--- a/virtio-devices/src/vhost_user/mod.rs
+++ b/virtio-devices/src/vhost_user/mod.rs
@@ -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:?}"),
                ))
            })?;

@@ -340,7 +340,7 @@ impl VhostUserCommon {
                &slave_req_handler,
                inflight.as_mut(),
            )
-            .map_err(ActivateError::VhostUserSetup)?;
+            .map_err(ActivateError::VhostUserBlkSetup)?;

        Ok(VhostUserEpollHandler {
            vu: vu.clone(),
@@ -413,7 +413,7 @@ impl VhostUserCommon {
    pub fn pause(&mut self) -> std::result::Result<(), MigratableError> {
        if let Some(vu) = &self.vu {
            vu.lock().unwrap().pause_vhost_user().map_err(|e| {
-                MigratableError::Pause(anyhow!("Error pausing vhost-user backend: {:?}", e))
+                MigratableError::Pause(anyhow!("Error pausing vhost-user-blk backend: {:?}", e))
            })
        } else {
            Ok(())
@@ -423,7 +423,7 @@ impl VhostUserCommon {
    pub fn resume(&mut self) -> std::result::Result<(), MigratableError> {
        if let Some(vu) = &self.vu {
            vu.lock().unwrap().resume_vhost_user().map_err(|e| {
-                MigratableError::Resume(anyhow!("Error resuming vhost-user backend: {:?}", e))
+                MigratableError::Resume(anyhow!("Error resuming vhost-user-blk backend: {:?}", e))
            })
        } else {
            Ok(())
--- a/virtio-devices/src/vsock/packet.rs
+++ b/virtio-devices/src/vsock/packet.rs
@@ -436,6 +436,7 @@ mod tests {
    }

    #[test]
+    #[allow(clippy::cognitive_complexity)]
    fn test_tx_packet_assembly() {
        // Test case: successful TX packet assembly.
        {
@@ -580,6 +581,7 @@ mod tests {
    }

    #[test]
+    #[allow(clippy::cognitive_complexity)]
    fn test_packet_hdr_accessors() {
        const SRC_CID: u64 = 1;
        const DST_CID: u64 = 2;
--- a/vm-device/Cargo.toml
+++ b/vm-device/Cargo.toml
@@ -10,10 +10,10 @@ kvm = ["vfio-ioctls/kvm"]
 mshv = ["vfio-ioctls/mshv"]

 [dependencies]
-anyhow = "1.0.70"
+anyhow = "1.0.69"
 hypervisor = { path = "../hypervisor" }
 thiserror = "1.0.39"
-serde = { version = "1.0.156", features = ["rc", "derive"] }
+serde = { version = "1.0.151", features = ["rc", "derive"] }
 vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false }
 vm-memory = { version = "0.10.0", features = ["backend-mmap"] }
 vmm-sys-util = "0.11.0"
--- a/vm-migration/Cargo.toml
+++ b/vm-migration/Cargo.toml
@@ -5,10 +5,10 @@ authors = ["The Cloud Hypervisor Authors"]
 edition = "2021"

 [dependencies]
-anyhow = "1.0.70"
+anyhow = "1.0.69"
 thiserror = "1.0.39"
-serde = { version = "1.0.156", features = ["rc", "derive"] }
-serde_json = "1.0.96"
+serde = { version = "1.0.151", features = ["rc", "derive"] }
+serde_json = "1.0.95"
 versionize = "0.1.10"
 versionize_derive = "0.1.4"
 vm-memory = { version = "0.10.0", features = ["backend-mmap", "backend-atomic"] }
--- a/vm-migration/src/lib.rs
+++ b/vm-migration/src/lib.rs
@@ -12,8 +12,8 @@ use versionize::{VersionMap, Versionize};
 pub mod protocol;

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

 pub trait VersionMapped {
--- a/vmm/Cargo.toml
+++ b/vmm/Cargo.toml
@@ -14,7 +14,7 @@ tracing = ["tracer/tracing"]

 [dependencies]
 acpi_tables = { git = "https://github.com/rust-vmm/acpi_tables", branch = "main"  }
-anyhow = "1.0.70"
+anyhow = "1.0.69"
 arc-swap = "1.5.1"
 arch = { path = "../arch" }
 bitflags = "1.3.2"
@@ -35,8 +35,8 @@ option_parser = { path = "../option_parser" }
 pci = { path = "../pci" }
 qcow = { path = "../qcow" }
 seccompiler = "0.3.0"
-serde = { version = "1.0.156", features = ["rc", "derive"] }
-serde_json = "1.0.96"
+serde = { version = "1.0.151", features = ["rc", "derive"] }
+serde_json = "1.0.95"
 serial_buffer = { path = "../serial_buffer" }
 signal-hook = "0.3.15"
 thiserror = "1.0.39"
--- a/vmm/src/acpi.rs
+++ b/vmm/src/acpi.rs
@@ -41,7 +41,7 @@ pub const ACPI_APIC_GENERIC_TRANSLATOR: u8 = 15;

 #[allow(dead_code)]
 #[repr(packed)]
-#[derive(Default, AsBytes)]
+#[derive(Default)]
 struct PciRangeEntry {
    pub base_address: u64,
    pub segment: u16,
@@ -52,7 +52,7 @@ struct PciRangeEntry {

 #[allow(dead_code)]
 #[repr(packed)]
-#[derive(Default, AsBytes)]
+#[derive(Default)]
 struct MemoryAffinity {
    pub type_: u8,
    pub length: u8,
@@ -69,7 +69,7 @@ struct MemoryAffinity {

 #[allow(dead_code)]
 #[repr(packed)]
-#[derive(Default, AsBytes)]
+#[derive(Default)]
 struct ProcessorLocalX2ApicAffinity {
    pub type_: u8,
    pub length: u8,
@@ -83,7 +83,7 @@ struct ProcessorLocalX2ApicAffinity {

 #[allow(dead_code)]
 #[repr(packed)]
-#[derive(Default, AsBytes)]
+#[derive(Default)]
 struct ProcessorGiccAffinity {
    pub type_: u8,
    pub length: u8,
@@ -143,7 +143,7 @@ impl MemoryAffinity {

 #[allow(dead_code)]
 #[repr(packed)]
-#[derive(Default, AsBytes)]
+#[derive(Default)]
 struct ViotVirtioPciNode {
    pub type_: u8,
    _reserved: u8,
@@ -155,7 +155,7 @@ struct ViotVirtioPciNode {

 #[allow(dead_code)]
 #[repr(packed)]
-#[derive(Default, AsBytes)]
+#[derive(Default)]
 struct ViotPciRangeNode {
    pub type_: u8,
    _reserved: u8,
@@ -239,7 +239,7 @@ fn create_facp_table(dsdt_offset: GuestAddress, device_manager: &Arc<Mutex<Devic
    // X_DSDT
    facp.write(140, dsdt_offset.0);
    // Hypervisor Vendor Identity
-    facp.write_bytes(268, b"CLOUDHYP");
+    facp.write(268, b"CLOUDHYP");

    facp.update_checksum();

--- a/vmm/src/api/mod.rs
+++ b/vmm/src/api/mod.rs
@@ -165,9 +165,7 @@ pub struct VmInfo {

 #[derive(Clone, Deserialize, Serialize)]
 pub struct VmmPingResponse {
-    pub build_version: String,
    pub version: String,
-    pub pid: i64,
 }

 #[derive(Clone, Deserialize, Serialize, Default, Debug)]
@@ -232,6 +230,7 @@ pub enum ApiResponsePayload {
 /// This is the response sent by the VMM API server through the mpsc channel.
 pub type ApiResponse = std::result::Result<ApiResponsePayload, ApiError>;

+#[allow(clippy::large_enum_variant)]
 #[derive(Debug)]
 pub enum ApiRequest {
    /// Create the virtual machine. This request payload is a VM configuration
--- a/vmm/src/api/openapi/cloud-hypervisor.yaml
+++ b/vmm/src/api/openapi/cloud-hypervisor.yaml
@@ -438,13 +438,8 @@ components:
        - version
      type: object
      properties:
-        build_version:
-          type: string
        version:
          type: string
-        pid:
-          type: integer
-          format: int64
      description: Virtual Machine Monitor information

    VmInfo:
--- a/vmm/src/config.rs
+++ b/vmm/src/config.rs
@@ -17,7 +17,7 @@ use std::str::FromStr;
 use thiserror::Error;
 use virtio_devices::{RateLimiterConfig, TokenBucketConfig};

-const MAX_NUM_PCI_SEGMENTS: u16 = 96;
+const MAX_NUM_PCI_SEGMENTS: u16 = 16;

 /// Errors associated with VM configuration parameters.
 #[derive(Debug, Error)]
@@ -2947,26 +2947,24 @@ mod tests {

        let mut still_valid_config = valid_config.clone();
        still_valid_config.platform = Some(PlatformConfig {
-            num_pci_segments: MAX_NUM_PCI_SEGMENTS,
+            num_pci_segments: 16,
            ..Default::default()
        });
        assert!(still_valid_config.validate().is_ok());

        let mut invalid_config = valid_config.clone();
        invalid_config.platform = Some(PlatformConfig {
-            num_pci_segments: MAX_NUM_PCI_SEGMENTS + 1,
+            num_pci_segments: 17,
            ..Default::default()
        });
        assert_eq!(
            invalid_config.validate(),
-            Err(ValidationError::InvalidNumPciSegments(
-                MAX_NUM_PCI_SEGMENTS + 1
-            ))
+            Err(ValidationError::InvalidNumPciSegments(17))
        );

        let mut still_valid_config = valid_config.clone();
        still_valid_config.platform = Some(PlatformConfig {
-            num_pci_segments: MAX_NUM_PCI_SEGMENTS,
+            num_pci_segments: 16,
            iommu_segments: Some(vec![1, 2, 3]),
            ..Default::default()
        });
@@ -2974,18 +2972,18 @@ mod tests {

        let mut invalid_config = valid_config.clone();
        invalid_config.platform = Some(PlatformConfig {
-            num_pci_segments: MAX_NUM_PCI_SEGMENTS,
-            iommu_segments: Some(vec![MAX_NUM_PCI_SEGMENTS + 1, MAX_NUM_PCI_SEGMENTS + 2]),
+            num_pci_segments: 16,
+            iommu_segments: Some(vec![17, 18]),
            ..Default::default()
        });
        assert_eq!(
            invalid_config.validate(),
-            Err(ValidationError::InvalidPciSegment(MAX_NUM_PCI_SEGMENTS + 1))
+            Err(ValidationError::InvalidPciSegment(17))
        );

        let mut still_valid_config = valid_config.clone();
        still_valid_config.platform = Some(PlatformConfig {
-            num_pci_segments: MAX_NUM_PCI_SEGMENTS,
+            num_pci_segments: 16,
            iommu_segments: Some(vec![1, 2, 3]),
            ..Default::default()
        });
@@ -2998,7 +2996,7 @@ mod tests {

        let mut still_valid_config = valid_config.clone();
        still_valid_config.platform = Some(PlatformConfig {
-            num_pci_segments: MAX_NUM_PCI_SEGMENTS,
+            num_pci_segments: 16,
            iommu_segments: Some(vec![1, 2, 3]),
            ..Default::default()
        });
@@ -3011,7 +3009,7 @@ mod tests {

        let mut still_valid_config = valid_config.clone();
        still_valid_config.platform = Some(PlatformConfig {
-            num_pci_segments: MAX_NUM_PCI_SEGMENTS,
+            num_pci_segments: 16,
            iommu_segments: Some(vec![1, 2, 3]),
            ..Default::default()
        });
@@ -3024,7 +3022,7 @@ mod tests {

        let mut still_valid_config = valid_config.clone();
        still_valid_config.platform = Some(PlatformConfig {
-            num_pci_segments: MAX_NUM_PCI_SEGMENTS,
+            num_pci_segments: 16,
            iommu_segments: Some(vec![1, 2, 3]),
            ..Default::default()
        });
@@ -3037,7 +3035,7 @@ mod tests {

        let mut still_valid_config = valid_config.clone();
        still_valid_config.platform = Some(PlatformConfig {
-            num_pci_segments: MAX_NUM_PCI_SEGMENTS,
+            num_pci_segments: 16,
            iommu_segments: Some(vec![1, 2, 3]),
            ..Default::default()
        });
@@ -3050,7 +3048,7 @@ mod tests {

        let mut invalid_config = valid_config.clone();
        invalid_config.platform = Some(PlatformConfig {
-            num_pci_segments: MAX_NUM_PCI_SEGMENTS,
+            num_pci_segments: 16,
            iommu_segments: Some(vec![1, 2, 3]),
            ..Default::default()
        });
@@ -3066,7 +3064,7 @@ mod tests {

        let mut invalid_config = valid_config.clone();
        invalid_config.platform = Some(PlatformConfig {
-            num_pci_segments: MAX_NUM_PCI_SEGMENTS,
+            num_pci_segments: 16,
            iommu_segments: Some(vec![1, 2, 3]),
            ..Default::default()
        });
@@ -3082,7 +3080,7 @@ mod tests {

        let mut invalid_config = valid_config.clone();
        invalid_config.platform = Some(PlatformConfig {
-            num_pci_segments: MAX_NUM_PCI_SEGMENTS,
+            num_pci_segments: 16,
            iommu_segments: Some(vec![1, 2, 3]),
            ..Default::default()
        });
@@ -3098,7 +3096,7 @@ mod tests {

        let mut invalid_config = valid_config.clone();
        invalid_config.platform = Some(PlatformConfig {
-            num_pci_segments: MAX_NUM_PCI_SEGMENTS,
+            num_pci_segments: 16,
            iommu_segments: Some(vec![1, 2, 3]),
            ..Default::default()
        });
@@ -3114,7 +3112,7 @@ mod tests {

        let mut invalid_config = valid_config.clone();
        invalid_config.platform = Some(PlatformConfig {
-            num_pci_segments: MAX_NUM_PCI_SEGMENTS,
+            num_pci_segments: 16,
            iommu_segments: Some(vec![1, 2, 3]),
            ..Default::default()
        });
@@ -3131,7 +3129,7 @@ mod tests {
        let mut invalid_config = valid_config.clone();
        invalid_config.memory.shared = true;
        invalid_config.platform = Some(PlatformConfig {
-            num_pci_segments: MAX_NUM_PCI_SEGMENTS,
+            num_pci_segments: 16,
            iommu_segments: Some(vec![1, 2, 3]),
            ..Default::default()
        });
@@ -3146,7 +3144,7 @@ mod tests {

        let mut invalid_config = valid_config.clone();
        invalid_config.platform = Some(PlatformConfig {
-            num_pci_segments: MAX_NUM_PCI_SEGMENTS,
+            num_pci_segments: 16,
            iommu_segments: Some(vec![1, 2, 3]),
            ..Default::default()
        });
@@ -3162,7 +3160,7 @@ mod tests {
        let mut invalid_config = valid_config.clone();
        invalid_config.memory.shared = true;
        invalid_config.platform = Some(PlatformConfig {
-            num_pci_segments: MAX_NUM_PCI_SEGMENTS,
+            num_pci_segments: 16,
            iommu_segments: Some(vec![1, 2, 3]),
            ..Default::default()
        });
--- a/vmm/src/cpu.rs
+++ b/vmm/src/cpu.rs
@@ -84,7 +84,6 @@ use vm_migration::{
 };
 use vmm_sys_util::eventfd::EventFd;
 use vmm_sys_util::signal::{register_signal_handler, SIGRTMIN};
-use zerocopy::AsBytes;

 #[cfg(all(target_arch = "aarch64", feature = "guest_debug"))]
 /// Extract the specified bits of a 64-bit integer.
@@ -177,7 +176,6 @@ pub type Result<T> = result::Result<T, Error>;
 #[cfg(target_arch = "x86_64")]
 #[allow(dead_code)]
 #[repr(packed)]
-#[derive(AsBytes)]
 struct LocalApic {
    pub r#type: u8,
    pub length: u8,
@@ -188,7 +186,7 @@ struct LocalApic {

 #[allow(dead_code)]
 #[repr(packed)]
-#[derive(Default, AsBytes)]
+#[derive(Default)]
 struct Ioapic {
    pub r#type: u8,
    pub length: u8,
@@ -201,7 +199,6 @@ struct Ioapic {
 #[cfg(target_arch = "aarch64")]
 #[allow(dead_code)]
 #[repr(packed)]
-#[derive(AsBytes)]
 struct GicC {
    pub r#type: u8,
    pub length: u8,
@@ -226,7 +223,6 @@ struct GicC {
 #[cfg(target_arch = "aarch64")]
 #[allow(dead_code)]
 #[repr(packed)]
-#[derive(AsBytes)]
 struct GicD {
    pub r#type: u8,
    pub length: u8,
@@ -241,7 +237,6 @@ struct GicD {
 #[cfg(target_arch = "aarch64")]
 #[allow(dead_code)]
 #[repr(packed)]
-#[derive(AsBytes)]
 struct GicR {
    pub r#type: u8,
    pub length: u8,
@@ -253,7 +248,6 @@ struct GicR {
 #[cfg(target_arch = "aarch64")]
 #[allow(dead_code)]
 #[repr(packed)]
-#[derive(AsBytes)]
 struct GicIts {
    pub r#type: u8,
    pub length: u8,
@@ -266,7 +260,6 @@ struct GicIts {
 #[cfg(target_arch = "aarch64")]
 #[allow(dead_code)]
 #[repr(packed)]
-#[derive(AsBytes)]
 struct ProcessorHierarchyNode {
    pub r#type: u8,
    pub length: u8,
@@ -279,7 +272,7 @@ struct ProcessorHierarchyNode {

 #[allow(dead_code)]
 #[repr(packed)]
-#[derive(Default, AsBytes)]
+#[derive(Default)]
 struct InterruptSourceOverride {
    pub r#type: u8,
    pub length: u8,
@@ -1283,7 +1276,7 @@ impl CpuManager {
        let mut madt = Sdt::new(*b"APIC", 44, 5, *b"CLOUDH", *b"CHMADT  ", 1);
        #[cfg(target_arch = "x86_64")]
        {
-            madt.write(36, arch::layout::APIC_START.0);
+            madt.write(36, arch::layout::APIC_START);

            for cpu in 0..self.config.max_vcpus {
                let lapic = LocalApic {
--- a/vmm/src/device_manager.rs
+++ b/vmm/src/device_manager.rs
@@ -4278,7 +4278,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_.PC{i:02X}.PCNT").as_str().into(),
+                format!("\\_SB_.PCI{i:X}.PCNT").as_str().into(),
                vec![],
            ));
        }
--- a/vmm/src/device_tree.rs
+++ b/vmm/src/device_tree.rs
@@ -109,8 +109,7 @@ pub struct BftIter<'a> {

 impl<'a> BftIter<'a> {
    fn new(hash_map: &'a HashMap<String, DeviceNode>) -> Self {
-        let mut nodes = Vec::with_capacity(hash_map.len());
-        let mut i = 0;
+        let mut nodes = Vec::new();

        for (_, node) in hash_map.iter() {
            if node.parent.is_none() {
@@ -118,13 +117,26 @@ impl<'a> BftIter<'a> {
            }
        }

-        while i < nodes.len() {
-            for child_node_id in nodes[i].children.iter() {
-                if let Some(child_node) = hash_map.get(child_node_id) {
-                    nodes.push(child_node);
+        let mut node_layer = nodes.as_slice();
+        loop {
+            let mut next_node_layer = Vec::new();
+
+            for node in node_layer.iter() {
+                for child_node_id in node.children.iter() {
+                    if let Some(child_node) = hash_map.get(child_node_id) {
+                        next_node_layer.push(child_node);
+                    }
                }
            }
-            i += 1;
+
+            if next_node_layer.is_empty() {
+                break;
+            }
+
+            let pos = nodes.len();
+            nodes.extend(next_node_layer);
+
+            node_layer = &nodes[pos..];
        }

        BftIter { nodes }
--- a/vmm/src/gdb.rs
+++ b/vmm/src/gdb.rs
@@ -435,6 +435,7 @@ impl run_blocking::BlockingEventLoop for GdbEventLoop {
    type Connection = Box<dyn ConnectionExt<Error = std::io::Error>>;
    type StopReason = MultiThreadStopReason<ArchUsize>;

+    #[allow(clippy::type_complexity)]
    fn wait_for_stop_reason(
        target: &mut Self::Target,
        conn: &mut Self::Connection,
--- a/vmm/src/lib.rs
+++ b/vmm/src/lib.rs
@@ -80,6 +80,7 @@ type GuestRegionMmap = vm_memory::GuestRegionMmap<AtomicBitmap>;

 /// Errors associated with VMM management
 #[derive(Debug, Error)]
+#[allow(clippy::large_enum_variant)]
 pub enum Error {
    /// API request receive error
    #[error("Error receiving API request: {0}")]
@@ -279,7 +280,7 @@ impl Serialize for PciDeviceInfo {
 #[allow(unused_variables)]
 #[allow(clippy::too_many_arguments)]
 pub fn start_vmm_thread(
-    vmm_version: VmmVersionInfo,
+    vmm_version: String,
    http_path: &Option<String>,
    http_fd: Option<RawFd>,
    api_event: EventFd,
@@ -320,7 +321,7 @@ pub fn start_vmm_thread(
                }

                let mut vmm = Vmm::new(
-                    vmm_version,
+                    vmm_version.to_string(),
                    api_event,
                    #[cfg(feature = "guest_debug")]
                    debug_event,
@@ -388,21 +389,6 @@ struct VmMigrationConfig {
    memory_manager_data: MemoryManagerSnapshotData,
 }

-#[derive(Debug, Clone)]
-pub struct VmmVersionInfo {
-    pub build_version: String,
-    pub version: String,
-}
-
-impl VmmVersionInfo {
-    pub fn new(build_version: &str, version: &str) -> Self {
-        Self {
-            build_version: build_version.to_owned(),
-            version: version.to_owned(),
-        }
-    }
-}
-
 pub struct Vmm {
    epoll: EpollContext,
    exit_evt: EventFd,
@@ -412,7 +398,7 @@ pub struct Vmm {
    debug_evt: EventFd,
    #[cfg(feature = "guest_debug")]
    vm_debug_evt: EventFd,
-    version: VmmVersionInfo,
+    version: String,
    vm: Option<Vm>,
    vm_config: Option<Arc<Mutex<VmConfig>>>,
    seccomp_action: SeccompAction,
@@ -504,7 +490,7 @@ impl Vmm {
    }

    fn new(
-        vmm_version: VmmVersionInfo,
+        vmm_version: String,
        api_evt: EventFd,
        #[cfg(feature = "guest_debug")] debug_evt: EventFd,
        #[cfg(feature = "guest_debug")] vm_debug_evt: EventFd,
@@ -828,15 +814,8 @@ impl Vmm {
    }

    fn vmm_ping(&self) -> VmmPingResponse {
-        let VmmVersionInfo {
-            build_version,
-            version,
-        } = self.version.clone();
-
        VmmPingResponse {
-            build_version,
-            version,
-            pid: std::process::id() as i64,
+            version: self.version.clone(),
        }
    }

@@ -2091,7 +2070,7 @@ mod unit_tests {

    fn create_dummy_vmm() -> Vmm {
        Vmm::new(
-            VmmVersionInfo::new("dummy", "dummy"),
+            "dummy".to_string(),
            EventFd::new(EFD_NONBLOCK).unwrap(),
            #[cfg(feature = "guest_debug")]
            EventFd::new(EFD_NONBLOCK).unwrap(),
--- a/vmm/src/pci_segment.rs
+++ b/vmm/src/pci_segment.rs
@@ -418,7 +418,7 @@ impl Aml for PciSegment {
        pci_dsdt_inner_data.push(&prt);

        aml::Device::new(
-            format!("_SB_.PC{:02X}", self.id).as_str().into(),
+            format!("_SB_.PCI{:X}", self.id).as_str().into(),
            pci_dsdt_inner_data,
        )
        .to_aml_bytes(sink)
Author	SHA1	Message	Date
Bo Chen	3a63fa2613	build: Release v31.2 (bug fix release) Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-07-06 14:55:05 -07:00
Bo Chen	3a63143f33	misc: Address clippy beta issues Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-07-05 09:36:08 -07:00
Rob Bradford	064c1e2c8b	virtio-devices: Avoid clashing names in imports Don't import via glob to avoid (unused) objects colliding in the namespace. This fixes a beta clippy issue. Signed-off-by: Rob Bradford <rbradford@rivosinc.com>	2023-07-05 09:36:08 -07:00
Rob Bradford	15b9d14876	net_gen: Avoid clashing names in imports Remove use of glob imports to fix an issue detected by clippy. Signed-off-by: Rob Bradford <rbradford@rivosinc.com>	2023-07-05 09:36:08 -07:00
Alyssa Ross	9da363e79b	vmm: ignore and warn TAP FDs send in vm.create This does the same thing as `df2a7c17` ("vmm: Ignore and warn TAP FDs sent via the HTTP request body"), but for the vm.create endpoint, which also previously would accept file descriptors in the body, and try to use whatever fd occupied that number as a TAP device. Signed-off-by: Alyssa Ross <hi@alyssa.is>	2023-07-05 09:36:08 -07:00
Alyssa Ross	bbfd810c3b	vmm: allow restart_syscall() in PTY process This can be triggered by debugging cloud-hypervisor using gdb, or probably if the process is suspended and restarted. Fixes: https://github.com/cloud-hypervisor/cloud-hypervisor/issues/5489 Signed-off-by: Alyssa Ross <hi@alyssa.is>	2023-07-05 09:36:08 -07:00
Jianyong Wu	8fb86d2284	vfio: fix vfio device fail to initialize issue for 64k page size Currently, vfio device fails to initialize as the msix-cap region in BAR is mapped as RW region. To resolve the initialization issue, this commit avoids mapping the msix-cap region in the BAR. However, this solution introduces another problem where aligning the msix table offset in the BAR to the page size may cause overlap with the MMIO RW region, leading to reduced performance. By enlarging the entire region in the BAR and relocating the msix table to achieve page size alignment, this problem can be overcomed effectively. Fixes: #5292 Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>	2023-07-05 09:36:08 -07:00
Jianyong Wu	797110cca1	vm-allocator: Add page size related functions To avoid code duplication extract page related functions to their own module and add utility functions for manipulating addresses related to page sizes Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>	2023-07-05 09:36:08 -07:00
Bo Chen	19ca5c0b84	vmm: Clarify memory regions are required to be page-size aligned Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-07-05 09:36:08 -07:00
Bo Chen	9fe9b8504d	arch: Refactor the way of creating memory mapping This patch clarifies the assumptions we have regarding the guest address space layout while creating memory mapping in E820 on x86_64 and fdt on aarch64. It also explicitly checks on these assumptions and report errors if these assumptions do not hold. Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-07-05 09:36:08 -07:00
Yu Li	4fc3dd5004	vmm: memory_manager: align down the rest space of ram_region This commit renames `ram_region_sub_size` to `ram_region_available_size` and make its value align down to the default page size or hugepage size of the current memory zone, which can prevent the memory zone from being split into misaligned parts. And if the available size of ram region is zero, this region will be marked as consumed even it has unused space. Note that there is two methods to use hugepages. 1. Specify `hugepages` for `memory` or `memory-zone`, if the `hugepage_size` is not specified, the value can be got by `statfs` for `/dev/hugepages`. 2. Specify a `file` in hugetlbfs for `memory-zone`, the hugepage size can also be got by `statfs` for the file. The value for alignment will be the hugepage size if this memory zone is using hugepages, otherwise the value will be default page size of system. Fixes: #5463 Signed-off-by: Yu Li <liyu.yukiteru@bytedance.com>	2023-07-05 09:36:08 -07:00
Yu Li	6bc6365c35	arch: let `arch_memory_regions` return all available regions The previous `arch_memory_regions` function will provide some memory regions with the specified memory size and fill all the previous regions before using the next one, but sometimes there may be no need to fill up the previous one, e.g., the previous one should be aligned with hugepage size. This commit make `arch_memory_regions` function not take any parameters and return the max available regions, the memory manager can use them on demand. Fixes: #5463 Signed-off-by: Yu Li <liyu.yukiteru@bytedance.com>	2023-07-05 09:36:08 -07:00
Yu Li	e139cdfd69	arch: create memory mapping by the actual memory info The original codes did not consider that the previous memory region might not be full and always set it to the maximum size. This commit fixes this problem by creating memory mappings based on the actual memory details in both E820 on x86_64 and fdt on aarch64. Fixes: #5463 Signed-off-by: Yu Li <liyu.yukiteru@bytedance.com>	2023-07-05 09:36:08 -07:00
Yu Li	541de8b757	logger: use `write` with `\r\n` instead of `writeln` The device manager will set tty or pty to raw mode, all the `\n` will be LF without CR, which makes the output difficult to read. This commit solves it by using `write` with `\r\n` instead of `writeln`, which can print CR and LF explicitly. Signed-off-by: Yu Li <liyu.yukiteru@bytedance.com>	2023-07-05 09:36:08 -07:00
Yu Li	184dac70a0	vmm: use `unwrap_or` instead of `match` for `prefault` Signed-off-by: Yu Li <liyu.yukiteru@bytedance.com>	2023-07-05 09:36:08 -07:00
Jianyong Wu	022b489e7b	arch: x86_64: Populate the APIC Id Program the APIC ID (CPUID leaf 0x1 EBX) with the CPU id. This resolves an issue where the EDKII firmware expects the APIC ID to vary per-CPU. Fixes: #5475 Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>	2023-07-05 09:36:08 -07:00
Alyssa Ross	399e2f9f7d	vmm, virtio-devices: allow mremap for consoles SerialBuffer uses VecDeque::extend, which calls realloc, which a maximum buffer size of 1 MiB. Starting at allocation sizes of 128 KiB, musl's mallocng allocator will use mremap for the allocation. Since this was not permitted by the seccomp rules, heavy write load could crash cloud-hypervisor with a seccomp failure. (Encountered using virtio-console, but I don't see any reason it wouldn't happen for the legacy serial device too.) Signed-off-by: Alyssa Ross <hi@alyssa.is>	2023-07-05 09:36:08 -07:00
Rafael Mendonca	22cc96494f	main: Fix error propagation if starting the VM fails Commit `21d40d7` ("main: reset tty if starting the VM fails") changed start_vmm() to join the vmm thread if an error happens after the vmm thread is started. The implementation put all the error-prone code that is run after the vmm is started in a closure, to be able to always join the vmm thread, regardless of any error happening. However, it missed propagating the error that might happen inside the closure back to the main function, after joining the vmm thread. For some cmd line options, the above issue inhibits proper error reporting when starting a VM with invalid commands, as many parameters are parsed after the vmm is started, thus if such parsing fails, no error will be reported back to the user. See: #5435 Fixes: `21d40d7` ("main: reset tty if starting the VM fails") Signed-off-by: Rafael Mendonca <rafaelmendsr@gmail.com>	2023-07-05 09:36:08 -07:00
Bo Chen	f98402ec15	vmm: Allocate guest memory address space before TDX initialization The refactoring on deferring address space allocation (#5169) broke TDX, as TDX initialization needs to access guest memory for encryption and measurement of guest pages. Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-07-05 09:36:08 -07:00
Jianyong Wu	acc54ade7b	vfio: align memory region size and address to PAGE_SIZE In current implementation, memory region used in vfio is assumed to align to 4k which may cause error when the PAGE_SIZE is not 4k, like on Arm, it can be 16k and 64k. Remove this assumption and align memory resource used by vfio to PAGE_SIZE then vfio can run on host with 64k PAGE_SIZE. Fixes: #5292 Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>	2023-07-05 09:36:08 -07:00
Alyssa Ross	0ebbb3f8a2	vmm: allow getdents64 in seccomp filter This is used on older kernels where close_range() is not available. Signed-off-by: Alyssa Ross <hi@alyssa.is> Fixes: `505f4dfa` ("vmm: close all unused fds in sigwinch listener")	2023-07-05 09:36:08 -07:00
Anatol Belski	95511287ec	tests: Enable topology integration tests under mshv Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>	2023-07-05 09:36:08 -07:00
Anatol Belski	5a3af30e6a	seccomp: Add filter entry for MSHV_VP_REGISTER_INTERCEPT_RESULT Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>	2023-07-05 09:36:08 -07:00
Anatol Belski	034b48faf7	mshv: Pass topology explicitly while constructing cpuid Unlike KVM, there's no internal handling for topoolgy under MSHV. Thus, if no topology has been passed during the CH launch, use the boot CPUs count to construct the topology struct. Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>	2023-07-05 09:36:08 -07:00
Anatol Belski	ba3e02ce86	hypervisor: mshv: Implement set_cpuid2 call Passing the CPUID leafs with the topology is integrated into the common mechanism of setting and patching CPUID in Cloud Hypervisor. All the CPUID values will be passed to the hypervisor through the register intercept call. Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>	2023-07-05 09:36:08 -07:00
Alyssa Ross	5492259af9	main: reset tty if starting the VM fails When I refactored this to centralise resetting the tty into DeviceManager::drop, I tested that the tty was reset if an error happened on the vmm thread, but not on the main thread. It turns out that if an error happened on the main thread, the process would just exit, so drop handlers on other threads wouldn't get run. To fix this, I've changed start_vmm() to write to the VMM's exit eventfd and then join the thread if an error happens after the vmm thread is started. Fixes: `b6feae0a` ("vmm: only touch the tty flags if it's being used") Signed-off-by: Alyssa Ross <hi@alyssa.is>	2023-07-05 09:36:08 -07:00
Alyssa Ross	cc1254d5e1	vmm: reset to the original termios Previously, we used two different functions for configuring ttys. vmm_sys_util::terminal::Terminal::set_raw_mode() was used to configure stdio ttys, and cfmakeraw() was used to configure ptys created by cloud-hypervisor. When I centralized the stdio tty cleanup, I also switched to using cfmakeraw() everywhere, to avoid duplication. cfmakeraw sets the OPOST flag, but when we later reset the ttys, we used vmm_sys_util::terminal::Terminal::set_canon_mode(), which does not unset this flag. This meant that the terminal was getting mostly, but not fully, reset. To fix this without depending on the implementation of cfmakeraw(), let's just store the original termios for stdio terminals, and restore them to exactly the state we found them in when cloud-hypervisor exits. Fixes: `b6feae0a` ("vmm: only touch the tty flags if it's being used") Signed-off-by: Alyssa Ross <hi@alyssa.is>	2023-07-05 09:36:08 -07:00
Rob Bradford	34bb3319d4	hypervisor, vmm: Limit max number of vCPUs to hypervisor maximum On KVM this is provided by an ioctl, on MSHV this is constant. Although there is a HV_MAXIMUM_PROCESSORS constant the MSHV ioctl API is limited to u8. Signed-off-by: Rob Bradford <rbradford@rivosinc.com>	2023-07-05 09:36:08 -07:00
Bo Chen	d530569ac2	build: Release v31.1 (bug fix release) Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-04-18 16:41:02 -07:00
Bo Chen	75956e64ec	tests: Extend '_test_macvtap()' with reboot In this way, we can cover the scenario where a VM with hotplugged net device using FDs can work properly with reboot. Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-04-18 10:47:33 -07:00
Bo Chen	ae646c2a00	vmm: Add valid FDs for TAP devices to 'VmConfig::preserved_fds' In this way, valid FDs for TAP devices will be closed when the holding VmConfig instance is destroyed. Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-04-18 10:47:33 -07:00
Bo Chen	04d3e5bbf5	vmm: Add unit test for 'VmConfig::preserved_fds' Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-04-18 10:47:33 -07:00
Bo Chen	cbe972659c	vmm: Implement Clone and Drop for VmConfig The custom 'clone' duplicates 'preserved_fds' so that the validation logic can be safely carried out on the clone of the VmConfig. The custom 'drop' ensures 'preserved_fds' are safely closed when the holding VmConfig instance is destroyed. Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-04-18 10:47:33 -07:00
Bo Chen	1e4e03d110	vmm: config: Extend 'VmConfig' with 'preserved_fds' Preserved FDs are the ones that share the same life-time as its holding VmConfig instance, such as FDs for creating TAP devices. Preserved FDs will stay open as long as the holding VmConfig instance is valid, and will be closed when the holding VmConfig instance is destroyed. Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-04-18 10:47:33 -07:00
Bo Chen	4876f7550d	Revert "vmm: config: Implement Clone for NetConfig" This reverts commit `ea4a95c4f6`. Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-04-18 10:47:33 -07:00
Bo Chen	c0146e3ef1	Revert "vmm: config: Close FDs for TAP devices that are provided to VM" This reverts commit `b14427540b`. Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-04-18 10:47:33 -07:00
Bo Chen	77a205881b	Revert "vmm: config: Don't close reserved FDs from `NetConfig::drop()`" This reverts commit `0110fb4edc`. Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-04-18 10:47:33 -07:00
Bo Chen	321421c53e	Revert "vmm: config: Avoid closing invalid FDs from 'test_net_parsing()'" This reverts commit `0567def931`. Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-04-18 10:47:33 -07:00
Bo Chen	48a87e699d	Revert "vmm: config: Replace use of memfd_create with fd pointing to /dev/null" This reverts commit `46066d6ae1`. Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-04-18 10:47:33 -07:00
Alyssa Ross	147a800d5d	vmm: only touch the tty flags if it's being used When neither serial nor console are connected to the tty, cloud-hypervisor shouldn't touch the tty at all. One way in which this is annoying is that if I am running cloud-hypervisor without it using my terminal, I expect to be able to suspend it with ^Z like any other process, but that doesn't work if it's put the terminal into raw mode. Instead of putting the tty into raw mode when a VM is created or restored, do it when a serial or console device is created. Since we now know it can't be put into raw mode until the Vm object is created, we can move setting it back to canon mode into the drop handler for that object, which should always be run in normal operation. We still also put the tty into canon mode in the SIGTERM / SIGINT handler, but check whether the tty was actually used, rather than whether stdin is a tty. This requires passing on_tty around as an atomic boolean. I explored more of an abstraction over the tty — having an object that encapsulated stdout and put the tty into raw mode when initialized and into canon mode when dropped — but it wasn't practical, mostly due to the special requirements of the signal handler. I also investigated whether the SIGWINCH listener process could be used here, which I think would have worked but I'm hesitant to involve it in serial handling as well as conosle handling. There's no longer a check for whether the file descriptor is a tty before setting it into canon mode — it's redundant, because if it's not a tty it just won't respond to the ioctl. Tested by shutting down through the API, SIGTERM, and an error injected after setting raw mode. Signed-off-by: Alyssa Ross <hi@alyssa.is>	2023-04-18 10:47:33 -07:00
Alyssa Ross	eaf8cbd47d	vmm: don't redundantly set the TTY to canon mode If the VM is shut down, either it's going to be started again, in which case we still want to be in raw mode, or the process is about to exit, in which case canon mode will be set at the end of main. Signed-off-by: Alyssa Ross <hi@alyssa.is>	2023-04-18 10:47:33 -07:00
Alyssa Ross	9d24e862eb	vmm: only use KVM_ARM_VCPU_PMU_V3 if available Having PMU in guests isn't critical, and not all hardware supports it (e.g. Apple Silicon). CpuManager::init_pmu already has a fallback for if PMU is not supported by the VCPU, but we weren't getting that far, because we would always try to initialise the VCPU with KVM_ARM_VCPU_PMU_V3, and then bail when it returned with EINVAL. Signed-off-by: Alyssa Ross <hi@alyssa.is>	2023-04-18 10:47:33 -07:00
Alyssa Ross	11324ac21c	virtio-devices: seccomp: add vhost-user syscalls Cloud Hypervisor's vhost-user implementation will reconnect if it gets disconnected from the backend. That means connections happen inside the vhost-user seccomp sandbox, so all syscalls used in reconnecting have to be allowed in that sandbox. clock_nanosleep is used by Glibc, and nanosleep is used by musl. Signed-off-by: Alyssa Ross <hi@alyssa.is>	2023-04-18 10:47:33 -07:00
Bo Chen	ce75865e2c	vmm: Ignore and warn TAP FDs sent via the HTTP request body Valid FDs can only be sent from another process via `SCM_RIGHTS`. Signed-off-by: Bo Chen <chen.bo@intel.com>	2023-04-18 10:47:33 -07:00