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

Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
Bo Chen
2022-08-11 16:10:58 -07:00
committed by Rob Bradford
parent 068ea9a4db
commit 8c38992143
+17 -24
View File
@@ -343,33 +343,26 @@ impl EpollHelperHandler for BalloonEpollHandler {
EpollHelperError::HandleEvent(anyhow!("Failed to get resize event: {:?}", e)) EpollHelperError::HandleEvent(anyhow!("Failed to get resize event: {:?}", e))
})?; })?;
let mut signal_error = false; let mut config = self.config.lock().unwrap();
let r = { config.num_pages =
let mut config = self.config.lock().unwrap(); (self.resize_receiver.get_size() >> VIRTIO_BALLOON_PFN_SHIFT) as u32;
config.num_pages = self.signal(VirtioInterruptType::Config).map_err(|e| {
(self.resize_receiver.get_size() >> VIRTIO_BALLOON_PFN_SHIFT) as u32; let ret_err = anyhow!("Handle resize event get error: {:?}", e);
if let Err(e) = self.signal(VirtioInterruptType::Config) { self.resize_receiver
signal_error = true; .send(Err(e))
Err(e) .map_err(|e| {
} else { error!("Sending \"resize\" generated error: {:?}", e);
Ok(()) })
} .ok();
}; EpollHelperError::HandleEvent(ret_err)
let ret_err = anyhow!("{:?}", r); })?;
if let Err(e) = &r {
// This error will send back to resize caller.
error!("Handle resize event get error: {:?}", e);
}
if let Err(e) = self.resize_receiver.send(r) { self.resize_receiver.send(Ok(())).map_err(|e| {
return Err(EpollHelperError::HandleEvent(anyhow!( EpollHelperError::HandleEvent(anyhow!(
"Sending \"resize\" generated error: {:?}", "Sending \"resize\" generated error: {:?}",
e e
))); ))
} })?;
if signal_error {
return Err(EpollHelperError::HandleEvent(ret_err));
}
} }
INFLATE_QUEUE_EVENT => { INFLATE_QUEUE_EVENT => {
self.inflate_queue_evt.read().map_err(|e| { self.inflate_queue_evt.read().map_err(|e| {