diff --git a/Cargo.lock b/Cargo.lock index 826a5f636..8e656cac7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1156,7 +1156,7 @@ dependencies = [ [[package]] name = "vfio-ioctls" version = "0.1.0" -source = "git+https://github.com/rust-vmm/vfio-ioctls?branch=main#06be730ff19b36dc76c725addb78e1c3bbc9cf16" +source = "git+https://github.com/rust-vmm/vfio-ioctls?branch=main#d51c1fad37be30c20385c55a217e2d90972ea31d" dependencies = [ "byteorder", "kvm-bindings", @@ -1202,8 +1202,7 @@ dependencies = [ [[package]] name = "vhost" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6b90237e10f1a61b35fba73885c3567e1a5a8c40d44daae335f7710210a7dc" +source = "git+https://github.com/rust-vmm/vhost?branch=main#354dd56adf00614f606ff39257a1257c2f6c5b82" dependencies = [ "bitflags", "libc", @@ -1410,9 +1409,9 @@ dependencies = [ [[package]] name = "vmm-sys-util" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cf11afbc4ebc0d5c7a7748a77d19e2042677fc15faa2f4ccccb27c18a60605" +checksum = "733537bded03aaa93543f785ae997727b30d1d9f4a03b7861d23290474242e11" dependencies = [ "bitflags", "libc", diff --git a/Cargo.toml b/Cargo.toml index 7ee8ba072..6264660f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ serde_json = "1.0.68" signal-hook = "0.3.10" thiserror = "1.0.29" vmm = { path = "vmm" } -vmm-sys-util = "0.8.0" +vmm-sys-util = "0.9.0" vm-memory = "0.6.0" [build-dependencies] @@ -37,6 +37,7 @@ clap = { version = "2.33.3", features = ["wrap_help"] } [patch.crates-io] kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.5.0", features = ["with-serde", "fam-wrappers"] } versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch" } +vhost = { git = "https://github.com/rust-vmm/vhost", branch = "main", features = ["vhost-user-master", "vhost-user-slave", "vhost-kern"] } [dev-dependencies] credibility = "0.1.3" diff --git a/api_client/Cargo.toml b/api_client/Cargo.toml index 48676e127..e9a0105fd 100644 --- a/api_client/Cargo.toml +++ b/api_client/Cargo.toml @@ -5,4 +5,4 @@ authors = ["The Cloud Hypervisor Authors"] edition = "2018" [dependencies] -vmm-sys-util = "0.8.0" +vmm-sys-util = "0.9.0" diff --git a/arch/Cargo.toml b/arch/Cargo.toml index 35cf23786..b4cc4de9f 100644 --- a/arch/Cargo.toml +++ b/arch/Cargo.toml @@ -23,7 +23,7 @@ versionize = "0.1.6" versionize_derive = "0.1.4" vm-memory = { version = "0.6.0", features = ["backend-mmap", "backend-bitmap"] } vm-migration = { path = "../vm-migration" } -vmm-sys-util = { version = "0.8.0", features = ["with-serde"] } +vmm-sys-util = { version = "0.9.0", features = ["with-serde"] } [target.'cfg(target_arch = "aarch64")'.dependencies] fdt_parser = { version = "0.1.3", package = 'fdt'} diff --git a/block_util/Cargo.toml b/block_util/Cargo.toml index 34697168e..484bb10e7 100644 --- a/block_util/Cargo.toml +++ b/block_util/Cargo.toml @@ -20,5 +20,5 @@ vhdx = { path = "../vhdx" } virtio-bindings = { version = "0.1.0", features = ["virtio-v5_0_0"] } vm-memory = { version = "0.6.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } vm-virtio = { path = "../vm-virtio" } -vmm-sys-util = "0.8.0" +vmm-sys-util = "0.9.0" diff --git a/devices/Cargo.toml b/devices/Cargo.toml index 9a79056c5..a80aa5bdf 100644 --- a/devices/Cargo.toml +++ b/devices/Cargo.toml @@ -18,7 +18,7 @@ versionize_derive = "0.1.4" vm-device = { path = "../vm-device" } vm-memory = "0.6.0" vm-migration = { path = "../vm-migration" } -vmm-sys-util = "0.8.0" +vmm-sys-util = "0.9.0" [features] default = [] diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index 8272bcc42..e3449cd54 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -320,9 +320,9 @@ dependencies = [ [[package]] name = "kvm-ioctls" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2924454e22895c738e43331ae310459c74a11ded9c97dc250129ee10d2f9ca2" +checksum = "48dc14f9047df1873cf6942caccc7431d19c3d496ca7a0d162260c4cf0f64b76" dependencies = [ "kvm-bindings", "libc", @@ -699,7 +699,7 @@ dependencies = [ [[package]] name = "vfio-ioctls" version = "0.1.0" -source = "git+https://github.com/rust-vmm/vfio-ioctls?branch=main#a8ee64b978ccd000df88732814d626651a091891" +source = "git+https://github.com/rust-vmm/vfio-ioctls?branch=main#d51c1fad37be30c20385c55a217e2d90972ea31d" dependencies = [ "byteorder", "kvm-bindings", @@ -743,8 +743,7 @@ dependencies = [ [[package]] name = "vhost" version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6b90237e10f1a61b35fba73885c3567e1a5a8c40d44daae335f7710210a7dc" +source = "git+https://github.com/rust-vmm/vhost?branch=main#354dd56adf00614f606ff39257a1257c2f6c5b82" dependencies = [ "bitflags", "libc", @@ -899,9 +898,9 @@ dependencies = [ [[package]] name = "vmm-sys-util" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cf11afbc4ebc0d5c7a7748a77d19e2042677fc15faa2f4ccccb27c18a60605" +checksum = "733537bded03aaa93543f785ae997727b30d1d9f4a03b7861d23290474242e11" dependencies = [ "bitflags", "libc", @@ -936,8 +935,3 @@ name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[patch.unused]] -name = "vm-memory" -version = "0.5.0" -source = "git+https://github.com/rust-vmm/vm-memory?rev=5bd7138758183a73ac0da27ce40c004d95f1a7e9#5bd7138758183a73ac0da27ce40c004d95f1a7e9" diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 06a9e2410..a425342f9 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -16,7 +16,7 @@ qcow = { path = "../qcow" } seccompiler = { git = "https://github.com/rust-vmm/seccompiler"} vhdx = { path = "../vhdx" } virtio-devices = { path = "../virtio-devices" } -vmm-sys-util = "0.8.0" +vmm-sys-util = "0.9.0" vm-virtio = { path = "../vm-virtio" } vm-memory = "0.6.0" @@ -25,8 +25,8 @@ path = ".." [patch.crates-io] kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.5.0", features = ["with-serde", "fam-wrappers"] } -vm-memory = { git = "https://github.com/rust-vmm/vm-memory", rev = "5bd7138758183a73ac0da27ce40c004d95f1a7e9"} versionize_derive = { git = "https://github.com/cloud-hypervisor/versionize_derive", branch = "ch" } +vhost = { git = "https://github.com/rust-vmm/vhost", branch = "main", features = ["vhost-user-master", "vhost-user-slave", "vhost-kern"] } # Prevent this from interfering with workspaces [workspace] diff --git a/hypervisor/Cargo.toml b/hypervisor/Cargo.toml index ca00b99c2..6dced22a0 100644 --- a/hypervisor/Cargo.toml +++ b/hypervisor/Cargo.toml @@ -24,7 +24,7 @@ serde = { version = "1.0.130", features = ["rc"] } serde_derive = "1.0.130" serde_json = "1.0.68" vm-memory = { version = "0.6.0", features = ["backend-mmap", "backend-atomic"] } -vmm-sys-util = { version = "0.8.0", features = ["with-serde"] } +vmm-sys-util = { version = "0.9.0", features = ["with-serde"] } [target.'cfg(target_arch = "x86_64")'.dependencies.iced-x86] version = "1.14.0" diff --git a/net_gen/Cargo.toml b/net_gen/Cargo.toml index 01535b8bd..0fca6bdff 100644 --- a/net_gen/Cargo.toml +++ b/net_gen/Cargo.toml @@ -5,4 +5,4 @@ authors = ["The Chromium OS Authors"] edition = "2018" [dependencies] -vmm-sys-util = "0.8.0" +vmm-sys-util = "0.9.0" diff --git a/net_util/Cargo.toml b/net_util/Cargo.toml index 0ed762636..b53181e97 100644 --- a/net_util/Cargo.toml +++ b/net_util/Cargo.toml @@ -16,7 +16,7 @@ versionize_derive = "0.1.4" virtio-bindings = "0.1.0" vm-memory = { version = "0.6.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } vm-virtio = { path = "../vm-virtio" } -vmm-sys-util = "0.8.0" +vmm-sys-util = "0.9.0" [dev-dependencies] lazy_static = "1.4.0" diff --git a/pci/Cargo.toml b/pci/Cargo.toml index 539445e21..4ad28307e 100644 --- a/pci/Cargo.toml +++ b/pci/Cargo.toml @@ -15,7 +15,7 @@ byteorder = "1.4.3" hypervisor = { path = "../hypervisor" } vfio-ioctls = { git = "https://github.com/rust-vmm/vfio-ioctls", branch = "main", default-features = false } vfio_user = { path = "../vfio_user" } -vmm-sys-util = "0.8.0" +vmm-sys-util = "0.9.0" libc = "0.2.102" log = "0.4.14" thiserror = "1.0.29" diff --git a/qcow/Cargo.toml b/qcow/Cargo.toml index d12561d83..cf8d7a128 100644 --- a/qcow/Cargo.toml +++ b/qcow/Cargo.toml @@ -13,4 +13,4 @@ byteorder = "1.4.3" libc = "0.2.102" log = "0.4.14" remain = "0.2.2" -vmm-sys-util = "0.8.0" +vmm-sys-util = "0.9.0" diff --git a/rate_limiter/Cargo.toml b/rate_limiter/Cargo.toml index e5df14399..86b87ef23 100644 --- a/rate_limiter/Cargo.toml +++ b/rate_limiter/Cargo.toml @@ -6,4 +6,4 @@ edition = "2018" [dependencies] libc = "0.2.102" log = "0.4.14" -vmm-sys-util = "0.8.0" +vmm-sys-util = "0.9.0" diff --git a/test_infra/Cargo.toml b/test_infra/Cargo.toml index 62d832242..f78116b73 100644 --- a/test_infra/Cargo.toml +++ b/test_infra/Cargo.toml @@ -9,5 +9,5 @@ dirs = "3.0.1" epoll = "4.3.1" libc = "0.2.91" ssh2 = "0.9.1" -vmm-sys-util = "0.8.0" +vmm-sys-util = "0.9.0" wait-timeout = "0.2.0" diff --git a/vhost_user_backend/Cargo.toml b/vhost_user_backend/Cargo.toml index e43b23782..aa9a82bf0 100644 --- a/vhost_user_backend/Cargo.toml +++ b/vhost_user_backend/Cargo.toml @@ -14,5 +14,5 @@ log = "0.4.14" virtio-bindings = "0.1.0" vm-memory = { version = "0.6.0", features = ["backend-bitmap"] } vm-virtio = { path = "../vm-virtio" } -vmm-sys-util = "0.8.0" +vmm-sys-util = "0.9.0" vhost = { version = "0.1.0", features = ["vhost-user-slave"] } diff --git a/vhost_user_block/Cargo.toml b/vhost_user_block/Cargo.toml index 8621dc6e5..ee0b1a9b0 100644 --- a/vhost_user_block/Cargo.toml +++ b/vhost_user_block/Cargo.toml @@ -17,4 +17,4 @@ vhost_user_backend = { path = "../vhost_user_backend" } vhost = { version = "0.1.0", features = ["vhost-user-slave"] } virtio-bindings = "0.1.0" vm-memory = "0.6.0" -vmm-sys-util = "0.8.0" +vmm-sys-util = "0.9.0" diff --git a/vhost_user_net/Cargo.toml b/vhost_user_net/Cargo.toml index a539663a4..ff5e9bcd9 100644 --- a/vhost_user_net/Cargo.toml +++ b/vhost_user_net/Cargo.toml @@ -16,4 +16,4 @@ vhost_user_backend = { path = "../vhost_user_backend" } vhost = { version = "0.1.0", features = ["vhost-user-slave"] } virtio-bindings = "0.1.0" vm-memory = "0.6.0" -vmm-sys-util = "0.8.0" +vmm-sys-util = "0.9.0" diff --git a/virtio-devices/Cargo.toml b/virtio-devices/Cargo.toml index d16632ee9..0aef71950 100644 --- a/virtio-devices/Cargo.toml +++ b/virtio-devices/Cargo.toml @@ -36,4 +36,4 @@ vm-device = { path = "../vm-device" } vm-memory = { version = "0.6.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } vm-migration = { path = "../vm-migration" } vm-virtio = { path = "../vm-virtio" } -vmm-sys-util = "0.8.0" +vmm-sys-util = "0.9.0" diff --git a/vm-device/Cargo.toml b/vm-device/Cargo.toml index f74e77bba..717f8df17 100644 --- a/vm-device/Cargo.toml +++ b/vm-device/Cargo.toml @@ -17,5 +17,5 @@ serde_derive = "1.0.130" serde_json = "1.0.68" vfio-ioctls = { git = "https://github.com/rust-vmm/vfio-ioctls", branch = "main", default-features = false } vm-memory = { version = "0.6.0", features = ["backend-mmap"] } -vmm-sys-util = "0.8.0" +vmm-sys-util = "0.9.0" diff --git a/vmm/Cargo.toml b/vmm/Cargo.toml index 27dd7532b..c46a3094f 100644 --- a/vmm/Cargo.toml +++ b/vmm/Cargo.toml @@ -52,7 +52,7 @@ vm-device = { path = "../vm-device" } vm-memory = { version = "0.6.0", features = ["backend-mmap", "backend-atomic", "backend-bitmap"] } vm-migration = { path = "../vm-migration" } vm-virtio = { path = "../vm-virtio" } -vmm-sys-util = { version = "0.8.0", features = ["with-serde"] } +vmm-sys-util = { version = "0.9.0", features = ["with-serde"] } [dev-dependencies] credibility = "0.1.3"