kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Bump vmm-sys-util crate and its consumers

Browse Source 
This patch bumps the following crates, including `kvm-bindings@0.7.0`*,
`kvm-ioctls@0.16.0`**, `linux-loader@0.11.0`, `versionize@0.2.0`,
`versionize_derive@0.1.6`***, `vhost@0.10.0`,
`vhost-user-backend@0.13.1`, `virtio-queue@0.11.0`, `vm-memory@0.14.0`,
`vmm-sys-util@0.12.1`, and the latest of `vfio-bindings`, `vfio-ioctls`,
`mshv-bindings`,`mshv-ioctls`, and `vfio-user`.

* A fork of the `kvm-bindings` crate is being used to support
serialization of various structs for migration [1]. Also, code changes
are made to accommodate the updated `struct xsave` from the Linux
kernel. Note: these changes related to `struct xsave` break
live-upgrade.

** The new `kvm-ioctls` crate introduced breaking changes for
the `get/set_one_reg` API on `aarch64` [2], so code changes are made to
the new APIs.

*** A fork of the `versionize_derive` crate is being used to support
versionize on packed structs [3].

[1] https://github.com/cloud-hypervisor/kvm-bindings/tree/ch-v0.7.0
[2] https://github.com/rust-vmm/kvm-ioctls/pull/223
[3] https://github.com/cloud-hypervisor/versionize_derive/tree/ch-0.1.6

Fixes: #6072

Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
Bo Chen
2024-01-23 09:29:40 -08:00
committed by Rob Bradford
parent 6cb1d908bf
commit 3ce0fef7fd
27 changed files with 305 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
fuzz/Cargo.lock generated
View File

