mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-10-05 21:15:45 +00:00
vhost_user_net: Split launching backend into its own function
Split the basic launching functionality into its own function in the newly added vhost_user_net crate. Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
parent
b851887738
commit
9fd187c9fe
1
Cargo.lock
generated
1
Cargo.lock
generated
@ -1060,7 +1060,6 @@ name = "vhost_user_net"
|
|||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
|
||||||
"epoll 4.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
"epoll 4.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
"libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"log 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
|
"log 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
@ -8,16 +8,10 @@
|
|||||||
|
|
||||||
#[macro_use(crate_version, crate_authors)]
|
#[macro_use(crate_version, crate_authors)]
|
||||||
extern crate clap;
|
extern crate clap;
|
||||||
extern crate log;
|
|
||||||
extern crate vhost_user_backend;
|
|
||||||
extern crate vhost_user_net;
|
extern crate vhost_user_net;
|
||||||
|
|
||||||
use clap::{App, Arg};
|
use clap::{App, Arg};
|
||||||
use epoll;
|
use vhost_user_net::start_net_backend;
|
||||||
use std::process;
|
|
||||||
use std::sync::{Arc, RwLock};
|
|
||||||
use vhost_user_backend::VhostUserDaemon;
|
|
||||||
use vhost_user_net::{VhostUserNetBackend, VhostUserNetBackendConfig};
|
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
let cmd_arguments = App::new("vhost-user-net backend")
|
let cmd_arguments = App::new("vhost-user-net backend")
|
||||||
@ -38,55 +32,6 @@ fn main() {
|
|||||||
)
|
)
|
||||||
.get_matches();
|
.get_matches();
|
||||||
|
|
||||||
let vhost_user_net_backend = cmd_arguments.value_of("net-backend").unwrap();
|
let backend_command = cmd_arguments.value_of("net-backend").unwrap();
|
||||||
|
start_net_backend(backend_command);
|
||||||
let backend_config = match VhostUserNetBackendConfig::parse(vhost_user_net_backend) {
|
|
||||||
Ok(config) => config,
|
|
||||||
Err(e) => {
|
|
||||||
println!("Failed parsing parameters {:?}", e);
|
|
||||||
process::exit(1);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let net_backend = Arc::new(RwLock::new(
|
|
||||||
VhostUserNetBackend::new(
|
|
||||||
backend_config.ip,
|
|
||||||
backend_config.mask,
|
|
||||||
backend_config.num_queues,
|
|
||||||
backend_config.queue_size,
|
|
||||||
)
|
|
||||||
.unwrap(),
|
|
||||||
));
|
|
||||||
|
|
||||||
let mut net_daemon = VhostUserDaemon::new(
|
|
||||||
"vhost-user-net-backend".to_string(),
|
|
||||||
backend_config.sock.to_string(),
|
|
||||||
net_backend.clone(),
|
|
||||||
)
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
let (kill_index, kill_evt_fd) = net_backend.read().unwrap().get_kill_event();
|
|
||||||
let vring_worker = net_daemon.get_vring_worker();
|
|
||||||
|
|
||||||
if let Err(e) =
|
|
||||||
vring_worker.register_listener(kill_evt_fd, epoll::Events::EPOLLIN, u64::from(kill_index))
|
|
||||||
{
|
|
||||||
println!("failed to register listener for kill event: {:?}", e);
|
|
||||||
process::exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
net_backend
|
|
||||||
.write()
|
|
||||||
.unwrap()
|
|
||||||
.set_vring_worker(Some(vring_worker));
|
|
||||||
|
|
||||||
if let Err(e) = net_daemon.start() {
|
|
||||||
println!(
|
|
||||||
"failed to start daemon for vhost-user-net with error: {:?}",
|
|
||||||
e
|
|
||||||
);
|
|
||||||
process::exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
net_daemon.wait().unwrap();
|
|
||||||
}
|
}
|
||||||
|
@ -23,11 +23,12 @@ use std::io::{self};
|
|||||||
use std::net::Ipv4Addr;
|
use std::net::Ipv4Addr;
|
||||||
use std::os::unix::io::AsRawFd;
|
use std::os::unix::io::AsRawFd;
|
||||||
use std::os::unix::io::RawFd;
|
use std::os::unix::io::RawFd;
|
||||||
|
use std::process;
|
||||||
use std::sync::{Arc, RwLock};
|
use std::sync::{Arc, RwLock};
|
||||||
use std::vec::Vec;
|
use std::vec::Vec;
|
||||||
use vhost_rs::vhost_user::message::*;
|
use vhost_rs::vhost_user::message::*;
|
||||||
use vhost_rs::vhost_user::Error as VhostUserError;
|
use vhost_rs::vhost_user::Error as VhostUserError;
|
||||||
use vhost_user_backend::{VhostUserBackend, Vring, VringWorker};
|
use vhost_user_backend::{VhostUserBackend, VhostUserDaemon, Vring, VringWorker};
|
||||||
use virtio_bindings::bindings::virtio_net::*;
|
use virtio_bindings::bindings::virtio_net::*;
|
||||||
use vm_memory::GuestMemoryMmap;
|
use vm_memory::GuestMemoryMmap;
|
||||||
use vm_virtio::net_util::{open_tap, RxVirtio, TxVirtio};
|
use vm_virtio::net_util::{open_tap, RxVirtio, TxVirtio};
|
||||||
@ -432,3 +433,55 @@ impl<'a> VhostUserNetBackendConfig<'a> {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn start_net_backend(backend_command: &str) {
|
||||||
|
let backend_config = match VhostUserNetBackendConfig::parse(backend_command) {
|
||||||
|
Ok(config) => config,
|
||||||
|
Err(e) => {
|
||||||
|
println!("Failed parsing parameters {:?}", e);
|
||||||
|
process::exit(1);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let net_backend = Arc::new(RwLock::new(
|
||||||
|
VhostUserNetBackend::new(
|
||||||
|
backend_config.ip,
|
||||||
|
backend_config.mask,
|
||||||
|
backend_config.num_queues,
|
||||||
|
backend_config.queue_size,
|
||||||
|
)
|
||||||
|
.unwrap(),
|
||||||
|
));
|
||||||
|
|
||||||
|
let mut net_daemon = VhostUserDaemon::new(
|
||||||
|
"vhost-user-net-backend".to_string(),
|
||||||
|
backend_config.sock.to_string(),
|
||||||
|
net_backend.clone(),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let (kill_index, kill_evt_fd) = net_backend.read().unwrap().get_kill_event();
|
||||||
|
let vring_worker = net_daemon.get_vring_worker();
|
||||||
|
|
||||||
|
if let Err(e) =
|
||||||
|
vring_worker.register_listener(kill_evt_fd, epoll::Events::EPOLLIN, u64::from(kill_index))
|
||||||
|
{
|
||||||
|
println!("failed to register listener for kill event: {:?}", e);
|
||||||
|
process::exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
net_backend
|
||||||
|
.write()
|
||||||
|
.unwrap()
|
||||||
|
.set_vring_worker(Some(vring_worker));
|
||||||
|
|
||||||
|
if let Err(e) = net_daemon.start() {
|
||||||
|
println!(
|
||||||
|
"failed to start daemon for vhost-user-net with error: {:?}",
|
||||||
|
e
|
||||||
|
);
|
||||||
|
process::exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
net_daemon.wait().unwrap();
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user