diff --git a/Cargo.lock b/Cargo.lock index cee46772b..52e8e2e06 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -174,7 +174,7 @@ dependencies = [ "serde_json 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", "ssh2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "vhost_rs 0.1.0", + "vhost 0.1.0 (git+https://github.com/cloud-hypervisor/vhost?branch=dragonball)", "vhost_user_backend 0.1.0", "vhost_user_block 0.1.0", "vhost_user_fs 0.1.0", @@ -1023,13 +1023,12 @@ dependencies = [ ] [[package]] -name = "vhost_rs" +name = "vhost" version = "0.1.0" +source = "git+https://github.com/cloud-hypervisor/vhost?branch=dragonball#7d5a205199e3d5594494b3021635a719580fabc8" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", - "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)", "vmm-sys-util 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1040,7 +1039,7 @@ dependencies = [ "epoll 4.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "vhost_rs 0.1.0", + "vhost 0.1.0 (git+https://github.com/cloud-hypervisor/vhost?branch=dragonball)", "virtio-bindings 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)", "vm-virtio 0.1.0", @@ -1056,7 +1055,7 @@ dependencies = [ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "qcow 0.1.0", - "vhost_rs 0.1.0", + "vhost 0.1.0 (git+https://github.com/cloud-hypervisor/vhost?branch=dragonball)", "vhost_user_backend 0.1.0", "virtio-bindings 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)", @@ -1071,7 +1070,7 @@ dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "vhost_rs 0.1.0", + "vhost 0.1.0 (git+https://github.com/cloud-hypervisor/vhost?branch=dragonball)", "vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)", "vm-virtio 0.1.0", ] @@ -1085,7 +1084,7 @@ dependencies = [ "libc 0.2.67 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "net_util 0.1.0", - "vhost_rs 0.1.0", + "vhost 0.1.0 (git+https://github.com/cloud-hypervisor/vhost?branch=dragonball)", "vhost_user_backend 0.1.0", "virtio-bindings 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)", @@ -1148,7 +1147,7 @@ dependencies = [ "net_util 0.1.0", "pci 0.1.0", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "vhost_rs 0.1.0", + "vhost 0.1.0 (git+https://github.com/cloud-hypervisor/vhost?branch=dragonball)", "virtio-bindings 0.1.0 (git+https://github.com/rust-vmm/virtio-bindings)", "vm-allocator 0.1.0", "vm-device 0.1.0", @@ -1351,6 +1350,7 @@ dependencies = [ "checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" "checksum vfio-bindings 0.1.0 (git+https://github.com/rust-vmm/vfio-bindings)" = "" +"checksum vhost 0.1.0 (git+https://github.com/cloud-hypervisor/vhost?branch=dragonball)" = "" "checksum virtio-bindings 0.1.0 (git+https://github.com/rust-vmm/virtio-bindings)" = "" "checksum virtio-bindings 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ff512178285488516ed85f15b5d0113a7cdb89e9e8a760b269ae4f02b84bd6b" "checksum vm-memory 0.1.0 (git+https://github.com/rust-vmm/vm-memory)" = "" diff --git a/Cargo.toml b/Cargo.toml index ffeee2f5c..f55a7688b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,6 +23,7 @@ vm-device = { path = "vm-device" } vm-memory = { git = "https://github.com/rust-vmm/vm-memory" } vmm-sys-util = ">=0.3.1" vm-virtio = { path = "vm-virtio" } +vhost_rs = { git = "https://github.com/cloud-hypervisor/vhost", branch = "dragonball", package = "vhost", features = ["vhost-user-slave"] } [dev-dependencies] ssh2 = "0.8.0" @@ -32,10 +33,6 @@ tempdir= "0.3.7" lazy_static= "1.4.0" serde_json = ">=1.0.9" -[dependencies.vhost_rs] -path = "vhost_rs" -features = ["vhost-user-slave"] - [features] default = ["acpi", "pci", "cmos"] acpi = ["vmm/acpi"] @@ -50,7 +47,6 @@ integration_tests = [] members = [ "arch", "devices", - "vhost_rs", "qcow", "pci", "vmm", diff --git a/vhost_user_backend/Cargo.toml b/vhost_user_backend/Cargo.toml index 6993f09e5..bf5d67c26 100644 --- a/vhost_user_backend/Cargo.toml +++ b/vhost_user_backend/Cargo.toml @@ -17,7 +17,4 @@ virtio-bindings = "0.1.0" vm-memory = { git = "https://github.com/rust-vmm/vm-memory" } vm-virtio = { path = "../vm-virtio" } vmm-sys-util = ">=0.3.1" - -[dependencies.vhost_rs] -path = "../vhost_rs" -features = ["vhost-user-slave"] +vhost_rs = { git = "https://github.com/cloud-hypervisor/vhost", branch = "dragonball", package = "vhost", features = ["vhost-user-slave"] } diff --git a/vhost_user_block/Cargo.toml b/vhost_user_block/Cargo.toml index 6eda6e08b..2cf0b2f72 100644 --- a/vhost_user_block/Cargo.toml +++ b/vhost_user_block/Cargo.toml @@ -11,8 +11,8 @@ libc = "0.2.67" log = "0.4.8" qcow = { path = "../qcow" } vhost_user_backend = { path = "../vhost_user_backend" } -vhost_rs = { path = "../vhost_rs" } +vhost_rs = { git = "https://github.com/cloud-hypervisor/vhost", branch = "dragonball", package = "vhost", features = ["vhost-user-slave"] } virtio-bindings = "0.1.0" vm-memory = { git = "https://github.com/rust-vmm/vm-memory" } vm-virtio = { path = "../vm-virtio" } -vmm-sys-util = ">=0.3.1" \ No newline at end of file +vmm-sys-util = ">=0.3.1" diff --git a/vhost_user_fs/Cargo.toml b/vhost_user_fs/Cargo.toml index c4176979f..02e2be2ac 100644 --- a/vhost_user_fs/Cargo.toml +++ b/vhost_user_fs/Cargo.toml @@ -10,7 +10,4 @@ libc = "0.2.67" log = "0.4.8" vm-memory = { git = "https://github.com/rust-vmm/vm-memory" } vm-virtio = { path = "../vm-virtio" } - -[dependencies.vhost_rs] -path = "../vhost_rs" -features = ["vhost-user-slave"] +vhost_rs = { git = "https://github.com/cloud-hypervisor/vhost", branch = "dragonball", package = "vhost", features = ["vhost-user-slave"] } diff --git a/vhost_user_net/Cargo.toml b/vhost_user_net/Cargo.toml index 4e1345d4e..12953365f 100644 --- a/vhost_user_net/Cargo.toml +++ b/vhost_user_net/Cargo.toml @@ -11,8 +11,8 @@ libc = "0.2.67" log = "0.4.8" net_util = { path = "../net_util" } vhost_user_backend = { path = "../vhost_user_backend" } -vhost_rs = { path = "../vhost_rs" } +vhost_rs = { git = "https://github.com/cloud-hypervisor/vhost", branch = "dragonball", package = "vhost", features = ["vhost-user-slave"] } virtio-bindings = "0.1.0" vm-memory = { git = "https://github.com/rust-vmm/vm-memory" } vm-virtio = { path = "../vm-virtio" } -vmm-sys-util = ">=0.3.1" \ No newline at end of file +vmm-sys-util = ">=0.3.1" diff --git a/vm-virtio/Cargo.toml b/vm-virtio/Cargo.toml index 7c193a90c..13fdbb0b0 100644 --- a/vm-virtio/Cargo.toml +++ b/vm-virtio/Cargo.toml @@ -24,10 +24,7 @@ virtio-bindings = { git = "https://github.com/rust-vmm/virtio-bindings", version vm-allocator = { path = "../vm-allocator" } vm-device = { path = "../vm-device" } vmm-sys-util = ">=0.3.1" - -[dependencies.vhost_rs] -path = "../vhost_rs" -features = ["vhost-user-master", "vhost-user-slave"] +vhost_rs = { git = "https://github.com/cloud-hypervisor/vhost", branch = "dragonball", package = "vhost", features = ["vhost-user-master", "vhost-user-slave"] } [dependencies.vm-memory] git = "https://github.com/rust-vmm/vm-memory"