build: Bulk update vm-memory and related dependencies

Signed-off-by: Rob Bradford <rbradford@rivosinc.com>
This commit is contained in:
Rob Bradford 2024-09-25 12:21:05 +01:00
parent a9b30a4c4e
commit d90fa96bb7
18 changed files with 143 additions and 96 deletions

44
Cargo.lock generated
View File

@ -1178,9 +1178,9 @@ dependencies = [
[[package]]
name = "linux-loader"
version = "0.11.0"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb68dd3452f25a8defaf0ae593509cff0c777683e4d8924f59ac7c5f89267a83"
checksum = "3d379d0089d0fbf4161c35a4fdfd76125923f1a93632c49195f5372b4c0b1472"
dependencies = [
"vm-memory",
]
@ -2208,6 +2208,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
dependencies = [
"getrandom",
"rand",
"uuid-macro-internal",
]
[[package]]
name = "uuid-macro-internal"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee1cd046f83ea2c4e920d6ee9f7c3537ef928d75dce5d84a87c2c5d6b3999a3a"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.66",
]
[[package]]
@ -2225,7 +2238,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "vfio-bindings"
version = "0.4.0"
source = "git+https://github.com/rust-vmm/vfio?branch=main#09c6b193d6b5a339f6a3ec3f44095046c519baaa"
source = "git+https://github.com/rust-vmm/vfio?branch=main#a51a4746b0d317bfc21fa49d40f9287f3b8137fd"
dependencies = [
"vmm-sys-util",
]
@ -2233,7 +2246,7 @@ dependencies = [
[[package]]
name = "vfio-ioctls"
version = "0.2.0"
source = "git+https://github.com/rust-vmm/vfio?branch=main#09c6b193d6b5a339f6a3ec3f44095046c519baaa"
source = "git+https://github.com/rust-vmm/vfio?branch=main#a51a4746b0d317bfc21fa49d40f9287f3b8137fd"
dependencies = [
"byteorder",
"kvm-bindings",
@ -2251,7 +2264,7 @@ dependencies = [
[[package]]
name = "vfio_user"
version = "0.1.0"
source = "git+https://github.com/rust-vmm/vfio-user?branch=main#a1f6e52829e069b6d698b2cfeecac742e4653186"
source = "git+https://github.com/rust-vmm/vfio-user?branch=main#bf7d7e851b604d8414a7960fb9137b59fc42421d"
dependencies = [
"bitflags 1.3.2",
"libc",
@ -2267,21 +2280,22 @@ dependencies = [
[[package]]
name = "vhost"
version = "0.11.0"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6be08d1166d41a78861ad50212ab3f9eca0729c349ac3a7a8f557c62406b87cc"
checksum = "7c1c4c6c9f79fbe3150d9a403008ca416d34c489897effdda28b646f09900aad"
dependencies = [
"bitflags 2.6.0",
"libc",
"uuid",
"vm-memory",
"vmm-sys-util",
]
[[package]]
name = "vhost-user-backend"
version = "0.15.0"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f0ffb1dd8e00a708a0e2c32d5efec5812953819888591fff9ff68236b8a5096"
checksum = "73768c8584e0be5ed8feb063785910cabe3f1af6661a5953fd3247fa611ddfaf"
dependencies = [
"libc",
"log",
@ -2331,9 +2345,9 @@ dependencies = [
[[package]]
name = "virtio-bindings"
version = "0.2.2"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "878bcb1b2812a10c30d53b0ed054999de3d98f25ece91fc173973f9c57aaae86"
checksum = "68d0df4f5ad79b1dc81b5913ac737e24a84dcd5100f36ed953a1faec18aba241"
[[package]]
name = "virtio-devices"
@ -2371,9 +2385,9 @@ dependencies = [
[[package]]
name = "virtio-queue"
version = "0.12.0"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07d8406e7250c934462de585d8f2d2781c31819bca1fbb7c5e964ca6bbaabfe8"
checksum = "ffb1761348d3b5e82131379b9373435b48dc8333100bff3f1cdf9cc541a0ad83"
dependencies = [
"log",
"virtio-bindings",
@ -2410,9 +2424,9 @@ source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#ef5bd734f5f66fb0772
[[package]]
name = "vm-memory"
version = "0.14.1"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c3aba5064cc5f6f7740cddc8dae34d2d9a311cac69b60d942af7f3ab8fc49f4"
checksum = "a320fc11792e063174402ff444aa3c80363cbf1e31c47b5ef74124406c334ce6"
dependencies = [
"arc-swap",
"libc",

View File

@ -45,7 +45,7 @@ signal-hook = "0.3.17"
thiserror = "1.0.62"
tpm = { path = "tpm" }
tracer = { path = "tracer" }
vm-memory = "0.14.1"
vm-memory = "0.15.0"
vmm = { path = "vmm" }
vmm-sys-util = "0.12.1"
zbus = { version = "4.1.2", optional = true }

View File

@ -15,12 +15,12 @@ anyhow = "1.0.87"
byteorder = "1.5.0"
hypervisor = { path = "../hypervisor" }
libc = "0.2.158"
linux-loader = { version = "0.11.0", features = ["bzimage", "elf", "pe"] }
linux-loader = { version = "0.12.0", features = ["bzimage", "elf", "pe"] }
log = "0.4.22"
serde = { version = "1.0.208", features = ["derive", "rc"] }
thiserror = "1.0.62"
uuid = "1.8.0"
vm-memory = { version = "0.14.1", features = [
vm-memory = { version = "0.15.0", features = [
"backend-bitmap",
"backend-mmap",
] }

View File

@ -20,8 +20,8 @@ smallvec = "1.13.2"
thiserror = "1.0.62"
uuid = { version = "1.8.0", features = ["v4"] }
virtio-bindings = { version = "0.2.2", features = ["virtio-v5_0_0"] }
virtio-queue = "0.12.0"
vm-memory = { version = "0.14.1", features = [
virtio-queue = "0.13.0"
vm-memory = { version = "0.15.0", features = [
"backend-atomic",
"backend-bitmap",
"backend-mmap",

View File

@ -21,7 +21,7 @@ thiserror = "1.0.62"
tpm = { path = "../tpm" }
vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" }
vm-memory = { version = "0.14.1", features = [
vm-memory = { version = "0.15.0", features = [
"backend-atomic",
"backend-bitmap",
"backend-mmap",

135
fuzz/Cargo.lock generated
View File

@ -86,13 +86,13 @@ dependencies = [
"fdt",
"hypervisor",
"libc",
"linux-loader 0.11.0",
"linux-loader",
"log",
"serde",
"thiserror",
"uuid",
"vm-fdt",
"vm-memory 0.14.1",
"vm-memory",
"vm-migration",
"vmm-sys-util",
]
@ -130,7 +130,7 @@ dependencies = [
"uuid",
"virtio-bindings",
"virtio-queue",
"vm-memory 0.14.1",
"vm-memory",
"vm-virtio",
"vmm-sys-util",
]
@ -200,7 +200,7 @@ dependencies = [
"epoll",
"libc",
"libfuzzer-sys",
"linux-loader 0.12.0",
"linux-loader",
"micro_http",
"net_util",
"once_cell",
@ -208,7 +208,7 @@ dependencies = [
"virtio-devices",
"virtio-queue",
"vm-device",
"vm-memory 0.14.1",
"vm-memory",
"vm-migration",
"vm-virtio",
"vmm",
@ -301,7 +301,7 @@ dependencies = [
"tpm",
"vm-allocator",
"vm-device",
"vm-memory 0.14.1",
"vm-memory",
"vm-migration",
"vmm-sys-util",
]
@ -448,7 +448,7 @@ dependencies = [
"serde_with",
"thiserror",
"vfio-ioctls",
"vm-memory 0.14.1",
"vm-memory",
"vmm-sys-util",
]
@ -549,22 +549,13 @@ dependencies = [
"once_cell",
]
[[package]]
name = "linux-loader"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb68dd3452f25a8defaf0ae593509cff0c777683e4d8924f59ac7c5f89267a83"
dependencies = [
"vm-memory 0.14.1",
]
[[package]]
name = "linux-loader"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d379d0089d0fbf4161c35a4fdfd76125923f1a93632c49195f5372b4c0b1472"
dependencies = [
"vm-memory 0.15.0",
"vm-memory",
]
[[package]]
@ -634,7 +625,7 @@ dependencies = [
"thiserror",
"virtio-bindings",
"virtio-queue",
"vm-memory 0.14.1",
"vm-memory",
"vm-virtio",
"vmm-sys-util",
]
@ -701,11 +692,20 @@ dependencies = [
"vfio_user",
"vm-allocator",
"vm-device",
"vm-memory 0.14.1",
"vm-memory",
"vm-migration",
"vmm-sys-util",
]
[[package]]
name = "ppv-lite86"
version = "0.2.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
dependencies = [
"zerocopy",
]
[[package]]
name = "proc-macro-crate"
version = "3.2.0"
@ -733,6 +733,36 @@ dependencies = [
"proc-macro2",
]
[[package]]
name = "rand"
version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
dependencies = [
"libc",
"rand_chacha",
"rand_core",
]
[[package]]
name = "rand_chacha"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [
"ppv-lite86",
"rand_core",
]
[[package]]
name = "rand_core"
version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
dependencies = [
"getrandom",
]
[[package]]
name = "rate_limiter"
version = "0.1.0"
@ -972,12 +1002,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
dependencies = [
"getrandom",
"rand",
"uuid-macro-internal",
]
[[package]]
name = "uuid-macro-internal"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee1cd046f83ea2c4e920d6ee9f7c3537ef928d75dce5d84a87c2c5d6b3999a3a"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "vfio-bindings"
version = "0.4.0"
source = "git+https://github.com/rust-vmm/vfio?branch=main#94bec9fa2a94a29e11d83766a992cb85496fcb7c"
source = "git+https://github.com/rust-vmm/vfio?branch=main#a51a4746b0d317bfc21fa49d40f9287f3b8137fd"
dependencies = [
"vmm-sys-util",
]
@ -985,7 +1028,7 @@ dependencies = [
[[package]]
name = "vfio-ioctls"
version = "0.2.0"
source = "git+https://github.com/rust-vmm/vfio?branch=main#94bec9fa2a94a29e11d83766a992cb85496fcb7c"
source = "git+https://github.com/rust-vmm/vfio?branch=main#a51a4746b0d317bfc21fa49d40f9287f3b8137fd"
dependencies = [
"byteorder",
"kvm-bindings",
@ -994,14 +1037,14 @@ dependencies = [
"log",
"thiserror",
"vfio-bindings",
"vm-memory 0.14.1",
"vm-memory",
"vmm-sys-util",
]
[[package]]
name = "vfio_user"
version = "0.1.0"
source = "git+https://github.com/rust-vmm/vfio-user?branch=main#a1f6e52829e069b6d698b2cfeecac742e4653186"
source = "git+https://github.com/rust-vmm/vfio-user?branch=main#bf7d7e851b604d8414a7960fb9137b59fc42421d"
dependencies = [
"bitflags 1.3.2",
"libc",
@ -1011,27 +1054,28 @@ dependencies = [
"serde_json",
"thiserror",
"vfio-bindings",
"vm-memory 0.14.1",
"vm-memory",
"vmm-sys-util",
]
[[package]]
name = "vhost"
version = "0.11.0"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6be08d1166d41a78861ad50212ab3f9eca0729c349ac3a7a8f557c62406b87cc"
checksum = "7c1c4c6c9f79fbe3150d9a403008ca416d34c489897effdda28b646f09900aad"
dependencies = [
"bitflags 2.6.0",
"libc",
"vm-memory 0.14.1",
"uuid",
"vm-memory",
"vmm-sys-util",
]
[[package]]
name = "virtio-bindings"
version = "0.2.2"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "878bcb1b2812a10c30d53b0ed054999de3d98f25ece91fc173973f9c57aaae86"
checksum = "68d0df4f5ad79b1dc81b5913ac737e24a84dcd5100f36ed953a1faec18aba241"
[[package]]
name = "virtio-devices"
@ -1060,7 +1104,7 @@ dependencies = [
"virtio-queue",
"vm-allocator",
"vm-device",
"vm-memory 0.14.1",
"vm-memory",
"vm-migration",
"vm-virtio",
"vmm-sys-util",
@ -1068,13 +1112,13 @@ dependencies = [
[[package]]
name = "virtio-queue"
version = "0.12.0"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07d8406e7250c934462de585d8f2d2781c31819bca1fbb7c5e964ca6bbaabfe8"
checksum = "ffb1761348d3b5e82131379b9373435b48dc8333100bff3f1cdf9cc541a0ad83"
dependencies = [
"log",
"virtio-bindings",
"vm-memory 0.14.1",
"vm-memory",
"vmm-sys-util",
]
@ -1084,7 +1128,7 @@ version = "0.1.0"
dependencies = [
"arch",
"libc",
"vm-memory 0.14.1",
"vm-memory",
]
[[package]]
@ -1096,7 +1140,7 @@ dependencies = [
"serde",
"thiserror",
"vfio-ioctls",
"vm-memory 0.14.1",
"vm-memory",
"vmm-sys-util",
]
@ -1105,24 +1149,13 @@ name = "vm-fdt"
version = "0.3.0"
source = "git+https://github.com/rust-vmm/vm-fdt?branch=main#982fb8d9c8cd7f53520d7e304b39ff307fa3a641"
[[package]]
name = "vm-memory"
version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c3aba5064cc5f6f7740cddc8dae34d2d9a311cac69b60d942af7f3ab8fc49f4"
dependencies = [
"arc-swap",
"libc",
"thiserror",
"winapi",
]
[[package]]
name = "vm-memory"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a320fc11792e063174402ff444aa3c80363cbf1e31c47b5ef74124406c334ce6"
dependencies = [
"arc-swap",
"libc",
"thiserror",
"winapi",
@ -1136,7 +1169,7 @@ dependencies = [
"serde",
"serde_json",
"thiserror",
"vm-memory 0.14.1",
"vm-memory",
]
[[package]]
@ -1145,7 +1178,7 @@ version = "0.1.0"
dependencies = [
"log",
"virtio-queue",
"vm-memory 0.14.1",
"vm-memory",
]
[[package]]
@ -1169,7 +1202,7 @@ dependencies = [
"hypervisor",
"landlock",
"libc",
"linux-loader 0.11.0",
"linux-loader",
"log",
"micro_http",
"net_util",
@ -1191,7 +1224,7 @@ dependencies = [
"virtio-queue",
"vm-allocator",
"vm-device",
"vm-memory 0.14.1",
"vm-memory",
"vm-migration",
"vm-virtio",
"vmm-sys-util",

View File

@ -24,9 +24,9 @@ net_util = { path = "../net_util" }
once_cell = "1.19.0"
seccompiler = "0.4.0"
virtio-devices = { path = "../virtio-devices" }
virtio-queue = "0.12.0"
virtio-queue = "0.13.0"
vm-device = { path = "../vm-device" }
vm-memory = "0.14.1"
vm-memory = "0.15.0"
vm-migration = { path = "../vm-migration" }
vm-virtio = { path = "../vm-virtio" }
vmm = { path = "../vmm", features = ["guest_debug"] }

View File

@ -33,7 +33,7 @@ serde_with = { version = "3.9.0", default-features = false, features = [
] }
thiserror = "1.0.62"
vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false }
vm-memory = { version = "0.14.1", features = [
vm-memory = { version = "0.15.0", features = [
"backend-atomic",
"backend-mmap",
] }

View File

@ -14,8 +14,8 @@ rate_limiter = { path = "../rate_limiter" }
serde = { version = "1.0.208", features = ["derive"] }
thiserror = "1.0.62"
virtio-bindings = "0.2.2"
virtio-queue = "0.12.0"
vm-memory = { version = "0.14.1", features = [
virtio-queue = "0.13.0"
vm-memory = { version = "0.15.0", features = [
"backend-atomic",
"backend-bitmap",
"backend-mmap",

View File

@ -24,7 +24,7 @@ vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", defau
vfio_user = { git = "https://github.com/rust-vmm/vfio-user", branch = "main" }
vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" }
vm-memory = { version = "0.14.1", features = [
vm-memory = { version = "0.15.0", features = [
"backend-atomic",
"backend-bitmap",
"backend-mmap",

View File

@ -13,9 +13,9 @@ epoll = "4.3.3"
libc = "0.2.158"
log = "0.4.22"
option_parser = { path = "../option_parser" }
vhost = { version = "0.11.0", features = ["vhost-user-backend"] }
vhost-user-backend = "0.15.0"
vhost = { version = "0.12.0", features = ["vhost-user-backend"] }
vhost-user-backend = "0.16.0"
virtio-bindings = "0.2.2"
virtio-queue = "0.12.0"
vm-memory = "0.14.1"
virtio-queue = "0.13.0"
vm-memory = "0.15.0"
vmm-sys-util = "0.12.1"

View File

@ -13,8 +13,8 @@ libc = "0.2.158"
log = "0.4.22"
net_util = { path = "../net_util" }
option_parser = { path = "../option_parser" }
vhost = { version = "0.11.0", features = ["vhost-user-backend"] }
vhost-user-backend = "0.15.0"
vhost = { version = "0.12.0", features = ["vhost-user-backend"] }
vhost-user-backend = "0.16.0"
virtio-bindings = "0.2.2"
vm-memory = "0.14.1"
vm-memory = "0.15.0"
vmm-sys-util = "0.12.1"

View File

@ -30,17 +30,17 @@ serde_with = { version = "3.9.0", default-features = false, features = [
] }
serial_buffer = { path = "../serial_buffer" }
thiserror = "1.0.62"
vhost = { version = "0.11.0", features = [
vhost = { version = "0.12.0", features = [
"vhost-kern",
"vhost-user-backend",
"vhost-user-frontend",
"vhost-vdpa",
] }
virtio-bindings = { version = "0.2.2", features = ["virtio-v5_0_0"] }
virtio-queue = "0.12.0"
virtio-queue = "0.13.0"
vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" }
vm-memory = { version = "0.14.1", features = [
vm-memory = { version = "0.15.0", features = [
"backend-atomic",
"backend-bitmap",
"backend-mmap",

View File

@ -6,7 +6,7 @@ version = "0.1.0"
[dependencies]
libc = "0.2.158"
vm-memory = "0.14.1"
vm-memory = "0.15.0"
[target.'cfg(target_arch = "aarch64")'.dependencies]
arch = { path = "../arch" }

View File

@ -15,5 +15,5 @@ hypervisor = { path = "../hypervisor" }
serde = { version = "1.0.208", features = ["derive", "rc"] }
thiserror = "1.0.62"
vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false }
vm-memory = { version = "0.14.1", features = ["backend-mmap"] }
vm-memory = { version = "0.15.0", features = ["backend-mmap"] }
vmm-sys-util = "0.12.1"

View File

@ -9,7 +9,7 @@ anyhow = "1.0.87"
serde = { version = "1.0.208", features = ["derive", "rc"] }
serde_json = "1.0.120"
thiserror = "1.0.62"
vm-memory = { version = "0.14.1", features = [
vm-memory = { version = "0.15.0", features = [
"backend-atomic",
"backend-mmap",
] }

View File

@ -9,8 +9,8 @@ default = []
[dependencies]
log = "0.4.22"
virtio-queue = "0.12.0"
vm-memory = { version = "0.14.1", features = [
virtio-queue = "0.13.0"
vm-memory = { version = "0.15.0", features = [
"backend-atomic",
"backend-bitmap",
"backend-mmap",

View File

@ -48,7 +48,7 @@ igvm = { version = "0.3.3", optional = true }
igvm_defs = { version = "0.3.1", optional = true }
landlock = "0.4.0"
libc = "0.2.158"
linux-loader = { version = "0.11.0", features = ["bzimage", "elf", "pe"] }
linux-loader = { version = "0.12.0", features = ["bzimage", "elf", "pe"] }
log = "0.4.22"
micro_http = { git = "https://github.com/firecracker-microvm/micro-http", branch = "main" }
mshv-bindings = { git = "https://github.com/rust-vmm/mshv", tag = "v0.3.0", features = [
@ -72,10 +72,10 @@ uuid = "1.8.0"
vfio-ioctls = { git = "https://github.com/rust-vmm/vfio", branch = "main", default-features = false }
vfio_user = { git = "https://github.com/rust-vmm/vfio-user", branch = "main" }
virtio-devices = { path = "../virtio-devices" }
virtio-queue = "0.12.0"
virtio-queue = "0.13.0"
vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" }
vm-memory = { version = "0.14.1", features = [
vm-memory = { version = "0.15.0", features = [
"backend-atomic",
"backend-bitmap",
"backend-mmap",