External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-01-22 04:25:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: pmem: Report errors from 'process_queue' properly

Browse Source 
Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
Bo Chen 2022-09-12 14:32:40 -07:00 committed by Bo Chen
parent 9d3ecefc00
commit 4cc3bdba9f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
virtio-devices/src/pmem.rs
View File

@ -162,7 +162,7 @@ struct PmemEpollHandler {
} }
impl PmemEpollHandler { impl PmemEpollHandler {
fn process_queue(&mut self) -> bool { fn process_queue(&mut self) -> result::Result<bool, Error> {
let mut used_descs = false; let mut used_descs = false;
while let Some(mut desc_chain) = self.queue.pop_descriptor_chain(self.mem.memory()) { while let Some(mut desc_chain) = self.queue.pop_descriptor_chain(self.mem.memory()) {
let len = match Request::parse(&mut desc_chain, self.access_platform.as_ref()) { let len = match Request::parse(&mut desc_chain, self.access_platform.as_ref()) {
@ -201,7 +201,7 @@ impl PmemEpollHandler {
used_descs = true; used_descs = true;
} }
used_descs Ok(used_descs)
} }
fn signal_used_queue(&self) -> result::Result<(), DeviceError> { fn signal_used_queue(&self) -> result::Result<(), DeviceError> {
@ -239,7 +239,11 @@ impl EpollHelperHandler for PmemEpollHandler {
EpollHelperError::HandleEvent(anyhow!("Failed to get queue event: {:?}", e)) EpollHelperError::HandleEvent(anyhow!("Failed to get queue event: {:?}", e))
})?; })?;
if self.process_queue() { let needs_notification = self.process_queue().map_err(|e| {
EpollHelperError::HandleEvent(anyhow!("Failed to process queue : {:?}", e))
})?;
if needs_notification {
self.signal_used_queue().map_err(|e| { self.signal_used_queue().map_err(|e| {
EpollHelperError::HandleEvent(anyhow!( EpollHelperError::HandleEvent(anyhow!(
"Failed to signal used queue: {:?}", "Failed to signal used queue: {:?}",