mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2025-02-05 18:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix kokoro

Browse source 
Update to the latest version of vmm_vhost to pick up the API change.
Also fix clippy errors in the gpu device.

BUG=b:179755651
TEST=cargo build

Change-Id: Ia42681aee1d92f38dfcca1fbf87e8cfd7ac15d95
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3151109
Auto-Submit: Chirantan Ekbote <chirantan@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Keiichi Watanabe <keiichiw@chromium.org>
Reviewed-by: Dennis Kempin <denniskempin@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
This commit is contained in:
Chirantan Ekbote 2021-09-09 17:35:29 +09:00 committed by Jora Jacobi
parent 7822529aad
commit dfa32ea035
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
devices/src/virtio/vhost/user/device/gpu.rs
View file

@ -86,11 +86,9 @@ async fn run_ctrl_queue(
}
}
}
} else {
if let Err(e) = kick_evt.next_val().await {
error!("Failed to read kick event for ctrl queue: {}", e);
break;
}
} else if let Err(e) = kick_evt.next_val().await {
error!("Failed to read kick event for ctrl queue: {}", e);
break;
}
let mut state = state.borrow_mut();
@ -260,9 +258,8 @@ impl VhostUserBackend for GpuBackend {
let kick_evt =
EventAsync::new(kick_evt.0, ex).context("failed to create EventAsync for kick_evt")?;
let queue = Arc::new(Mutex::new(queue));
let reader = SharedReader {
queue: queue.clone(),
queue: Arc::new(Mutex::new(queue)),
call_evt,
};
@ -464,7 +461,6 @@ pub fn run_gpu_device(program_name: &str, args: std::env::Args) -> anyhow::Resul
path.display(),
e
);
return;
}
})
.detach();

2
third_party/vmm_vhost vendored

@ -1 +1 @@
Subproject commit 02f8b005f568d7d959e1d977c36cbcf635f97043
Subproject commit d65bd280d9f4e192a884f1761e4b097c11aae6de