External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-01-03 03:15:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

deps: Patch kvm-ioctls and kvm-bindings crates

Browse Source 
Instead of having the hypervisor crate embedding Cloud-Hypervisor forks
from the rust-vmm project, it's more appropriate to leave the rust-vmm
references in the hypervisor crate, and have the root Cargo.toml being
patched.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf 2020-10-07 19:14:13 +02:00
parent 095ea049e2
commit 2fac41f154
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.toml
View File

@ -28,11 +28,15 @@ vmm-sys-util = "0.6.1"
[build-dependencies] [build-dependencies]
clap = { version = "2.33.3", features = ["wrap_help"] } clap = { version = "2.33.3", features = ["wrap_help"] }
# List of patched crates
[patch.crates-io] [patch.crates-io]
vm-memory = { git = "https://github.com/cloud-hypervisor/vm-memory", branch = "ch" } vm-memory = { git = "https://github.com/cloud-hypervisor/vm-memory", branch = "ch" }
[patch.'https://github.com/rust-vmm/vhost'] [patch.'https://github.com/rust-vmm/vhost']
vhost_rs = { git = "https://github.com/cloud-hypervisor/vhost", branch = "ch", package = "vhost", features = ["vhost-user-master", "vhost-user-slave"] } vhost_rs = { git = "https://github.com/cloud-hypervisor/vhost", branch = "ch", package = "vhost", features = ["vhost-user-master", "vhost-user-slave"] }
[patch.'https://github.com/rust-vmm/kvm-ioctls']
kvm-ioctls = { git = "https://github.com/cloud-hypervisor/kvm-ioctls", branch = "ch" }
[patch.'https://github.com/rust-vmm/kvm-bindings']
kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch", features = ["with-serde", "fam-wrappers"] }
[dev-dependencies] [dev-dependencies]
ssh2 = "0.8.2" ssh2 = "0.8.2"

6
fuzz/Cargo.toml
View File

@ -10,7 +10,7 @@ edition = "2018"
cargo-fuzz = true cargo-fuzz = true
[dependencies] [dependencies]
kvm-ioctls = { git = "https://github.com/cloud-hypervisor/kvm-ioctls", branch = "ch" } kvm-ioctls = { git = "https://github.com/rust-vmm/kvm-ioctls", branch = "master" }
libc = "0.2.72" libc = "0.2.72"
libfuzzer-sys = "0.3" libfuzzer-sys = "0.3"
qcow = { path = "../qcow" } qcow = { path = "../qcow" }
@ -25,6 +25,10 @@ path = ".."
[patch.crates-io] [patch.crates-io]
vm-memory = { git = "https://github.com/cloud-hypervisor/vm-memory", branch = "ch" } vm-memory = { git = "https://github.com/cloud-hypervisor/vm-memory", branch = "ch" }
[patch.'https://github.com/rust-vmm/kvm-ioctls']
kvm-ioctls = { git = "https://github.com/cloud-hypervisor/kvm-ioctls", branch = "ch" }
[patch.'https://github.com/rust-vmm/kvm-bindings']
kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch", features = ["with-serde", "fam-wrappers"] }
# Prevent this from interfering with workspaces # Prevent this from interfering with workspaces
[workspace] [workspace]

4
hypervisor/Cargo.toml
View File

@ -13,8 +13,8 @@ arc-swap = ">=0.4.4"
thiserror = "1.0" thiserror = "1.0"
libc = "0.2.79" libc = "0.2.79"
log = "0.4.11" log = "0.4.11"
kvm-ioctls = { git = "https://github.com/cloud-hypervisor/kvm-ioctls", branch = "ch" } kvm-ioctls = { git = "https://github.com/rust-vmm/kvm-ioctls", branch = "master" }
kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch", features = ["with-serde", "fam-wrappers"] } kvm-bindings = { git = "https://github.com/rust-vmm/kvm-bindings", branch = "master", features = ["with-serde", "fam-wrappers"] }
serde = {version = ">=1.0.27", features = ["rc"] } serde = {version = ">=1.0.27", features = ["rc"] }
serde_derive = ">=1.0.27" serde_derive = ">=1.0.27"
serde_json = ">=1.0.9" serde_json = ">=1.0.9"