External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-10-01 02:55:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

virtio-devices: mem: Refactor 'handle_event' for readability

Browse Source 
Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
Bo Chen 2022-08-11 14:58:38 -07:00 committed by Rob Bradford
parent b1752994d5
commit 068ea9a4db
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
virtio-devices/src/mem.rs
View File

@ -736,30 +736,35 @@ impl EpollHelperHandler for MemEpollHandler {
EpollHelperError::HandleEvent(anyhow!("Failed to get resize event: {:?}", e))
})?;
let size = self.resize.size();
let mut config = self.config.lock().unwrap();
let mut signal_error = false;
let mut r = config.resize(size);
r = match r {
Err(e) => Err(e),
_ => match self.signal(VirtioInterruptType::Config) {
Err(e) => {
signal_error = true;
Err(Error::ResizeTriggerFail(e))
}
_ => Ok(()),
},
};
let ret_err = anyhow!("{:?}", r);
if let Err(e) = self.resize.send(r) {
return Err(EpollHelperError::HandleEvent(anyhow!(
"Sending \"resize\" response: {:?}",
e
)));
}
if signal_error {
return Err(EpollHelperError::HandleEvent(anyhow!(ret_err)));
if let Err(e) = config.resize(self.resize.size()) {
self.resize.send(Err(e)).map_err(|e| {
EpollHelperError::HandleEvent(anyhow!(
"Sending \"resize\" response: {:?}",
e
))
})?;
return Ok(());
}
self.signal(VirtioInterruptType::Config).map_err(|e| {
let e = Error::ResizeTriggerFail(e);
let ret_err = anyhow!("{:?}", e);
self.resize
.send(Err(e))
.map_err(|e| {
EpollHelperError::HandleEvent(anyhow!(
"Sending \"resize\" response: {:?}",
e
))
})
.ok();
EpollHelperError::HandleEvent(ret_err)
})?;
self.resize.send(Ok(())).map_err(|e| {
EpollHelperError::HandleEvent(anyhow!("Sending \"resize\" response: {:?}", e))
})?;
}
QUEUE_AVAIL_EVENT => {
self.queue_evt.read().map_err(|e| {