From 4ef4a22e02eddb0e9af537831088ef291993be33 Mon Sep 17 00:00:00 2001
From: Rob Bradford <robert.bradford@intel.com>
Date: Wed, 1 Sep 2021 13:17:09 +0100
Subject: [PATCH] build: Update vfio_user's vm-memory dependency

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
---
 Cargo.lock           | 53 ++++++++++++++++++--------------------------
 vfio_user/Cargo.toml |  2 +-
 2 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2c3907ac2..7ef7bf415 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6,7 +6,7 @@ version = 3
 name = "acpi_tables"
 version = "0.1.0"
 dependencies = [
- "vm-memory 0.6.0",
+ "vm-memory",
 ]
 
 [[package]]
@@ -78,7 +78,7 @@ dependencies = [
  "versionize",
  "versionize_derive",
  "vm-fdt",
- "vm-memory 0.6.0",
+ "vm-memory",
  "vm-migration",
  "vmm-sys-util",
 ]
@@ -143,7 +143,7 @@ dependencies = [
  "versionize_derive",
  "vhdx",
  "virtio-bindings",
- "vm-memory 0.6.0",
+ "vm-memory",
  "vm-virtio",
  "vmm-sys-util",
 ]
@@ -210,7 +210,7 @@ dependencies = [
  "signal-hook",
  "test_infra",
  "thiserror",
- "vm-memory 0.6.0",
+ "vm-memory",
  "vmm",
  "vmm-sys-util",
  "wait-timeout",
@@ -265,7 +265,7 @@ dependencies = [
  "versionize",
  "versionize_derive",
  "vm-device",
- "vm-memory 0.6.0",
+ "vm-memory",
  "vm-migration",
  "vmm-sys-util",
 ]
@@ -407,7 +407,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "thiserror",
- "vm-memory 0.6.0",
+ "vm-memory",
  "vmm-sys-util",
 ]
 
@@ -511,7 +511,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c819cc8275b0f2c1ed9feec455ca288b45d82932384a6a5f7a86812ee3427459"
 dependencies = [
- "vm-memory 0.6.0",
+ "vm-memory",
 ]
 
 [[package]]
@@ -602,7 +602,7 @@ dependencies = [
  "versionize",
  "versionize_derive",
  "virtio-bindings",
- "vm-memory 0.6.0",
+ "vm-memory",
  "vm-virtio",
  "vmm-sys-util",
 ]
@@ -674,7 +674,7 @@ dependencies = [
  "vfio_user",
  "vm-allocator",
  "vm-device",
- "vm-memory 0.6.0",
+ "vm-memory",
  "vm-migration",
  "vmm-sys-util",
 ]
@@ -1154,7 +1154,7 @@ dependencies = [
  "kvm-ioctls",
  "log",
  "vfio-bindings",
- "vm-memory 0.6.0",
+ "vm-memory",
  "vmm-sys-util",
 ]
 
@@ -1170,7 +1170,7 @@ dependencies = [
  "serde_json",
  "thiserror",
  "vfio-bindings",
- "vm-memory 0.5.0",
+ "vm-memory",
  "vmm-sys-util",
 ]
 
@@ -1196,7 +1196,7 @@ checksum = "8a6b90237e10f1a61b35fba73885c3567e1a5a8c40d44daae335f7710210a7dc"
 dependencies = [
  "bitflags",
  "libc",
- "vm-memory 0.6.0",
+ "vm-memory",
  "vmm-sys-util",
 ]
 
@@ -1209,7 +1209,7 @@ dependencies = [
  "log",
  "vhost",
  "virtio-bindings",
- "vm-memory 0.6.0",
+ "vm-memory",
  "vm-virtio",
  "vmm-sys-util",
 ]
@@ -1229,7 +1229,7 @@ dependencies = [
  "vhost",
  "vhost_user_backend",
  "virtio-bindings",
- "vm-memory 0.6.0",
+ "vm-memory",
  "vmm-sys-util",
 ]
 
@@ -1247,7 +1247,7 @@ dependencies = [
  "vhost",
  "vhost_user_backend",
  "virtio-bindings",
- "vm-memory 0.6.0",
+ "vm-memory",
  "vmm-sys-util",
 ]
 
@@ -1284,7 +1284,7 @@ dependencies = [
  "virtio-bindings",
  "vm-allocator",
  "vm-device",
- "vm-memory 0.6.0",
+ "vm-memory",
  "vm-migration",
  "vm-virtio",
  "vmm-sys-util",
@@ -1296,7 +1296,7 @@ version = "0.1.0"
 dependencies = [
  "arch",
  "libc",
- "vm-memory 0.6.0",
+ "vm-memory",
 ]
 
 [[package]]
@@ -1309,7 +1309,7 @@ dependencies = [
  "serde_json",
  "thiserror",
  "vfio-ioctls",
- "vm-memory 0.6.0",
+ "vm-memory",
  "vmm-sys-util",
 ]
 
@@ -1318,17 +1318,6 @@ name = "vm-fdt"
 version = "0.1.0"
 source = "git+https://github.com/rust-vmm/vm-fdt?branch=master#031572a6edc2f566a7278f1e17088fc5308d27ab"
 
-[[package]]
-name = "vm-memory"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "625f401b1b8b3ac3d43f53903cd138cfe840bd985f8581e553027b31d2bb8ae8"
-dependencies = [
- "arc-swap",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "vm-memory"
 version = "0.6.0"
@@ -1351,7 +1340,7 @@ dependencies = [
  "thiserror",
  "versionize",
  "versionize_derive",
- "vm-memory 0.6.0",
+ "vm-memory",
 ]
 
 [[package]]
@@ -1360,7 +1349,7 @@ version = "0.1.0"
 dependencies = [
  "log",
  "virtio-bindings",
- "vm-memory 0.6.0",
+ "vm-memory",
 ]
 
 [[package]]
@@ -1402,7 +1391,7 @@ dependencies = [
  "virtio-devices",
  "vm-allocator",
  "vm-device",
- "vm-memory 0.6.0",
+ "vm-memory",
  "vm-migration",
  "vm-virtio",
  "vmm-sys-util",
diff --git a/vfio_user/Cargo.toml b/vfio_user/Cargo.toml
index 2b72617d1..a29176839 100644
--- a/vfio_user/Cargo.toml
+++ b/vfio_user/Cargo.toml
@@ -12,7 +12,7 @@ serde = {version = ">=1.0.27", features = ["rc"] }
 serde_derive = ">=1.0.27"
 serde_json = ">=1.0.9"
 thiserror = "1.0.28"
-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 = ">=0.3.1"
 
 [dependencies.vfio-bindings]