@@ -68,7 +68,7 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
name = "api_client"
version = "0.1.0"
dependencies = [
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
@@ -102,7 +102,7 @@ dependencies = [
"vm-fdt",
"vm-memory",
"vm-migration",
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
@@ -151,7 +151,7 @@ dependencies = [
"virtio-queue",
"vm-memory",
"vm-virtio",
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
@@ -230,7 +230,7 @@ dependencies = [
"tracer",
"vm-memory",
"vmm",
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
@@ -255,7 +255,7 @@ dependencies = [
"vm-migration",
"vm-virtio",
"vmm",
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
@@ -275,9 +275,9 @@ dependencies = [
[[package]]
name = "crc64"
version = "1.0.0"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55626594feae15d266d52440b26ff77de0e22230cf0c113abe619084c1ddc910"
checksum = "2707e3afba5e19b75d582d88bc79237418f2a2a2d673d01cf9b03633b46e98f3"
[[package]]
name = "darling"
@@ -336,7 +336,7 @@ dependencies = [
"vm-device",
"vm-memory",
"vm-migration",
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
@@ -425,7 +425,7 @@ dependencies = [
"thiserror",
"vfio-ioctls",
"vm-memory",
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
@@ -470,23 +470,24 @@ dependencies = [
[[package]]
name = "kvm-bindings"
version = "0.6.0"
source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.6.0-tdx#7d9ffb47e5b9b1989577258800a0f57c93f1445f"
version = "0.7.0"
source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.7.0#2dcf85d4f8aa55befcaa996b699ddb18ec9ed059"
dependencies = [
"serde",
"serde_derive",
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
name = "kvm-ioctls"
version = "0.13.0"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8f8dc9c1896e5f144ec5d07169bc29f39a047686d29585a91f30489abfaeb6b"
checksum = "9002dff009755414f22b962ec6ae6980b07d6d8b06e5297b1062019d72bd6a8c"
dependencies = [
"bitflags 2.4.1",
"kvm-bindings",
"libc",
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
@@ -508,9 +509,9 @@ dependencies = [
[[package]]
name = "linux-loader"
version = "0.10.0"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "132a531b85b3a164012ab682c72f8f2cce7757f187be5f60782fd2b4cda9cb34"
checksum = "eb68dd3452f25a8defaf0ae593509cff0c777683e4d8924f59ac7c5f89267a83"
dependencies = [
"vm-memory",
]
@@ -537,7 +538,7 @@ version = "0.1.0"
source = "git+https://github.com/firecracker-microvm/micro-http?branch=main#e75dfa1eeea23b69caa7407bc2c3a76d7b7262fb"
dependencies = [
"libc",
"vmm-sys-util 0.12.1",
"vmm-sys-util",
]
[[package]]
@@ -553,7 +554,7 @@ dependencies = [
name = "net_gen"
version = "0.1.0"
dependencies = [
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
@@ -574,7 +575,7 @@ dependencies = [
"virtio-queue",
"vm-memory",
"vm-virtio",
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
@@ -607,7 +608,7 @@ dependencies = [
"vm-device",
"vm-memory",
"vm-migration",
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
@@ -656,7 +657,7 @@ dependencies = [
"libc",
"log",
"thiserror",
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
@@ -855,7 +856,7 @@ dependencies = [
"log",
"net_gen",
"thiserror",
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
@@ -892,9 +893,9 @@ dependencies = [
[[package]]
name = "versionize"
version = "0.1.10"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dca4b7062e7e6d685901e815c35f9671e059de97c1c0905eeff8592f3fff442f"
checksum = "62929d59c7f6730b7298fcb363760550f4db6e353fbac4076d447d0e82799d6d"
dependencies = [
"bincode",
"crc64",
@@ -904,13 +905,13 @@ dependencies = [
"serde_derive",
"syn 1.0.109",
"versionize_derive",
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
name = "versionize_derive"
version = "0.1.4"
source = "git+https://github.com/cloud-hypervisor/versionize_derive?branch=ch#e502b1d4aabab342386f0c53780d49f21a6a1df6"
version = "0.1.6"
source = "git+https://github.com/cloud-hypervisor/versionize_derive?branch=ch-0.1.6#7906da996152e2d0ab08f5526440683bf3ca7834"
dependencies = [
"proc-macro2",
"quote",
@@ -920,15 +921,15 @@ dependencies = [
[[package]]
name = "vfio-bindings"
version = "0.4.0"
source = "git+https://github.com/rust-vmm/vfio?branch=main#59c604fa6e42080f0a47c124ba29454fe4cb7475"
source = "git+https://github.com/rust-vmm/vfio?branch=main#0daff4d4c159e842cf18b8b90457a45032b2df5a"
dependencies = [
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
name = "vfio-ioctls"
version = "0.2.0"
source = "git+https://github.com/rust-vmm/vfio?branch=main#59c604fa6e42080f0a47c124ba29454fe4cb7475"
source = "git+https://github.com/rust-vmm/vfio?branch=main#0daff4d4c159e842cf18b8b90457a45032b2df5a"
dependencies = [
"byteorder",
"kvm-bindings",
@@ -938,13 +939,13 @@ dependencies = [
"thiserror",
"vfio-bindings",
"vm-memory",
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
name = "vfio_user"
version = "0.1.0"
source = "git+https://github.com/rust-vmm/vfio-user?branch=main#6c72e997e61d9e84b8ee691ad63ece6c717cf5aa"
source = "git+https://github.com/rust-vmm/vfio-user?branch=main#a1f6e52829e069b6d698b2cfeecac742e4653186"
dependencies = [
"bitflags 1.3.2",
"libc",
@@ -955,19 +956,19 @@ dependencies = [
"thiserror",
"vfio-bindings",
"vm-memory",
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
name = "vhost"
version = "0.9.0"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "289adfce099c71f8310f895932ccd978f352ca494ea47496dbe20d4241888b82"
checksum = "2b64e816d0d49769fbfaa1494eb77cc2a3ddc526ead05c7f922cb7d64106286f"
dependencies = [
"bitflags 2.4.1",
"libc",
"vm-memory",
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
@@ -1007,19 +1008,19 @@ dependencies = [
"vm-memory",
"vm-migration",
"vm-virtio",
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
name = "virtio-queue"
version = "0.10.0"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73a01db2cfb6c4b9bc20608b1336263d16714ea8db05de9fec2a254e076f9385"
checksum = "e3f69a13d6610db9312acbb438b0390362af905d37634a2106be70c0f734986d"
dependencies = [
"log",
"virtio-bindings",
"vm-memory",
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
@@ -1041,7 +1042,7 @@ dependencies = [
"thiserror",
"vfio-ioctls",
"vm-memory",
"vmm-sys-util 0.11.2",
"vmm-sys-util",
]
[[package]]
@@ -1051,9 +1052,9 @@ source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#c5a99ab71b130435927
[[package]]
name = "vm-memory"
version = "0.13.1"
version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5376c9ee5ebe2103a310d8241936cfb93c946734b0479a4fa5bdf7a64abbacd8"
checksum = "74ffc42216c32c35f858fa4bfdcd9b61017dfd691e0240268fdc85dbf59e5459"
dependencies = [
"arc-swap",
"libc",
@@ -1128,22 +1129,10 @@ dependencies = [
"vm-memory",
"vm-migration",
"vm-virtio",
"vmm-sys-util 0.11.2",
"vmm-sys-util",
"zerocopy",
]
[[package]]
name = "vmm-sys-util"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48b7b084231214f7427041e4220d77dfe726897a6d41fddee450696e66ff2a29"
dependencies = [
"bitflags 1.3.2",
"libc",
"serde",
"serde_derive",
]
[[package]]
name = "vmm-sys-util"
version = "0.12.1"
@@ -1152,6 +1141,8 @@ checksum = "1d1435039746e20da4f8d507a72ee1b916f7b4b05af7a91c093d2c6561934ede"
dependencies = [
"bitflags 1.3.2",
"libc",
"serde",
"serde_derive",
]
[[package]]

12
fuzz/Cargo.toml
View File

@@ -17,16 +17,16 @@ devices = { path = "../devices" }
epoll = "4.3.1"
libc = "0.2.152"
libfuzzer-sys = "0.4.7"
linux-loader = { version = "0.10.0", features = ["elf", "bzimage", "pe"] }
linux-loader = { version = "0.11.0", features = ["elf", "bzimage", "pe"] }
micro_http = { git = "https://github.com/firecracker-microvm/micro-http", branch = "main" }
net_util = { path = "../net_util" }
once_cell = "1.19.0"
seccompiler = "0.4.0"
virtio-devices = { path = "../virtio-devices" }
virtio-queue = "0.10.0"
virtio-queue = "0.11.0"
vmm = { path = "../vmm" }
vmm-sys-util = "0.11.2"
vm-memory = "0.13.1"
vmm-sys-util = "0.12.1"
vm-memory = "0.14.0"
vm-migration = { path = "../vm-migration" }
vm-device = { path = "../vm-device" }
vm-virtio = { path = "../vm-virtio" }
@@ -35,8 +35,8 @@ vm-virtio = { path = "../vm-virtio" }
path = ".."
[patch.crates-io]
kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.6.0-tdx" }
versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch" }
kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.7.0" }
versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch-0.1.6" }
# Prevent this from interfering with workspaces
[workspace]