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

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 76b6c62d07.

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
Download Patch File Download Diff File Expand all files Collapse all files

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 = ".."