diff --git a/Cargo.lock b/Cargo.lock index ed11e1e..3d20679 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -70,16 +70,6 @@ dependencies = [ "syn", ] -[[package]] -name = "epoll" -version = "4.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20df693c700404f7e19d4d6fae6b15215d2913c27955d2b9d6f2c0f537511cd0" -dependencies = [ - "bitflags", - "libc", -] - [[package]] name = "hashbrown" version = "0.11.2" @@ -122,9 +112,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.105" +version = "0.2.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "869d572136620d55835903746bcb5cdc54cb2851fd0aeec53220b4bb65ef3013" +checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219" [[package]] name = "linked-hash-map" @@ -173,9 +163,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.30" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edc3358ebc67bc8b7fa0c007f945b0b18226f78437d61bec735a9eb96b61ee70" +checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" dependencies = [ "unicode-xid", ] @@ -197,9 +187,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d010a1623fbd906d51d650a9916aaefc05ffa0e4053ff7fe601167f3e715d194" +checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" dependencies = [ "proc-macro2", "quote", @@ -291,7 +281,6 @@ name = "vhost-device-i2c" version = "0.1.0" dependencies = [ "clap", - "epoll", "libc", "log", "thiserror", @@ -305,15 +294,14 @@ dependencies = [ [[package]] name = "vhost-user-backend" version = "0.1.0" -source = "git+https://github.com/rust-vmm/vhost-user-backend?rev=bd6b53348f06055abcb2b7254168d716b742f383#bd6b53348f06055abcb2b7254168d716b742f383" +source = "git+https://github.com/rust-vmm/vhost-user-backend?rev=4047c697470cc6c37e8e1835025b091d2b59c2f7#4047c697470cc6c37e8e1835025b091d2b59c2f7" dependencies = [ - "epoll", "libc", "log", "vhost", "virtio-bindings", "virtio-queue", - "vm-memory 0.6.0", + "vm-memory 0.7.0", "vmm-sys-util", ] @@ -326,10 +314,10 @@ checksum = "3ff512178285488516ed85f15b5d0113a7cdb89e9e8a760b269ae4f02b84bd6b" [[package]] name = "virtio-queue" version = "0.1.0" -source = "git+https://github.com/rust-vmm/vm-virtio?rev=6013dd9#6013dd91b2e6eb77ea10c6bdeda8f5eb18de6dda" +source = "git+https://github.com/rust-vmm/vm-virtio?rev=66cda80#66cda803e406217945c1f93e6a4fb3b7c2a6983b" dependencies = [ "log", - "vm-memory 0.6.0", + "vm-memory 0.7.0", "vmm-sys-util", ] @@ -339,7 +327,6 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0a8ebcb86ca457f9d6e14cf97009f679952eba42f0113de5db596e514cd0e43b" dependencies = [ - "arc-swap", "libc", "winapi", ] @@ -350,6 +337,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "339d4349c126fdcd87e034631d7274370cf19eb0e87b33166bcd956589fc72c5" dependencies = [ + "arc-swap", "libc", "winapi", ] diff --git a/src/i2c/Cargo.toml b/src/i2c/Cargo.toml index 8cc508f..2738dda 100644 --- a/src/i2c/Cargo.toml +++ b/src/i2c/Cargo.toml @@ -13,12 +13,11 @@ edition = "2018" [dependencies] clap = { version = "=3.0.0-beta.2", features = ["yaml"] } -epoll = "4.3" libc = ">=0.2.95" log = ">=0.4.6" thiserror = "1.0" vhost = { version = "0.2", features = ["vhost-user-slave"] } -vhost-user-backend = { git = "https://github.com/rust-vmm/vhost-user-backend", rev = "bd6b53348f06055abcb2b7254168d716b742f383" } +vhost-user-backend = { git = "https://github.com/rust-vmm/vhost-user-backend", rev = "4047c697470cc6c37e8e1835025b091d2b59c2f7" } virtio-bindings = ">=0.1" vm-memory = "0.7" vmm-sys-util = "=0.9.0" diff --git a/src/i2c/src/vhu_i2c.rs b/src/i2c/src/vhu_i2c.rs index 5b0dc80..85f9140 100644 --- a/src/i2c/src/vhu_i2c.rs +++ b/src/i2c/src/vhu_i2c.rs @@ -18,6 +18,7 @@ use virtio_bindings::bindings::virtio_ring::{ VIRTIO_RING_F_EVENT_IDX, VIRTIO_RING_F_INDIRECT_DESC, }; use vm_memory::{ByteValued, Bytes, GuestMemoryAtomic, GuestMemoryMmap, Le16, Le32}; +use vmm_sys_util::epoll::EventSet; use vmm_sys_util::eventfd::{EventFd, EFD_NONBLOCK}; use crate::i2c::*; @@ -255,11 +256,11 @@ impl VhostUserBackendMut fn handle_event( &mut self, device_event: u16, - evset: epoll::Events, + evset: EventSet, vrings: &[VringRwLock], _thread_id: usize, ) -> VhostUserBackendResult { - if evset != epoll::Events::EPOLLIN { + if evset != EventSet::IN { return Err(Error::HandleEventNotEpollIn.into()); }