diff --git a/Cargo.lock b/Cargo.lock index 8dfca0cee..b42d462e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1162,19 +1162,20 @@ dependencies = [ [[package]] name = "kvm-bindings" -version = "0.7.0" -source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.7.0#2dcf85d4f8aa55befcaa996b699ddb18ec9ed059" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82e7e8725a39a0015e511a46cc1f7d90cecc180db1610c4d0d4339a9e48bd21" dependencies = [ "serde", - "serde_derive", "vmm-sys-util", + "zerocopy", ] [[package]] name = "kvm-ioctls" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9002dff009755414f22b962ec6ae6980b07d6d8b06e5297b1062019d72bd6a8c" +checksum = "bedae2ca4a531bebe311abaf9691f5cc14eaa21475243caa2e39c43bb872947d" dependencies = [ "bitflags 2.5.0", "kvm-bindings", @@ -1324,7 +1325,7 @@ checksum = "9bec4598fddb13cc7b528819e697852653252b760f1228b7642679bf2ff2cd07" [[package]] name = "mshv-bindings" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#ef8fd01cf48b2e72bd6405a613a6ef65b43729d7" +source = "git+https://github.com/rust-vmm/mshv?branch=main#fed467ffa4e910d37fc5cd0012f6d59f4a8009d8" dependencies = [ "libc", "num_enum", @@ -1337,7 +1338,7 @@ dependencies = [ [[package]] name = "mshv-ioctls" version = "0.1.1" -source = "git+https://github.com/rust-vmm/mshv?branch=main#ef8fd01cf48b2e72bd6405a613a6ef65b43729d7" +source = "git+https://github.com/rust-vmm/mshv?branch=main#fed467ffa4e910d37fc5cd0012f6d59f4a8009d8" dependencies = [ "libc", "mshv-bindings", @@ -2336,7 +2337,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vfio-bindings" version = "0.4.0" -source = "git+https://github.com/rust-vmm/vfio?branch=main#4e937a514d9025f953eeb837fb8dafe035d9a8fd" +source = "git+https://github.com/rust-vmm/vfio?branch=main#da8c5b67095fb70f5ef237ca63d316219888f015" dependencies = [ "vmm-sys-util", ] @@ -2344,7 +2345,7 @@ dependencies = [ [[package]] name = "vfio-ioctls" version = "0.2.0" -source = "git+https://github.com/rust-vmm/vfio?branch=main#4e937a514d9025f953eeb837fb8dafe035d9a8fd" +source = "git+https://github.com/rust-vmm/vfio?branch=main#da8c5b67095fb70f5ef237ca63d316219888f015" dependencies = [ "byteorder", "kvm-bindings", diff --git a/Cargo.toml b/Cargo.toml index dca32b136..39b00aa10 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,10 +50,6 @@ vmm-sys-util = "0.12.1" vm-memory = "0.14.1" zbus = { version = "3.15.2", optional = true } -# List of patched crates -[patch.crates-io] -kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.7.0" } - [dev-dependencies] dirs = "5.0.1" net_util = { path = "net_util" } diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index fc4f68285..83915cbbf 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -456,19 +456,20 @@ dependencies = [ [[package]] name = "kvm-bindings" -version = "0.7.0" -source = "git+https://github.com/cloud-hypervisor/kvm-bindings?branch=ch-v0.7.0#2dcf85d4f8aa55befcaa996b699ddb18ec9ed059" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a82e7e8725a39a0015e511a46cc1f7d90cecc180db1610c4d0d4339a9e48bd21" dependencies = [ "serde", - "serde_derive", "vmm-sys-util", + "zerocopy", ] [[package]] name = "kvm-ioctls" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9002dff009755414f22b962ec6ae6980b07d6d8b06e5297b1062019d72bd6a8c" +checksum = "bedae2ca4a531bebe311abaf9691f5cc14eaa21475243caa2e39c43bb872947d" dependencies = [ "bitflags 2.5.0", "kvm-bindings", @@ -837,7 +838,7 @@ dependencies = [ [[package]] name = "vfio-bindings" version = "0.4.0" -source = "git+https://github.com/rust-vmm/vfio?branch=main#0daff4d4c159e842cf18b8b90457a45032b2df5a" +source = "git+https://github.com/rust-vmm/vfio?branch=main#da8c5b67095fb70f5ef237ca63d316219888f015" dependencies = [ "vmm-sys-util", ] @@ -845,7 +846,7 @@ dependencies = [ [[package]] name = "vfio-ioctls" version = "0.2.0" -source = "git+https://github.com/rust-vmm/vfio?branch=main#0daff4d4c159e842cf18b8b90457a45032b2df5a" +source = "git+https://github.com/rust-vmm/vfio?branch=main#da8c5b67095fb70f5ef237ca63d316219888f015" dependencies = [ "byteorder", "kvm-bindings", diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index 22073ee5a..8b655221d 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -34,9 +34,6 @@ vm-virtio = { path = "../vm-virtio" } [dependencies.cloud-hypervisor] path = ".." -[patch.crates-io] -kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.7.0" } - # Prevent this from interfering with workspaces [workspace] members = ["."] diff --git a/hypervisor/Cargo.toml b/hypervisor/Cargo.toml index a1065937e..cef75c451 100644 --- a/hypervisor/Cargo.toml +++ b/hypervisor/Cargo.toml @@ -18,8 +18,8 @@ igvm_defs = { git = "https://github.com/microsoft/igvm", branch = "main", packag igvm_parser = { git = "https://github.com/microsoft/igvm", branch = "main", package = "igvm", optional = true } libc = "0.2.153" log = "0.4.21" -kvm-ioctls = { version = "0.16.0", optional = true } -kvm-bindings = { git = "https://github.com/cloud-hypervisor/kvm-bindings", branch = "ch-v0.7.0", features = ["with-serde", "fam-wrappers"], optional = true } +kvm-bindings = { version = "0.8.1", optional = true, features = ["serde"] } +kvm-ioctls = { version = "0.17.0", optional = true } mshv-bindings = { git = "https://github.com/rust-vmm/mshv", branch = "main", features = ["with-serde", "fam-wrappers"], optional = true } mshv-ioctls = { git = "https://github.com/rust-vmm/mshv", branch = "main", optional = true} serde = { version = "1.0.197", features = ["rc", "derive"] }