From 72802b34cdd24c098922a9167c824cac88a264c1 Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Fri, 3 Jul 2020 15:14:36 +0100 Subject: [PATCH] vhost_user_block: Move binary into vhost_user_block crate The binary is still built in the same location but the source code and the dependencies for it come from the vhost_user_block crate itself. The binary will be built with: `cargo build --all --bin vhost_user_block` or just `cargo build --all` Signed-off-by: Rob Bradford --- Cargo.lock | 2 +- vhost_user_block/Cargo.toml | 2 +- src/bin/vhost_user_blk.rs => vhost_user_block/src/main.rs | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename src/bin/vhost_user_blk.rs => vhost_user_block/src/main.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index a4668b0c1..3696e52df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1430,7 +1430,7 @@ dependencies = [ name = "vhost_user_block" version = "0.1.0" dependencies = [ - "bitflags 1.2.1", + "clap", "epoll", "libc", "log 0.4.8", diff --git a/vhost_user_block/Cargo.toml b/vhost_user_block/Cargo.toml index 67fe8f3b1..9c473ef96 100644 --- a/vhost_user_block/Cargo.toml +++ b/vhost_user_block/Cargo.toml @@ -5,7 +5,7 @@ authors = ["The Cloud Hypervisor Authors"] edition = "2018" [dependencies] -bitflags = "1.1.0" +clap = { version = "2.33.1", features=["wrap_help"] } epoll = ">=4.0.1" libc = "0.2.71" log = "0.4.8" diff --git a/src/bin/vhost_user_blk.rs b/vhost_user_block/src/main.rs similarity index 100% rename from src/bin/vhost_user_blk.rs rename to vhost_user_block/src/main.rs