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

vmm: Start the HTTP server thread

Browse Source 
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2019-09-26 18:19:00 +02:00
parent b14fd37db9
commit aa31748781
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main.rs
View File

@ -338,8 +338,13 @@ fn main() {
let (api_request_sender, api_request_receiver) = channel(); let (api_request_sender, api_request_receiver) = channel();
let api_evt = EventFd::new(EFD_NONBLOCK).expect("Cannot create API EventFd"); let api_evt = EventFd::new(EFD_NONBLOCK).expect("Cannot create API EventFd");
let vmm_thread = match vmm::start_vmm_thread(api_evt.try_clone().unwrap(), api_request_receiver) let http_sender = api_request_sender.clone();
{ let vmm_thread = match vmm::start_vmm_thread(
api_socket_path,
api_evt.try_clone().unwrap(),
http_sender,
api_request_receiver,
) {
Ok(t) => t, Ok(t) => t,
Err(e) => { Err(e) => {
println!("Failed spawning the VMM thread {:?}", e); println!("Failed spawning the VMM thread {:?}", e);

14
vmm/src/lib.rs
View File

@ -157,12 +157,17 @@ impl AsRawFd for EpollContext {
} }
pub fn start_vmm_thread( pub fn start_vmm_thread(
http_path: &str,
api_event: EventFd, api_event: EventFd,
api_sender: Sender<ApiRequest>,
api_receiver: Receiver<ApiRequest>, api_receiver: Receiver<ApiRequest>,
) -> Result<thread::JoinHandle<Result<()>>> { ) -> Result<thread::JoinHandle<Result<()>>> {
thread::Builder::new() let http_api_event = api_event.try_clone().map_err(Error::EventFdClone)?;
let thread = thread::Builder::new()
.name("vmm".to_string()) .name("vmm".to_string())
.spawn(move || { .spawn(move || {
// let vmm_api_event = api_event.try_clone().map_err(Error::EventFdClone)?;
let mut vmm = Vmm::new(api_event)?; let mut vmm = Vmm::new(api_event)?;
let receiver = Arc::new(api_receiver); let receiver = Arc::new(api_receiver);
@ -219,7 +224,12 @@ pub fn start_vmm_thread(
Ok(()) Ok(())
}) })
.map_err(Error::VmmThreadSpawn) .map_err(Error::VmmThreadSpawn)?;
// The VMM thread is started, we can start serving HTTP requests
api::start_http_thread(http_path, http_api_event, api_sender)?;
Ok(thread)
} }
pub fn vm_create( pub fn vm_create(