External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-02-06 20:00:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "build: bump vm-memory from 0.6.0 to 0.7.0"

Browse Source 
This was causing some issues because of the use of 2 different versions
for the vm-memmory crate. We'll wait for all dependencies to be properly
resolved before we move to 0.7.0.

This reverts commit 76b6c62d0766e46f80521c2dc24d532665db4be1.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2021-10-22 10:29:33 +02:00
parent 81b9705b10
commit 7f0e7d19a6
21 changed files with 59 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Cargo.lock generated
View File

@ -6,7 +6,7 @@ version = 3
name = "acpi_tables"
version = "0.1.0"
dependencies = [
"vm-memory 0.7.0",
"vm-memory",
]
[[package]]
@ -79,7 +79,7 @@ dependencies = [
"versionize",
"versionize_derive",
"vm-fdt",
"vm-memory 0.7.0",
"vm-memory",
"vm-migration",
"vmm-sys-util",
]
@ -144,7 +144,7 @@ dependencies = [
"versionize_derive",
"vhdx",
"virtio-bindings",
"vm-memory 0.7.0",
"vm-memory",
"vm-virtio",
"vmm-sys-util",
]
@ -205,7 +205,7 @@ dependencies = [
"signal-hook",
"test_infra",
"thiserror",
"vm-memory 0.7.0",
"vm-memory",
"vmm",
"vmm-sys-util",
"wait-timeout",
@ -251,7 +251,7 @@ dependencies = [
"versionize",
"versionize_derive",
"vm-device",
"vm-memory 0.7.0",
"vm-memory",
"vm-migration",
"vmm-sys-util",
]
@ -402,7 +402,7 @@ dependencies = [
"serde_derive",
"serde_json",
"thiserror",
"vm-memory 0.7.0",
"vm-memory",
"vmm-sys-util",
]
@ -515,7 +515,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a5e77493808403a6bd56a301a64ea6b9342e36ea845044bf0dfdf56fe52fa08"
dependencies = [
"vm-memory 0.7.0",
"vm-memory",
]
[[package]]
@ -607,7 +607,7 @@ dependencies = [
"versionize",
"versionize_derive",
"virtio-bindings",
"vm-memory 0.7.0",
"vm-memory",
"vm-virtio",
"vmm-sys-util",
]
@ -680,7 +680,7 @@ dependencies = [
"vfio_user",
"vm-allocator",
"vm-device",
"vm-memory 0.7.0",
"vm-memory",
"vm-migration",
"vmm-sys-util",
]
@ -1157,7 +1157,7 @@ dependencies = [
"mshv-bindings",
"mshv-ioctls",
"vfio-bindings",
"vm-memory 0.7.0",
"vm-memory",
"vmm-sys-util",
]
@ -1173,7 +1173,7 @@ dependencies = [
"serde_json",
"thiserror",
"vfio-bindings",
"vm-memory 0.7.0",
"vm-memory",
"vmm-sys-util",
]
@ -1199,7 +1199,7 @@ checksum = "2d23ddeb452fb4f837526c6298cc8a2f4948e5595b0328a3d61b5eebe51874d7"
dependencies = [
"bitflags",
"libc",
"vm-memory 0.6.0",
"vm-memory",
"vmm-sys-util",
]
@ -1212,7 +1212,7 @@ dependencies = [
"log",
"vhost",
"virtio-bindings",
"vm-memory 0.7.0",
"vm-memory",
"vm-virtio",
"vmm-sys-util",
]
@ -1232,7 +1232,7 @@ dependencies = [
"vhost",
"vhost_user_backend",
"virtio-bindings",
"vm-memory 0.7.0",
"vm-memory",
"vmm-sys-util",
]
@ -1250,7 +1250,7 @@ dependencies = [
"vhost",
"vhost_user_backend",
"virtio-bindings",
"vm-memory 0.7.0",
"vm-memory",
"vmm-sys-util",
]
@ -1287,7 +1287,7 @@ dependencies = [
"virtio-bindings",
"vm-allocator",
"vm-device",
"vm-memory 0.7.0",
"vm-memory",
"vm-migration",
"vm-virtio",
"vmm-sys-util",
@ -1299,7 +1299,7 @@ version = "0.1.0"
dependencies = [
"arch",
"libc",
"vm-memory 0.7.0",
"vm-memory",
]
[[package]]
@ -1312,7 +1312,7 @@ dependencies = [
"serde_json",
"thiserror",
"vfio-ioctls",
"vm-memory 0.7.0",
"vm-memory",
"vmm-sys-util",
]
@ -1326,16 +1326,6 @@ name = "vm-memory"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a8ebcb86ca457f9d6e14cf97009f679952eba42f0113de5db596e514cd0e43b"
dependencies = [
"libc",
"winapi",
]
[[package]]
name = "vm-memory"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "339d4349c126fdcd87e034631d7274370cf19eb0e87b33166bcd956589fc72c5"
dependencies = [
"arc-swap",
"libc",
@ -1353,7 +1343,7 @@ dependencies = [
"thiserror",
"versionize",
"versionize_derive",
"vm-memory 0.7.0",
"vm-memory",
]
[[package]]
@ -1362,7 +1352,7 @@ version = "0.1.0"
dependencies = [
"log",
"virtio-bindings",
"vm-memory 0.7.0",
"vm-memory",
]
[[package]]
@ -1405,7 +1395,7 @@ dependencies = [
"virtio-devices",
"vm-allocator",
"vm-device",
"vm-memory 0.7.0",
"vm-memory",
"vm-migration",
"vm-virtio",
"vmm-sys-util",

2
Cargo.toml
View File

@ -28,7 +28,7 @@ signal-hook = "0.3.10"
thiserror = "1.0.30"
vmm = { path = "vmm" }
vmm-sys-util = "0.9.0"
vm-memory = "0.7.0"
vm-memory = "0.6.0"
[build-dependencies]
clap = { version = "2.33.3", features = ["wrap_help"] }

2
acpi_tables/Cargo.toml
View File

@ -5,4 +5,4 @@ authors = ["The Cloud Hypervisor Authors"]
edition = "2018"
[dependencies]
vm-memory = "0.7.0"
vm-memory = "0.6.0"

2
arch/Cargo.toml
View File

@ -22,7 +22,7 @@ serde_derive = "1.0.130"
thiserror = "1.0.30"
versionize = "0.1.6"
versionize_derive = "0.1.4"
vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-bitmap"] }
vm-memory = { version = "0.6.0", features = ["backend-mmap", "backend-bitmap"] }
vm-migration = { path = "../vm-migration" }
vmm-sys-util = { version = "0.9.0", features = ["with-serde"] }

2
block_util/Cargo.toml
View File

@ -18,7 +18,7 @@ versionize = "0.1.6"
versionize_derive = "0.1.4"
vhdx = { path = "../vhdx" }
virtio-bindings = { version = "0.1.0", features = ["virtio-v5_0_0"] }
vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
vm-memory = { version = "0.6.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = "0.9.0"

2
devices/Cargo.toml
View File

@ -16,7 +16,7 @@ log = "0.4.14"
versionize = "0.1.6"
versionize_derive = "0.1.4"
vm-device = { path = "../vm-device" }
vm-memory = "0.7.0"
vm-memory = "0.6.0"
vm-migration = { path = "../vm-migration" }
vmm-sys-util = "0.9.0"

48
fuzz/Cargo.lock generated
View File

@ -6,7 +6,7 @@ version = 3
name = "acpi_tables"
version = "0.1.0"
dependencies = [
"vm-memory 0.7.0",
"vm-memory",
]
[[package]]
@ -61,7 +61,7 @@ dependencies = [
"versionize",
"versionize_derive",
"vm-fdt",
"vm-memory 0.7.0",
"vm-memory",
"vm-migration",
"vmm-sys-util",
]
@ -105,7 +105,7 @@ dependencies = [
"versionize_derive",
"vhdx",
"virtio-bindings",
"vm-memory 0.7.0",
"vm-memory",
"vm-virtio",
"vmm-sys-util",
]
@ -161,7 +161,7 @@ dependencies = [
"serde_json",
"signal-hook",
"thiserror",
"vm-memory 0.7.0",
"vm-memory",
"vmm",
"vmm-sys-util",
]
@ -178,7 +178,7 @@ dependencies = [
"seccompiler",
"vhdx",
"virtio-devices",
"vm-memory 0.7.0",
"vm-memory",
"vm-virtio",
"vmm-sys-util",
]
@ -213,7 +213,7 @@ dependencies = [
"versionize",
"versionize_derive",
"vm-device",
"vm-memory 0.7.0",
"vm-memory",
"vm-migration",
"vmm-sys-util",
]
@ -279,7 +279,7 @@ dependencies = [
"serde_derive",
"serde_json",
"thiserror",
"vm-memory 0.7.0",
"vm-memory",
"vmm-sys-util",
]
@ -359,7 +359,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a5e77493808403a6bd56a301a64ea6b9342e36ea845044bf0dfdf56fe52fa08"
dependencies = [
"vm-memory 0.6.0",
"vm-memory",
]
[[package]]
@ -401,7 +401,7 @@ dependencies = [
"versionize",
"versionize_derive",
"virtio-bindings",
"vm-memory 0.7.0",
"vm-memory",
"vm-virtio",
"vmm-sys-util",
]
@ -433,7 +433,7 @@ dependencies = [
"vfio_user",
"vm-allocator",
"vm-device",
"vm-memory 0.7.0",
"vm-memory",
"vm-migration",
"vmm-sys-util",
]
@ -709,7 +709,7 @@ dependencies = [
"kvm-ioctls",
"log",
"vfio-bindings",
"vm-memory 0.6.0",
"vm-memory",
"vmm-sys-util",
]
@ -725,7 +725,7 @@ dependencies = [
"serde_json",
"thiserror",
"vfio-bindings",
"vm-memory 0.7.0",
"vm-memory",
"vmm-sys-util",
]
@ -751,7 +751,7 @@ checksum = "2d23ddeb452fb4f837526c6298cc8a2f4948e5595b0328a3d61b5eebe51874d7"
dependencies = [
"bitflags",
"libc",
"vm-memory 0.6.0",
"vm-memory",
"vmm-sys-util",
]
@ -788,7 +788,7 @@ dependencies = [
"virtio-bindings",
"vm-allocator",
"vm-device",
"vm-memory 0.7.0",
"vm-memory",
"vm-migration",
"vm-virtio",
"vmm-sys-util",
@ -800,7 +800,7 @@ version = "0.1.0"
dependencies = [
"arch",
"libc",
"vm-memory 0.7.0",
"vm-memory",
]
[[package]]
@ -813,7 +813,7 @@ dependencies = [
"serde_json",
"thiserror",
"vfio-ioctls",
"vm-memory 0.7.0",
"vm-memory",
"vmm-sys-util",
]
@ -827,16 +827,6 @@ name = "vm-memory"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a8ebcb86ca457f9d6e14cf97009f679952eba42f0113de5db596e514cd0e43b"
dependencies = [
"libc",
"winapi",
]
[[package]]
name = "vm-memory"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "339d4349c126fdcd87e034631d7274370cf19eb0e87b33166bcd956589fc72c5"
dependencies = [
"arc-swap",
"libc",
@ -854,7 +844,7 @@ dependencies = [
"thiserror",
"versionize",
"versionize_derive",
"vm-memory 0.7.0",
"vm-memory",
]
[[package]]
@ -863,7 +853,7 @@ version = "0.1.0"
dependencies = [
"log",
"virtio-bindings",
"vm-memory 0.7.0",
"vm-memory",
]
[[package]]
@ -905,7 +895,7 @@ dependencies = [
"virtio-devices",
"vm-allocator",
"vm-device",
"vm-memory 0.7.0",
"vm-memory",
"vm-migration",
"vm-virtio",
"vmm-sys-util",

2
fuzz/Cargo.toml
View File

@ -18,7 +18,7 @@ vhdx = { path = "../vhdx" }
virtio-devices = { path = "../virtio-devices" }
vmm-sys-util = "0.9.0"
vm-virtio = { path = "../vm-virtio" }
vm-memory = "0.7.0"
vm-memory = "0.6.0"
[dependencies.cloud-hypervisor]
path = ".."

2
hypervisor/Cargo.toml
View File

@ -23,7 +23,7 @@ mshv-ioctls = { git = "https://github.com/rust-vmm/mshv", branch = "main", optio
serde = { version = "1.0.130", features = ["rc"] }
serde_derive = "1.0.130"
serde_json = "1.0.68"
vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-atomic"] }
vm-memory = { version = "0.6.0", features = ["backend-mmap", "backend-atomic"] }
vmm-sys-util = { version = "0.9.0", features = ["with-serde"] }
[target.'cfg(target_arch = "x86_64")'.dependencies.iced-x86]

2
net_util/Cargo.toml
View File

@ -15,7 +15,7 @@ serde = "1.0.130"
versionize = "0.1.6"
versionize_derive = "0.1.4"
virtio-bindings = "0.1.0"
vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
vm-memory = { version = "0.6.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = "0.9.0"

2
pci/Cargo.toml
View File

@ -23,7 +23,7 @@ versionize = "0.1.6"
versionize_derive = "0.1.4"
vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" }
vm-memory = "0.7.0"
vm-memory = "0.6.0"
vm-migration = { path = "../vm-migration" }
[dependencies.vfio-bindings]

2
vfio_user/Cargo.toml
View File

@ -12,7 +12,7 @@ serde = {version = ">=1.0.27", features = ["rc"] }
serde_derive = ">=1.0.27"
serde_json = ">=1.0.9"
thiserror = "1.0.30"
vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-atomic"] }
vm-memory = { version = "0.6.0", features = ["backend-mmap", "backend-atomic"] }
vmm-sys-util = ">=0.3.1"
[dependencies.vfio-bindings]

2
vhost_user_backend/Cargo.toml
View File

@ -12,7 +12,7 @@ epoll = "4.3.1"
libc = "0.2.104"
log = "0.4.14"
virtio-bindings = "0.1.0"
vm-memory = { version = "0.7.0", features = ["backend-bitmap"] }
vm-memory = { version = "0.6.0", features = ["backend-bitmap"] }
vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = "0.9.0"
vhost = { version = "0.2.0", features = ["vhost-user-slave"] }

2
vhost_user_block/Cargo.toml
View File

@ -16,5 +16,5 @@ qcow = { path = "../qcow" }
vhost_user_backend = { path = "../vhost_user_backend" }
vhost = { version = "0.2.0", features = ["vhost-user-slave"] }
virtio-bindings = "0.1.0"
vm-memory = "0.7.0"
vm-memory = "0.6.0"
vmm-sys-util = "0.9.0"

2
vhost_user_net/Cargo.toml
View File

@ -15,5 +15,5 @@ option_parser = { path = "../option_parser" }
vhost_user_backend = { path = "../vhost_user_backend" }
vhost = { version = "0.2.0", features = ["vhost-user-slave"] }
virtio-bindings = "0.1.0"
vm-memory = "0.7.0"
vm-memory = "0.6.0"
vmm-sys-util = "0.9.0"

2
virtio-devices/Cargo.toml
View File

@ -33,7 +33,7 @@ vhost = { version = "0.2.0", features = ["vhost-user-master", "vhost-user-slave"
virtio-bindings = { version = "0.1.0", features = ["virtio-v5_0_0"] }
vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" }
vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
vm-memory = { version = "0.6.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
vm-migration = { path = "../vm-migration" }
vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = "0.9.0"

2
vm-allocator/Cargo.toml
View File

@ -6,5 +6,5 @@ edition = "2018"
[dependencies]
libc = "0.2.104"
vm-memory = "0.7.0"
vm-memory = "0.6.0"
arch = { path = "../arch" }

2
vm-device/Cargo.toml
View File

@ -16,6 +16,6 @@ serde = { version = "1.0.130", features = ["rc"] }
serde_derive = "1.0.130"
serde_json = "1.0.68"
vfio-ioctls = { git = "https://github.com/rust-vmm/vfio-ioctls", branch = "main", default-features = false }
vm-memory = { version = "0.7.0", features = ["backend-mmap"] }
vm-memory = { version = "0.6.0", features = ["backend-mmap"] }
vmm-sys-util = "0.9.0"

2
vm-migration/Cargo.toml
View File

@ -12,4 +12,4 @@ serde_derive = "1.0.130"
serde_json = "1.0.68"
versionize = "0.1.6"
versionize_derive = "0.1.4"
vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-atomic"] }
vm-memory = { version = "0.6.0", features = ["backend-mmap", "backend-atomic"] }

2
vm-virtio/Cargo.toml
View File

@ -10,4 +10,4 @@ default = []
[dependencies]
log = "0.4.14"
virtio-bindings = { version = "0.1.0", features = ["virtio-v5_0_0"] }
vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
vm-memory = { version = "0.6.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }

2
vmm/Cargo.toml
View File

@ -50,7 +50,7 @@ vhdx = { path = "../vhdx" }
virtio-devices = { path = "../virtio-devices" }
vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" }
vm-memory = { version = "0.7.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
vm-memory = { version = "0.6.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] }
vm-migration = { path = "../vm-migration" }
vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = { version = "0.9.0", features = ["with-serde"] }