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

vhost_user_net, vhost_user_block, option_parser: Remove vmm dependency

Browse Source 
Remove the vmm dependency from vhost_user_block and vhost_user_net where
it was existing to use config::OptionParser. By moving the OptionParser
to its own crate at the top-level we can remove the very heavy
dependency that these vhost-user backends had.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford
2020-07-06 16:41:45 +01:00
parent 90261bb9c7
commit b69f6d4f6c
11 changed files with 192 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vhost_user_block/Cargo.toml
View File

@@ -9,11 +9,11 @@ clap = { version = "2.33.1", features=["wrap_help"] }
epoll = ">=4.0.1"
libc = "0.2.71"
log = "0.4.8"
option_parser = { path = "../option_parser" }
qcow = { path = "../qcow" }
vhost_user_backend = { path = "../vhost_user_backend" }
vhost_rs = { git = "https://github.com/cloud-hypervisor/vhost", branch = "dragonball", package = "vhost", features = ["vhost-user-slave"] }
virtio-bindings = "0.1.0"
virtio-devices = { path = "../virtio-devices" }
vm-memory = "0.2.1"
vmm = { path = "../vmm" }
vmm-sys-util = ">=0.3.1"

2
vhost_user_block/src/lib.rs
View File

@@ -15,6 +15,7 @@ extern crate virtio_devices;
use libc::EFD_NONBLOCK;
use log::*;
use option_parser::{OptionParser, OptionParserError, Toggle};
use qcow::{self, ImageType, QcowFile};
use std::fs::File;
use std::fs::OpenOptions;
@@ -40,7 +41,6 @@ use virtio_devices::block::{build_disk_image_id, Request};
use virtio_devices::VirtioBlockConfig;
use vm_memory::ByteValued;
use vm_memory::{Bytes, GuestMemoryMmap};
use vmm::config::{OptionParser, OptionParserError, Toggle};
use vmm_sys_util::eventfd::EventFd;
const SECTOR_SHIFT: u8 = 9;