External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-23 06:05:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Use cloud-hypervisor binary for "--{net,block}-backend"

Browse Source 
Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-01-21 15:35:22 +00:00
parent 45fb9187c5
commit bdb0ad98c4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.rs
View File

@ -15,6 +15,7 @@ use log::LevelFilter;
use std::sync::mpsc::channel; use std::sync::mpsc::channel;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use std::{env, process}; use std::{env, process};
use vhost_user_block::start_block_backend;
use vhost_user_net::start_net_backend; use vhost_user_net::start_net_backend;
use vmm::config; use vmm::config;
use vmm_sys_util::eventfd::EventFd; use vmm_sys_util::eventfd::EventFd;
@ -410,7 +411,7 @@ fn main() {
if let Some(backend_command) = cmd_arguments.value_of("net-backend") { if let Some(backend_command) = cmd_arguments.value_of("net-backend") {
start_net_backend(backend_command); start_net_backend(backend_command);
} else if let Some(backend_command) = cmd_arguments.value_of("block-backend") { } else if let Some(backend_command) = cmd_arguments.value_of("block-backend") {
start_net_backend(backend_command); start_block_backend(backend_command);
} else { } else {
start_vmm(cmd_arguments); start_vmm(cmd_arguments);
} }
@ -1853,7 +1854,7 @@ mod tests {
let vubd_socket_path = String::from(tmp_dir.path().join("vub.sock").to_str().unwrap()); let vubd_socket_path = String::from(tmp_dir.path().join("vub.sock").to_str().unwrap());
// Start the daemon // Start the daemon
let child = Command::new("target/release/vhost_user_blk") let child = Command::new("target/release/cloud-hypervisor")
.args(&[ .args(&[
"--block-backend", "--block-backend",
format!( format!(
@ -2669,7 +2670,7 @@ mod tests {
let guest = Guest::new(&mut clear); let guest = Guest::new(&mut clear);
// Start the daemon // Start the daemon
let mut daemon_child = Command::new("target/release/vhost_user_net") let mut daemon_child = Command::new("target/release/cloud-hypervisor")
.args(&[ .args(&[
"--net-backend", "--net-backend",
format!( format!(