From bd463324f37766e3755dda50ab9100bbee59652b Mon Sep 17 00:00:00 2001
From: Rob Bradford <robert.bradford@intel.com>
Date: Fri, 11 Sep 2020 10:50:07 +0100
Subject: [PATCH] build: Move to rust-vmm vhost crate

There is no need to point at our forked version any longer.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
---
 Cargo.lock                    | 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 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2ff3d6144..41e530559 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1433,7 +1433,7 @@ dependencies = [
 [[package]]
 name = "vhost"
 version = "0.1.0"
-source = "git+https://github.com/cloud-hypervisor/vhost?branch=dragonball#422964150a69afd4611708076c60cb34c64a9856"
+source = "git+https://github.com/rust-vmm/vhost#d257479a40b42895b9adab11befa5385bbee0698"
 dependencies = [
  "bitflags 1.2.1",
  "libc",
diff --git a/vhost_user_backend/Cargo.toml b/vhost_user_backend/Cargo.toml
index 42b63374b..b9e19d198 100644
--- a/vhost_user_backend/Cargo.toml
+++ b/vhost_user_backend/Cargo.toml
@@ -15,4 +15,4 @@ virtio-bindings = "0.1.0"
 vm-memory = "0.2.1"
 vm-virtio = { path = "../vm-virtio" }
 vmm-sys-util = ">=0.3.1"
-vhost_rs = { git = "https://github.com/cloud-hypervisor/vhost", branch = "dragonball", package = "vhost", features = ["vhost-user-slave"] }
+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 6cf915bc6..8360e2134 100644
--- a/vhost_user_block/Cargo.toml
+++ b/vhost_user_block/Cargo.toml
@@ -13,7 +13,7 @@ log = "0.4.11"
 option_parser = { path = "../option_parser" }
 qcow = { path = "../qcow" }
 vhost_user_backend = { path = "../vhost_user_backend" }
-vhost_rs = { git = "https://github.com/cloud-hypervisor/vhost", branch = "dragonball", 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"
 vm-memory = "0.2.1"
 vmm-sys-util = ">=0.3.1"
diff --git a/vhost_user_fs/Cargo.toml b/vhost_user_fs/Cargo.toml
index 611aa3446..6f9eaa179 100644
--- a/vhost_user_fs/Cargo.toml
+++ b/vhost_user_fs/Cargo.toml
@@ -16,7 +16,7 @@ seccomp = { git = "https://github.com/firecracker-microvm/firecracker", tag = "v
 tempdir = "0.3.7"
 virtio-bindings = { version = "0.1", features = ["virtio-v5_0_0"]}
 virtio-devices = { path = "../virtio-devices" }
-vhost_rs = { git = "https://github.com/cloud-hypervisor/vhost", branch = "dragonball", 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"}
 vm-memory = "0.2.1"
 vm-virtio = { path = "../vm-virtio" }
diff --git a/vhost_user_net/Cargo.toml b/vhost_user_net/Cargo.toml
index e8a6314e5..6cdced9d5 100644
--- a/vhost_user_net/Cargo.toml
+++ b/vhost_user_net/Cargo.toml
@@ -12,7 +12,7 @@ log = "0.4.11"
 net_util = { path = "../net_util" }
 option_parser = { path = "../option_parser" }
 vhost_user_backend = { path = "../vhost_user_backend" }
-vhost_rs = { git = "https://github.com/cloud-hypervisor/vhost", branch = "dragonball", 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"
 vm-memory = "0.2.1"
 vmm-sys-util = ">=0.3.1"
diff --git a/virtio-devices/Cargo.toml b/virtio-devices/Cargo.toml
index cda788493..775de1367 100644
--- a/virtio-devices/Cargo.toml
+++ b/virtio-devices/Cargo.toml
@@ -28,7 +28,7 @@ serde_derive = ">=1.0.27"
 serde_json = ">=1.0.9"
 tempfile = "3.1.0"
 vfio-ioctls = { git = "https://github.com/cloud-hypervisor/vfio-ioctls", branch = "ch" }
-vhost_rs = { git = "https://github.com/cloud-hypervisor/vhost", branch = "dragonball", package = "vhost", features = ["vhost-user-master", "vhost-user-slave"] }
+vhost_rs = { git = "https://github.com/rust-vmm/vhost", branch = "master", package = "vhost", features = ["vhost-user-master", "vhost-user-slave"] }
 virtio-bindings = { version = "0.1", features = ["virtio-v5_0_0"]}
 vm-allocator = { path = "../vm-allocator" }
 vm-device = { path = "../vm-device" }