commit ba6184d634c4fffc597868614f4bf07f27a8b173
author James Farrell <jamesfarrell@google.com> Tue Dec 03 22:58:33 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 03 22:58:40 2024 +0000
tree 0b10f5ccdb6102bca1aebc9525c4b6013b09a17b
parent a6e8c5d7f44c7d4b6d0e4afb774f4a5bc20981c4

Revert "Fix build errors after vhost-user-backend update"

Revert submission 3376458-update-vhost-user-backend

Reason for revert: Invalid licenses and uparseable cargo_embargo.json

Reverted changes: /q/submissionid:3376458-update-vhost-user-backend

Change-Id: I306f8ce2494802831eb898c692523a98259a82d4

src/vhu_vsock.rs

diff --git a/src/vhu_vsock.rs b/src/vhu_vsock.rs
index 207a9b5..34ef99a 100644
--- a/src/vhu_vsock.rs
+++ b/src/vhu_vsock.rs
@@ -256,9 +256,7 @@
     }
 }
 
-impl VhostUserBackend for VhostUserVsockBackend {
-    type Vring = VringRwLock;
-    type Bitmap = ();
+impl VhostUserBackend<VringRwLock, ()> for VhostUserVsockBackend {
     fn num_queues(&self) -> usize {
         NUM_QUEUES
     }
@@ -297,7 +295,7 @@
         evset: EventSet,
         vrings: &[VringRwLock],
         thread_id: usize,
-    ) -> IoResult<()> {
+    ) -> IoResult<bool> {
         let vring_rx = &vrings[0];
         let vring_tx = &vrings[1];
 
@@ -330,7 +328,7 @@
             SIBLING_VM_EVENT => {
                 let _ = thread.sibling_event_fd.read();
                 thread.process_raw_pkts(vring_rx, evt_idx)?;
-                return Ok(());
+                return Ok(false);
             }
             _ => {
                 return Err(Error::HandleUnknownEvent.into());
@@ -341,7 +339,7 @@
             thread.process_rx(vring_rx, evt_idx)?;
         }
 
-        Ok(())
+        Ok(false)
     }
 
     fn get_config(&self, offset: u32, size: u32) -> Vec<u8> {

src/vhu_vsock_thread.rs

diff --git a/src/vhu_vsock_thread.rs b/src/vhu_vsock_thread.rs
index 5cce0a8..850ad0c 100644
--- a/src/vhu_vsock_thread.rs
+++ b/src/vhu_vsock_thread.rs
@@ -242,7 +242,7 @@
     /// Register our listeners in the VringEpollHandler
     pub fn register_listeners(
         &mut self,
-        epoll_handler: Arc<VringEpollHandler<ArcVhostBknd>>,
+        epoll_handler: Arc<VringEpollHandler<ArcVhostBknd, VringRwLock, ()>>,
     ) {
         epoll_handler
             .register_listener(self.get_epoll_fd(), EventSet::IN, u64::from(BACKEND_EVENT))