External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-07-04 17:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Move from patched vm-memory version to released version

Browse Source 
Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2021-08-06 07:46:17 +00:00
parent 91b05b6186
commit b4f887ea80
19 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Cargo.lock generated
View File

@ -6,7 +6,7 @@ version = 3
name = "acpi_tables"
version = "0.1.0"
dependencies = [
"vm-memory 0.5.0",
"vm-memory 0.6.0",
]
[[package]]
@ -78,7 +78,7 @@ dependencies = [
"versionize",
"versionize_derive",
"vm-fdt",
"vm-memory 0.5.0",
"vm-memory 0.6.0",
"vm-migration",
"vmm-sys-util",
]
@ -142,7 +142,7 @@ dependencies = [
"versionize",
"versionize_derive",
"virtio-bindings",
"vm-memory 0.5.0",
"vm-memory 0.6.0",
"vm-virtio",
"vmm-sys-util",
]
@ -209,7 +209,7 @@ dependencies = [
"signal-hook",
"test_infra",
"thiserror",
"vm-memory 0.5.0",
"vm-memory 0.6.0",
"vmm",
"vmm-sys-util",
"wait-timeout",
@ -255,7 +255,7 @@ dependencies = [
"versionize",
"versionize_derive",
"vm-device",
"vm-memory 0.5.0",
"vm-memory 0.6.0",
"vm-migration",
"vmm-sys-util",
]
@ -397,7 +397,7 @@ dependencies = [
"serde_derive",
"serde_json",
"thiserror",
"vm-memory 0.5.0",
"vm-memory 0.6.0",
"vmm-sys-util",
]
@ -501,7 +501,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c819cc8275b0f2c1ed9feec455ca288b45d82932384a6a5f7a86812ee3427459"
dependencies = [
"vm-memory 0.5.0",
"vm-memory 0.6.0",
]
[[package]]
@ -592,7 +592,7 @@ dependencies = [
"versionize",
"versionize_derive",
"virtio-bindings",
"vm-memory 0.5.0",
"vm-memory 0.6.0",
"vm-virtio",
"vmm-sys-util",
]
@ -663,7 +663,7 @@ dependencies = [
"vfio-ioctls",
"vm-allocator",
"vm-device",
"vm-memory 0.5.0",
"vm-memory 0.6.0",
"vm-migration",
"vmm-sys-util",
]
@ -1140,7 +1140,7 @@ dependencies = [
"log",
"vhost",
"virtio-bindings",
"vm-memory 0.5.0",
"vm-memory 0.6.0",
"vm-virtio",
"vmm-sys-util",
]
@ -1160,7 +1160,7 @@ dependencies = [
"vhost",
"vhost_user_backend",
"virtio-bindings",
"vm-memory 0.5.0",
"vm-memory 0.6.0",
"vmm-sys-util",
]
@ -1178,7 +1178,7 @@ dependencies = [
"vhost",
"vhost_user_backend",
"virtio-bindings",
"vm-memory 0.5.0",
"vm-memory 0.6.0",
"vmm-sys-util",
]
@ -1215,7 +1215,7 @@ dependencies = [
"virtio-bindings",
"vm-allocator",
"vm-device",
"vm-memory 0.5.0",
"vm-memory 0.6.0",
"vm-migration",
"vm-virtio",
"vmm-sys-util",
@ -1227,7 +1227,7 @@ version = "0.1.0"
dependencies = [
"arch",
"libc",
"vm-memory 0.5.0",
"vm-memory 0.6.0",
]
[[package]]
@ -1240,7 +1240,7 @@ dependencies = [
"serde_json",
"thiserror",
"vfio-ioctls",
"vm-memory 0.5.0",
"vm-memory 0.6.0",
"vmm-sys-util",
]
@ -1252,9 +1252,9 @@ source = "git+https://github.com/rust-vmm/vm-fdt?branch=master#af59838e5df826cd3
[[package]]
name = "vm-memory"
version = "0.5.0"
source = "git+https://github.com/rust-vmm/vm-memory?rev=5bd7138758183a73ac0da27ce40c004d95f1a7e9#5bd7138758183a73ac0da27ce40c004d95f1a7e9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "625f401b1b8b3ac3d43f53903cd138cfe840bd985f8581e553027b31d2bb8ae8"
dependencies = [
"arc-swap",
"libc",
"winapi",
]
@ -1265,6 +1265,7 @@ version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a8ebcb86ca457f9d6e14cf97009f679952eba42f0113de5db596e514cd0e43b"
dependencies = [
"arc-swap",
"libc",
"winapi",
]
@ -1280,7 +1281,7 @@ dependencies = [
"thiserror",
"versionize",
"versionize_derive",
"vm-memory 0.5.0",
"vm-memory 0.6.0",
]
[[package]]
@ -1289,7 +1290,7 @@ version = "0.1.0"
dependencies = [
"log",
"virtio-bindings",
"vm-memory 0.5.0",
"vm-memory 0.6.0",
]
[[package]]
@ -1330,7 +1331,7 @@ dependencies = [
"virtio-devices",
"vm-allocator",
"vm-device",
"vm-memory 0.5.0",
"vm-memory 0.6.0",
"vm-migration",
"vm-virtio",
"vmm-sys-util",

3
Cargo.toml
View File

@ -28,7 +28,7 @@ signal-hook = "0.3.9"
thiserror = "1.0.26"
vmm = { path = "vmm" }
vmm-sys-util = "0.8.0"
vm-memory = "0.5.0"
vm-memory = "0.6.0"
[build-dependencies]
clap = { version = "2.33.3", features = ["wrap_help"] }
@ -37,7 +37,6 @@ clap = { version = "2.33.3", features = ["wrap_help"] }
[patch.crates-io]
kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.4.0", features = ["with-serde", "fam-wrappers"] }
versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch" }
vm-memory = { git = "https://github.com/rust-vmm/vm-memory", rev = "5bd7138758183a73ac0da27ce40c004d95f1a7e9"}
[dev-dependencies]
credibility = "0.1.3"

2
acpi_tables/Cargo.toml
View File

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

2
arch/Cargo.toml
View File

@ -21,7 +21,7 @@ serde = {version = ">=1.0.27", features = ["rc"] }
thiserror = "1.0"
versionize = "0.1.6"
versionize_derive = "0.1.4"
vm-memory = { version = "0.5.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.5.0", features = ["with-serde"] }

2
block_util/Cargo.toml
View File

@ -17,7 +17,7 @@ thiserror = "1.0"
versionize = "0.1.6"
versionize_derive = "0.1.4"
virtio-bindings = { version = "0.1", features = ["virtio-v5_0_0"]}
vm-memory = { version = "0.5.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.3.1"

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.5.0"
vm-memory = "0.6.0"
vm-migration = { path = "../vm-migration" }
vmm-sys-util = ">=0.3.1"

2
fuzz/Cargo.toml
View File

@ -17,7 +17,7 @@ seccomp = { git = "https://github.com/firecracker-microvm/firecracker", tag = "v
virtio-devices = { path = "../virtio-devices" }
vmm-sys-util = "0.8.0"
vm-virtio = { path = "../vm-virtio" }
vm-memory = "0.5.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 = "master", opt
serde = {version = ">=1.0.27", features = ["rc"] }
serde_derive = ">=1.0.27"
serde_json = ">=1.0.9"
vm-memory = { version = "0.5.0", features = ["backend-mmap", "backend-atomic"] }
vm-memory = { version = "0.6.0", features = ["backend-mmap", "backend-atomic"] }
vmm-sys-util = { version = ">=0.5.0", features = ["with-serde"] }
[target.'cfg(target_arch = "x86_64")'.dependencies.iced-x86]

2
net_util/Cargo.toml
View File

@ -14,7 +14,7 @@ serde = "1.0.127"
versionize = "0.1.6"
versionize_derive = "0.1.4"
virtio-bindings = "0.1.0"
vm-memory = { version = "0.5.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.3.1"

2
pci/Cargo.toml
View File

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

2
vhost_user_backend/Cargo.toml
View File

@ -12,7 +12,7 @@ epoll = ">=4.0.1"
libc = "0.2.98"
log = "0.4.14"
virtio-bindings = "0.1.0"
vm-memory = { version = "0.5.0", features = ["backend-bitmap"] }
vm-memory = { version = "0.6.0", features = ["backend-bitmap"] }
vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = ">=0.3.1"
vhost = { git = "https://github.com/rust-vmm/vhost", branch = "master", package = "vhost", 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 = { git = "https://github.com/rust-vmm/vhost", branch = "master", package = "vhost", features = ["vhost-user-slave"] }
virtio-bindings = "0.1.0"
vm-memory = "0.5.0"
vm-memory = "0.6.0"
vmm-sys-util = ">=0.3.1"

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 = { git = "https://github.com/rust-vmm/vhost", branch = "master", package = "vhost", features = ["vhost-user-slave"] }
virtio-bindings = "0.1.0"
vm-memory = "0.5.0"
vm-memory = "0.6.0"
vmm-sys-util = ">=0.3.1"

2
virtio-devices/Cargo.toml
View File

@ -33,7 +33,7 @@ vhost = { git = "https://github.com/rust-vmm/vhost", branch = "master", package
virtio-bindings = { version = "0.1", features = ["virtio-v5_0_0"]}
vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" }
vm-memory = { version = "0.5.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.3.1"

2
vm-allocator/Cargo.toml
View File

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

2
vm-device/Cargo.toml
View File

@ -15,6 +15,6 @@ serde = {version = ">=1.0.27", features = ["rc"] }
serde_derive = ">=1.0.27"
serde_json = ">=1.0.9"
vfio-ioctls = { git = "https://github.com/rust-vmm/vfio-ioctls", branch = "master", default-features = false }
vm-memory = { version = "0.5.0", features = ["backend-mmap"] }
vm-memory = { version = "0.6.0", features = ["backend-mmap"] }
vmm-sys-util = ">=0.3.1"

2
vm-migration/Cargo.toml
View File

@ -12,4 +12,4 @@ serde_derive = ">=1.0.27"
serde_json = ">=1.0.9"
versionize = "0.1.6"
versionize_derive = "0.1.4"
vm-memory = { version = "0.5.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", features = ["virtio-v5_0_0"]}
vm-memory = { version = "0.5.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

@ -48,7 +48,7 @@ vfio-ioctls = { git = "https://github.com/rust-vmm/vfio-ioctls", branch = "maste
virtio-devices = { path = "../virtio-devices" }
vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" }
vm-memory = { version = "0.5.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.5.0", features = ["with-serde"] }