mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-12-22 21:55:20 +00:00
main: Remove --net-backend and --block-backend from cloud-hypervisor
Remove the parameters used for self spawning from the cloud-hypervisor binary. See: #1925 Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
parent
fb70baece0
commit
d1d0421103
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -230,8 +230,6 @@ dependencies = [
|
||||
"tempdir",
|
||||
"tempfile",
|
||||
"thiserror",
|
||||
"vhost_user_block",
|
||||
"vhost_user_net",
|
||||
"vmm",
|
||||
"vmm-sys-util",
|
||||
"wait-timeout",
|
||||
|
@ -24,8 +24,6 @@ option_parser = { path = "option_parser" }
|
||||
seccomp = { git = "https://github.com/firecracker-microvm/firecracker", tag = "v0.22.0" }
|
||||
serde_json = "1.0.59"
|
||||
thiserror = "1.0"
|
||||
vhost_user_block = { path = "vhost_user_block"}
|
||||
vhost_user_net = { path = "vhost_user_net"}
|
||||
vmm = { path = "vmm" }
|
||||
vmm-sys-util = "0.7.0"
|
||||
wait-timeout = "0.2.0"
|
||||
|
24
src/main.rs
24
src/main.rs
@ -18,8 +18,6 @@ use std::env;
|
||||
use std::sync::mpsc::channel;
|
||||
use std::sync::{Arc, Mutex};
|
||||
use thiserror::Error;
|
||||
use vhost_user_block::start_block_backend;
|
||||
use vhost_user_net::start_net_backend;
|
||||
use vmm::config;
|
||||
use vmm_sys_util::eventfd::EventFd;
|
||||
|
||||
@ -307,22 +305,6 @@ fn create_app<'a, 'b>(
|
||||
.min_values(1)
|
||||
.group("vmm-config"),
|
||||
)
|
||||
.arg(
|
||||
Arg::with_name("net-backend")
|
||||
.long("net-backend")
|
||||
.help(vhost_user_net::SYNTAX)
|
||||
.takes_value(true)
|
||||
.conflicts_with_all(&["block-backend", "kernel"])
|
||||
.min_values(1),
|
||||
)
|
||||
.arg(
|
||||
Arg::with_name("block-backend")
|
||||
.long("block-backend")
|
||||
.help(vhost_user_block::SYNTAX)
|
||||
.takes_value(true)
|
||||
.conflicts_with_all(&["net-backend", "kernel"])
|
||||
.min_values(1),
|
||||
)
|
||||
.arg(
|
||||
Arg::with_name("seccomp")
|
||||
.long("seccomp")
|
||||
@ -471,11 +453,6 @@ fn main() {
|
||||
.map(|()| log::set_max_level(log_level))
|
||||
.expect("Expected to be able to setup logger");
|
||||
|
||||
if let Some(backend_command) = cmd_arguments.value_of("net-backend") {
|
||||
start_net_backend(backend_command);
|
||||
} else if let Some(backend_command) = cmd_arguments.value_of("block-backend") {
|
||||
start_block_backend(backend_command);
|
||||
} else {
|
||||
let api_socket_path = cmd_arguments
|
||||
.value_of("api-socket")
|
||||
.expect("Missing argument: api-socket")
|
||||
@ -488,7 +465,6 @@ fn main() {
|
||||
}
|
||||
std::fs::remove_file(api_socket_path).ok();
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
#[macro_use]
|
||||
|
Loading…
Reference in New Issue
Block a user