kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vm-virtio: Expand vhost-user handler to be reused from virtio-fs

Browse Source 
In order to factorize the code between vhost-user-net and virtio-fs one
step further, this patch extends the vhost-user handler implementation
to support slave requests.

Signed-off-by: Sebastien Boeuf <sebastien.boeuf@intel.com>
This commit is contained in:
Sebastien Boeuf
2019-08-30 11:47:24 -07:00
committed by Rob Bradford
parent b7d3ad9063
commit bc42420583
3 changed files with 67 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vm-virtio/src/vhost_user/net.rs
+12 -10
View File
@@ -20,11 +20,14 @@ use super::handler::*;
use super::vu_common_ctrl::*;
use super::{Error, Result};
use vhost_rs::vhost_user::message::VhostUserVirtioFeatures;
use vhost_rs::vhost_user::{Master, VhostUserMaster};
use vhost_rs::vhost_user::{Master, VhostUserMaster, VhostUserMasterReqHandler};
use vhost_rs::VhostBackend;
use virtio_bindings::virtio_net;
use virtio_bindings::virtio_ring;
struct SlaveReqHandler {}
impl VhostUserMasterReqHandler for SlaveReqHandler {}
pub struct Net {
vhost_user_net: Master,
kill_evt: EventFd,
@@ -200,23 +203,22 @@ impl VirtioDevice for Net {
)
.map_err(ActivateError::VhostUserNetSetup)?;
let vu_epoll_cfg = VhostUserEpollConfig {
let mut handler = VhostUserEpollHandler::<SlaveReqHandler>::new(VhostUserEpollConfig {
interrupt_cb,
kill_evt: handler_kill_evt,
vu_interrupt_list,
};
slave_req_handler: None,
});
let _handler_result = thread::Builder::new()
let handler_result = thread::Builder::new()
.name("vhost_user_net".to_string())
.spawn(move || {
let mut handler = VhostUserEpollHandler::new(vu_epoll_cfg);
let result = handler.run();
if let Err(_e) = result {
error!("net worker thread exited with error {:?}!", _e);
if let Err(e) = handler.run() {
error!("net worker thread exited with error {:?}!", e);
}
});
if let Err(_e) = _handler_result {
error!("vhost-user net thread create failed with error {:?}", _e);
if let Err(e) = handler_result {
error!("vhost-user net thread create failed with error {:?}", e);
}
Ok(())
}