From 6a9934d9334f2fe2c54358305d0eaebc8ebd9459 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Fri, 2 Oct 2020 16:04:13 +0100 Subject: [PATCH] build: Fix vm-memory bump build error 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 --- Cargo.lock | 4 ++-- acpi_tables/Cargo.toml | 2 +- arch/Cargo.toml | 2 +- block_util/Cargo.toml | 2 +- devices/Cargo.toml | 2 +- fuzz/Cargo.toml | 2 +- hypervisor/Cargo.toml | 2 +- net_util/Cargo.toml | 2 +- pci/Cargo.toml | 2 +- vhost_user_backend/Cargo.toml | 2 +- vhost_user_block/Cargo.toml | 2 +- vhost_user_fs/Cargo.toml | 2 +- vhost_user_net/Cargo.toml | 2 +- virtio-devices/Cargo.toml | 2 +- vm-allocator/Cargo.toml | 2 +- vm-device/Cargo.toml | 2 +- vm-virtio/Cargo.toml | 2 +- vmm/Cargo.toml | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bd3b3e6ec..2f75fb049 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1576,8 +1576,8 @@ dependencies = [ [[package]] name = "vm-memory" -version = "0.2.2" -source = "git+https://github.com/cloud-hypervisor/vm-memory?branch=ch#b28148d201b464acdef3124116ea43bb645cfd2f" +version = "0.3.0" +source = "git+https://github.com/cloud-hypervisor/vm-memory?branch=ch#6f2f7107f29a8f2b66b64a849aeace20783ec8f3" dependencies = [ "arc-swap", "libc", diff --git a/acpi_tables/Cargo.toml b/acpi_tables/Cargo.toml index 6c1926008..88af78680 100644 --- a/acpi_tables/Cargo.toml +++ b/acpi_tables/Cargo.toml @@ -5,5 +5,5 @@ authors = ["The Cloud Hypervisor Authors"] edition = "2018" [dependencies] -vm-memory = "0.2.1" +vm-memory = "0.3.0" diff --git a/arch/Cargo.toml b/arch/Cargo.toml index 9e0c31612..5c0601e44 100644 --- a/arch/Cargo.toml +++ b/arch/Cargo.toml @@ -16,7 +16,7 @@ log = "0.4.11" serde = {version = ">=1.0.27", features = ["rc"] } serde_derive = ">=1.0.27" 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" } acpi_tables = { path = "../acpi_tables", optional = true } arch_gen = { path = "../arch_gen" } diff --git a/block_util/Cargo.toml b/block_util/Cargo.toml index 3f29d758e..fc6f82544 100644 --- a/block_util/Cargo.toml +++ b/block_util/Cargo.toml @@ -16,6 +16,6 @@ serde = ">=1.0.27" serde_derive = ">=1.0.27" serde_json = ">=1.0.9" 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" } vmm-sys-util = ">=0.3.1" diff --git a/devices/Cargo.toml b/devices/Cargo.toml index 24fb84c1e..dbc847bbc 100644 --- a/devices/Cargo.toml +++ b/devices/Cargo.toml @@ -15,7 +15,7 @@ serde_derive = ">=1.0.27" serde_json = ">=1.0.9" vm-device = { path = "../vm-device" } acpi_tables = { path = "../acpi_tables", optional = true } -vm-memory = "0.2.1" +vm-memory = "0.3.0" vm-migration = { path = "../vm-migration" } vmm-sys-util = ">=0.3.1" diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index b1e52798b..f423ace72 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -18,7 +18,7 @@ seccomp = { git = "https://github.com/firecracker-microvm/firecracker", tag = "v virtio-devices = { path = "../virtio-devices" } vmm-sys-util = ">=0.3.1" vm-virtio = { path = "../vm-virtio" } -vm-memory = "0.2.1" +vm-memory = "0.3.0" [dependencies.cloud-hypervisor] path = ".." diff --git a/hypervisor/Cargo.toml b/hypervisor/Cargo.toml index 1fad0ff5f..a824bb0a1 100644 --- a/hypervisor/Cargo.toml +++ b/hypervisor/Cargo.toml @@ -17,7 +17,7 @@ kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branc serde = {version = ">=1.0.27", features = ["rc"] } serde_derive = ">=1.0.27" 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"] } [dependencies.linux-loader] diff --git a/net_util/Cargo.toml b/net_util/Cargo.toml index 05423b57d..fa6d13e80 100644 --- a/net_util/Cargo.toml +++ b/net_util/Cargo.toml @@ -11,7 +11,7 @@ net_gen = { path = "../net_gen" } rand = "0.7.3" serde = "1.0.116" 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" } vmm-sys-util = ">=0.3.1" diff --git a/pci/Cargo.toml b/pci/Cargo.toml index 4e4c94b38..156f580b7 100644 --- a/pci/Cargo.toml +++ b/pci/Cargo.toml @@ -17,7 +17,7 @@ serde_derive = ">=1.0.27" serde_json = ">=1.0.9" vm-allocator = { path = "../vm-allocator" } vm-device = { path = "../vm-device" } -vm-memory = "0.2.1" +vm-memory = "0.3.0" vm-migration = { path = "../vm-migration" } [dependencies.vfio-bindings] diff --git a/vhost_user_backend/Cargo.toml b/vhost_user_backend/Cargo.toml index e3a03368e..019361622 100644 --- a/vhost_user_backend/Cargo.toml +++ b/vhost_user_backend/Cargo.toml @@ -12,7 +12,7 @@ epoll = ">=4.0.1" libc = "0.2.78" log = "0.4.11" virtio-bindings = "0.1.0" -vm-memory = "0.2.1" +vm-memory = "0.3.0" vm-virtio = { path = "../vm-virtio" } vmm-sys-util = ">=0.3.1" vhost_rs = { git = "https://github.com/rust-vmm/vhost", branch = "master", package = "vhost", features = ["vhost-user-slave"] } diff --git a/vhost_user_block/Cargo.toml b/vhost_user_block/Cargo.toml index d9e09b5df..1710dfacf 100644 --- a/vhost_user_block/Cargo.toml +++ b/vhost_user_block/Cargo.toml @@ -15,5 +15,5 @@ qcow = { path = "../qcow" } vhost_user_backend = { path = "../vhost_user_backend" } vhost_rs = { git = "https://github.com/rust-vmm/vhost", branch = "master", package = "vhost", features = ["vhost-user-slave"] } virtio-bindings = "0.1.0" -vm-memory = "0.2.1" +vm-memory = "0.3.0" vmm-sys-util = ">=0.3.1" diff --git a/vhost_user_fs/Cargo.toml b/vhost_user_fs/Cargo.toml index 4655b1f3d..ee222d4b8 100644 --- a/vhost_user_fs/Cargo.toml +++ b/vhost_user_fs/Cargo.toml @@ -18,6 +18,6 @@ virtio-bindings = { version = "0.1", features = ["virtio-v5_0_0"]} virtio-devices = { path = "../virtio-devices" } vhost_rs = { git = "https://github.com/rust-vmm/vhost", branch = "master", package = "vhost", features = ["vhost-user-slave"] } vhost_user_backend = { path = "../vhost_user_backend"} -vm-memory = "0.2.1" +vm-memory = "0.3.0" vm-virtio = { path = "../vm-virtio" } vmm-sys-util = "0.6.1" \ No newline at end of file diff --git a/vhost_user_net/Cargo.toml b/vhost_user_net/Cargo.toml index 8d310938d..e5a079b49 100644 --- a/vhost_user_net/Cargo.toml +++ b/vhost_user_net/Cargo.toml @@ -14,5 +14,5 @@ option_parser = { path = "../option_parser" } vhost_user_backend = { path = "../vhost_user_backend" } vhost_rs = { git = "https://github.com/rust-vmm/vhost", branch = "master", package = "vhost", features = ["vhost-user-slave"] } virtio-bindings = "0.1.0" -vm-memory = "0.2.1" +vm-memory = "0.3.0" vmm-sys-util = ">=0.3.1" diff --git a/virtio-devices/Cargo.toml b/virtio-devices/Cargo.toml index b592edfe1..8580f5a89 100644 --- a/virtio-devices/Cargo.toml +++ b/virtio-devices/Cargo.toml @@ -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"]} vm-allocator = { path = "../vm-allocator" } 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-virtio = { path = "../vm-virtio" } vmm-sys-util = ">=0.3.1" diff --git a/vm-allocator/Cargo.toml b/vm-allocator/Cargo.toml index e20065816..cadc4d575 100644 --- a/vm-allocator/Cargo.toml +++ b/vm-allocator/Cargo.toml @@ -6,5 +6,5 @@ edition = "2018" [dependencies] libc = "0.2.78" -vm-memory = "0.2.1" +vm-memory = "0.3.0" arch = { path = "../arch" } diff --git a/vm-device/Cargo.toml b/vm-device/Cargo.toml index e6f9951cf..99b948715 100644 --- a/vm-device/Cargo.toml +++ b/vm-device/Cargo.toml @@ -10,6 +10,6 @@ thiserror = "1.0" serde = {version = ">=1.0.27", features = ["rc"] } serde_derive = ">=1.0.27" 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" diff --git a/vm-virtio/Cargo.toml b/vm-virtio/Cargo.toml index edf4b34d7..4007cdfe3 100644 --- a/vm-virtio/Cargo.toml +++ b/vm-virtio/Cargo.toml @@ -13,4 +13,4 @@ serde = ">=1.0.27" serde_derive = ">=1.0.27" serde_json = ">=1.0.9" virtio-bindings = { version = "0.1", features = ["virtio-v5_0_0"]} -vm-memory = { version = "0.2.1", features = ["backend-mmap", "backend-atomic"] } \ No newline at end of file +vm-memory = { version = "0.3.0", features = ["backend-mmap", "backend-atomic"] } \ No newline at end of file diff --git a/vmm/Cargo.toml b/vmm/Cargo.toml index 8e64fd491..f6e4e70b1 100644 --- a/vmm/Cargo.toml +++ b/vmm/Cargo.toml @@ -42,7 +42,7 @@ vfio-ioctls = { git = "https://github.com/cloud-hypervisor/vfio-ioctls", branch virtio-devices = {path = "../virtio-devices"} vm-allocator = { path = "../vm-allocator" } 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-virtio = { path = "../vm-virtio" } vmm-sys-util = { version = ">=0.5.0", features = ["with-serde"] }