From 12b036a824722312456f989285dc9b6e9697b8a6 Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Mon, 17 Feb 2020 15:28:24 +0100
Subject: [PATCH] Cargo: Update dependencies for the KVM serialization work

We need the project to rely on kvm-bindings and kvm-ioctls branches
which include the serde derive to be able to serialize and deserialize
some KVM structures.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---
 Cargo.lock      | 8 ++++----
 Cargo.toml      | 1 +
 arch/Cargo.toml | 4 ++--
 vfio/Cargo.toml | 4 ++--
 vmm/Cargo.toml  | 6 +++---
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e070e3ba7..555cef41b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -464,8 +464,7 @@ dependencies = [
 [[package]]
 name = "kvm-bindings"
 version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d381156ad52005b4655a9421401f02b80f9f049e653496e3ea6639a83fc12453"
+source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch#3a6780089e0e2d69aaf77666524e81801c814bdd"
 dependencies = [
  "vmm-sys-util",
 ]
@@ -473,8 +472,7 @@ dependencies = [
 [[package]]
 name = "kvm-ioctls"
 version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d99720f5df3814a7188f095ad6774775b7635dfdd62b7c091ce7e00a51c3c109"
+source = "git+https://github.com/cloud-hypervisor/kvm-ioctls?branch=ch#4999c0f4366b5cf017cf757c0d84b054881d3206"
 dependencies = [
  "kvm-bindings",
  "libc",
@@ -1465,6 +1463,8 @@ checksum = "3a6cc7e1659e545d250261676c9193732da57357cc610b12a0e7c776ed047fc9"
 dependencies = [
  "bitflags 1.2.1",
  "libc",
+ "serde",
+ "serde_derive",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index ba7dcc17d..aa37b103a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,6 +35,7 @@ credibility = "0.1.3"
 tempdir= "0.3.7"
 lazy_static= "1.4.0"
 tempfile = "3.1.0"
+serde_json = ">=1.0.9"
 
 [features]
 default = ["acpi", "pci", "cmos"]
diff --git a/arch/Cargo.toml b/arch/Cargo.toml
index 8370d9022..96c1af0e4 100644
--- a/arch/Cargo.toml
+++ b/arch/Cargo.toml
@@ -8,8 +8,8 @@ default = []
 
 [dependencies]
 byteorder = "1.3.4"
-kvm-bindings = "0.2.0"
-kvm-ioctls = "0.5.0"
+kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch" }
+kvm-ioctls = { git = "https://github.com/cloud-hypervisor/kvm-ioctls", branch = "ch" }
 libc = "0.2.68"
 vm-memory = { version = "0.2.0", features = ["backend-mmap"] }
 
diff --git a/vfio/Cargo.toml b/vfio/Cargo.toml
index 3faa275e1..810b1ed50 100644
--- a/vfio/Cargo.toml
+++ b/vfio/Cargo.toml
@@ -7,8 +7,8 @@ authors = ["The Cloud Hypervisor Authors"]
 arc-swap = ">=0.4.4"
 byteorder = "1.3.4"
 devices = { path = "../devices" }
-kvm-bindings = "0.2.0"
-kvm-ioctls = "0.5.0"
+kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch" }
+kvm-ioctls = { git = "https://github.com/cloud-hypervisor/kvm-ioctls", branch = "ch" }
 libc = "0.2.68"
 log = "0.4.8"
 pci = { path = "../pci" }
diff --git a/vmm/Cargo.toml b/vmm/Cargo.toml
index d16dd090b..3fd5ede2f 100644
--- a/vmm/Cargo.toml
+++ b/vmm/Cargo.toml
@@ -19,8 +19,8 @@ anyhow = "1.0"
 arch = { path = "../arch" }
 devices = { path = "../devices" }
 epoll = ">=4.0.1"
-kvm-bindings = "0.2.0"
-kvm-ioctls = "0.5.0"
+kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch" }
+kvm-ioctls = { git = "https://github.com/cloud-hypervisor/kvm-ioctls", branch = "ch" }
 lazy_static = "1.4.0"
 libc = "0.2.68"
 log = "0.4.8"
@@ -38,7 +38,7 @@ vm-device = { path = "../vm-device" }
 vm-memory = { version = "0.2.0", features = ["backend-mmap", "backend-atomic"] }
 vm-migration = { path = "../vm-migration" }
 vm-virtio = { path = "../vm-virtio" }
-vmm-sys-util = ">=0.3.1"
+vmm-sys-util = { version = ">=0.5.0", features = ["with-serde"] }
 signal-hook = "0.1.13"
 tempfile = "3.1.0"