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: Fix vm-memory bump build error

Browse Source 
A new version of vm-memory was released upstream which resulted in some
components pulling in that new version. Update the version number used
to point to the latest version but continue to use our patched version
due to the fix for #1258

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-10-02 16:04:13 +01:00
parent 2d457ab974
commit 6a9934d933
18 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -1576,8 +1576,8 @@ dependencies = [
[[package]] [[package]]
name = "vm-memory" name = "vm-memory"
version = "0.2.2" version = "0.3.0"
source = "git+https://github.com/cloud-hypervisor/vm-memory?branch=ch#b28148d201b464acdef3124116ea43bb645cfd2f" source = "git+https://github.com/cloud-hypervisor/vm-memory?branch=ch#6f2f7107f29a8f2b66b64a849aeace20783ec8f3"
dependencies = [ dependencies = [
"arc-swap", "arc-swap",
"libc", "libc",

2
acpi_tables/Cargo.toml
View File

@ -5,5 +5,5 @@ authors = ["The Cloud Hypervisor Authors"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
vm-memory = "0.2.1" vm-memory = "0.3.0"

2
arch/Cargo.toml
View File

@ -16,7 +16,7 @@ log = "0.4.11"
serde = {version = ">=1.0.27", features = ["rc"] } serde = {version = ">=1.0.27", features = ["rc"] }
serde_derive = ">=1.0.27" serde_derive = ">=1.0.27"
serde_json = ">=1.0.9" serde_json = ">=1.0.9"
vm-memory = { version = "0.2.1", features = ["backend-mmap"] } vm-memory = { version = "0.3.0", features = ["backend-mmap"] }
vm-migration = { path = "../vm-migration" } vm-migration = { path = "../vm-migration" }
acpi_tables = { path = "../acpi_tables", optional = true } acpi_tables = { path = "../acpi_tables", optional = true }
arch_gen = { path = "../arch_gen" } arch_gen = { path = "../arch_gen" }

2
block_util/Cargo.toml
View File

@ -16,6 +16,6 @@ serde = ">=1.0.27"
serde_derive = ">=1.0.27" serde_derive = ">=1.0.27"
serde_json = ">=1.0.9" serde_json = ">=1.0.9"
virtio-bindings = { version = "0.1", features = ["virtio-v5_0_0"]} virtio-bindings = { version = "0.1", features = ["virtio-v5_0_0"]}
vm-memory = { version = "0.2.1", features = ["backend-mmap", "backend-atomic"] } vm-memory = { version = "0.3.0", features = ["backend-mmap", "backend-atomic"] }
vm-virtio = { path = "../vm-virtio" } vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = ">=0.3.1" vmm-sys-util = ">=0.3.1"

2
devices/Cargo.toml
View File

@ -15,7 +15,7 @@ serde_derive = ">=1.0.27"
serde_json = ">=1.0.9" serde_json = ">=1.0.9"
vm-device = { path = "../vm-device" } vm-device = { path = "../vm-device" }
acpi_tables = { path = "../acpi_tables", optional = true } acpi_tables = { path = "../acpi_tables", optional = true }
vm-memory = "0.2.1" vm-memory = "0.3.0"
vm-migration = { path = "../vm-migration" } vm-migration = { path = "../vm-migration" }
vmm-sys-util = ">=0.3.1" vmm-sys-util = ">=0.3.1"

2
fuzz/Cargo.toml
View File

@ -18,7 +18,7 @@ seccomp = { git = "https://github.com/firecracker-microvm/firecracker", tag = "v
virtio-devices = { path = "../virtio-devices" } virtio-devices = { path = "../virtio-devices" }
vmm-sys-util = ">=0.3.1" vmm-sys-util = ">=0.3.1"
vm-virtio = { path = "../vm-virtio" } vm-virtio = { path = "../vm-virtio" }
vm-memory = "0.2.1" vm-memory = "0.3.0"
[dependencies.cloud-hypervisor] [dependencies.cloud-hypervisor]
path = ".." path = ".."

2
hypervisor/Cargo.toml
View File

@ -17,7 +17,7 @@ kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branc
serde = {version = ">=1.0.27", features = ["rc"] } serde = {version = ">=1.0.27", features = ["rc"] }
serde_derive = ">=1.0.27" serde_derive = ">=1.0.27"
serde_json = ">=1.0.9" serde_json = ">=1.0.9"
vm-memory = { version = "0.2.0", features = ["backend-mmap", "backend-atomic"] } vm-memory = { version = "0.3.0", features = ["backend-mmap", "backend-atomic"] }
vmm-sys-util = { version = ">=0.5.0", features = ["with-serde"] } vmm-sys-util = { version = ">=0.5.0", features = ["with-serde"] }
[dependencies.linux-loader] [dependencies.linux-loader]

2
net_util/Cargo.toml
View File

@ -11,7 +11,7 @@ net_gen = { path = "../net_gen" }
rand = "0.7.3" rand = "0.7.3"
serde = "1.0.116" serde = "1.0.116"
virtio-bindings = "0.1.0" virtio-bindings = "0.1.0"
vm-memory = { version = "0.2.1", features = ["backend-mmap", "backend-atomic"] } vm-memory = { version = "0.3.0", features = ["backend-mmap", "backend-atomic"] }
vm-virtio = { path = "../vm-virtio" } vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = ">=0.3.1" vmm-sys-util = ">=0.3.1"

2
pci/Cargo.toml
View File

@ -17,7 +17,7 @@ serde_derive = ">=1.0.27"
serde_json = ">=1.0.9" serde_json = ">=1.0.9"
vm-allocator = { path = "../vm-allocator" } vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" } vm-device = { path = "../vm-device" }
vm-memory = "0.2.1" vm-memory = "0.3.0"
vm-migration = { path = "../vm-migration" } vm-migration = { path = "../vm-migration" }
[dependencies.vfio-bindings] [dependencies.vfio-bindings]

2
vhost_user_backend/Cargo.toml
View File

@ -12,7 +12,7 @@ epoll = ">=4.0.1"
libc = "0.2.78" libc = "0.2.78"
log = "0.4.11" log = "0.4.11"
virtio-bindings = "0.1.0" virtio-bindings = "0.1.0"
vm-memory = "0.2.1" vm-memory = "0.3.0"
vm-virtio = { path = "../vm-virtio" } vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = ">=0.3.1" vmm-sys-util = ">=0.3.1"
vhost_rs = { git = "https://github.com/rust-vmm/vhost", branch = "master", package = "vhost", features = ["vhost-user-slave"] } vhost_rs = { git = "https://github.com/rust-vmm/vhost", branch = "master", package = "vhost", features = ["vhost-user-slave"] }

2
vhost_user_block/Cargo.toml
View File

@ -15,5 +15,5 @@ qcow = { path = "../qcow" }
vhost_user_backend = { path = "../vhost_user_backend" } vhost_user_backend = { path = "../vhost_user_backend" }
vhost_rs = { git = "https://github.com/rust-vmm/vhost", branch = "master", package = "vhost", features = ["vhost-user-slave"] } vhost_rs = { git = "https://github.com/rust-vmm/vhost", branch = "master", package = "vhost", features = ["vhost-user-slave"] }
virtio-bindings = "0.1.0" virtio-bindings = "0.1.0"
vm-memory = "0.2.1" vm-memory = "0.3.0"
vmm-sys-util = ">=0.3.1" vmm-sys-util = ">=0.3.1"

2
vhost_user_fs/Cargo.toml
View File

@ -18,6 +18,6 @@ virtio-bindings = { version = "0.1", features = ["virtio-v5_0_0"]}
virtio-devices = { path = "../virtio-devices" } virtio-devices = { path = "../virtio-devices" }
vhost_rs = { git = "https://github.com/rust-vmm/vhost", branch = "master", package = "vhost", features = ["vhost-user-slave"] } vhost_rs = { git = "https://github.com/rust-vmm/vhost", branch = "master", package = "vhost", features = ["vhost-user-slave"] }
vhost_user_backend = { path = "../vhost_user_backend"} vhost_user_backend = { path = "../vhost_user_backend"}
vm-memory = "0.2.1" vm-memory = "0.3.0"
vm-virtio = { path = "../vm-virtio" } vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = "0.6.1" vmm-sys-util = "0.6.1"

2
vhost_user_net/Cargo.toml
View File

@ -14,5 +14,5 @@ option_parser = { path = "../option_parser" }
vhost_user_backend = { path = "../vhost_user_backend" } vhost_user_backend = { path = "../vhost_user_backend" }
vhost_rs = { git = "https://github.com/rust-vmm/vhost", branch = "master", package = "vhost", features = ["vhost-user-slave"] } vhost_rs = { git = "https://github.com/rust-vmm/vhost", branch = "master", package = "vhost", features = ["vhost-user-slave"] }
virtio-bindings = "0.1.0" virtio-bindings = "0.1.0"
vm-memory = "0.2.1" vm-memory = "0.3.0"
vmm-sys-util = ">=0.3.1" vmm-sys-util = ">=0.3.1"

2
virtio-devices/Cargo.toml
View File

@ -32,7 +32,7 @@ vhost_rs = { git = "https://github.com/rust-vmm/vhost", branch = "master", packa
virtio-bindings = { version = "0.1", features = ["virtio-v5_0_0"]} virtio-bindings = { version = "0.1", features = ["virtio-v5_0_0"]}
vm-allocator = { path = "../vm-allocator" } vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" } vm-device = { path = "../vm-device" }
vm-memory = { version = "0.2.1", features = ["backend-mmap", "backend-atomic"] } vm-memory = { version = "0.3.0", features = ["backend-mmap", "backend-atomic"] }
vm-migration = { path = "../vm-migration" } vm-migration = { path = "../vm-migration" }
vm-virtio = { path = "../vm-virtio" } vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = ">=0.3.1" vmm-sys-util = ">=0.3.1"

2
vm-allocator/Cargo.toml
View File

@ -6,5 +6,5 @@ edition = "2018"
[dependencies] [dependencies]
libc = "0.2.78" libc = "0.2.78"
vm-memory = "0.2.1" vm-memory = "0.3.0"
arch = { path = "../arch" } arch = { path = "../arch" }

2
vm-device/Cargo.toml
View File

@ -10,6 +10,6 @@ thiserror = "1.0"
serde = {version = ">=1.0.27", features = ["rc"] } serde = {version = ">=1.0.27", features = ["rc"] }
serde_derive = ">=1.0.27" serde_derive = ">=1.0.27"
serde_json = ">=1.0.9" serde_json = ">=1.0.9"
vm-memory = { version = "0.2.1", features = ["backend-mmap"] } vm-memory = { version = "0.3.0", features = ["backend-mmap"] }
vmm-sys-util = ">=0.3.1" vmm-sys-util = ">=0.3.1"

2
vm-virtio/Cargo.toml
View File

@ -13,4 +13,4 @@ serde = ">=1.0.27"
serde_derive = ">=1.0.27" serde_derive = ">=1.0.27"
serde_json = ">=1.0.9" serde_json = ">=1.0.9"
virtio-bindings = { version = "0.1", features = ["virtio-v5_0_0"]} virtio-bindings = { version = "0.1", features = ["virtio-v5_0_0"]}
vm-memory = { version = "0.2.1", features = ["backend-mmap", "backend-atomic"] } vm-memory = { version = "0.3.0", features = ["backend-mmap", "backend-atomic"] }

2
vmm/Cargo.toml
View File

@ -42,7 +42,7 @@ vfio-ioctls = { git = "https://github.com/cloud-hypervisor/vfio-ioctls", branch
virtio-devices = {path = "../virtio-devices"} virtio-devices = {path = "../virtio-devices"}
vm-allocator = { path = "../vm-allocator" } vm-allocator = { path = "../vm-allocator" }
vm-device = { path = "../vm-device" } vm-device = { path = "../vm-device" }
vm-memory = { version = "0.2.1", features = ["backend-mmap", "backend-atomic"] } vm-memory = { version = "0.3.0", features = ["backend-mmap", "backend-atomic"] }
vm-migration = { path = "../vm-migration" } vm-migration = { path = "../vm-migration" }
vm-virtio = { path = "../vm-virtio" } vm-virtio = { path = "../vm-virtio" }
vmm-sys-util = { version = ">=0.5.0", features = ["with-serde"] } vmm-sys-util = { version = ">=0.5.0", features = ["with-serde"] }