From 3ede2dc53ac1817cd7151a5786199f1698c33593 Mon Sep 17 00:00:00 2001
From: Rob Bradford <robert.bradford@intel.com>
Date: Mon, 20 Jan 2020 14:28:06 +0000
Subject: [PATCH] bin: vhost_user_blk: Rename "--backend" to "--block-backend"

This will prevent it from conflicting when it is aggregated into the
cloud-hypervisor binary.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
---
 src/bin/vhost_user_blk.rs | 8 ++++----
 src/main.rs               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bin/vhost_user_blk.rs b/src/bin/vhost_user_blk.rs
index b1e314eae..84d782220 100644
--- a/src/bin/vhost_user_blk.rs
+++ b/src/bin/vhost_user_blk.rs
@@ -284,10 +284,10 @@ fn main() {
         .author(crate_authors!())
         .about("Launch a vhost-user-blk backend.")
         .arg(
-            Arg::with_name("backend")
-                .long("backend")
+            Arg::with_name("block-backend")
+                .long("block-backend")
                 .help(
-                    "Backend parameters \"image=<image_path>,\
+                    "vhost-user-block backend parameters \"image=<image_path>,\
                      sock=<socket_path>,readonly=true|false,\
                      direct=true|false\"",
                 )
@@ -296,7 +296,7 @@ fn main() {
         )
         .get_matches();
 
-    let vhost_user_blk_backend = cmd_arguments.value_of("backend").unwrap();
+    let vhost_user_blk_backend = cmd_arguments.value_of("block-backend").unwrap();
 
     let backend_config = match VhostUserBlkBackendConfig::parse(vhost_user_blk_backend) {
         Ok(config) => config,
diff --git a/src/main.rs b/src/main.rs
index d250c56ea..a39eee176 100755
--- a/src/main.rs
+++ b/src/main.rs
@@ -1822,7 +1822,7 @@ mod tests {
         // Start the daemon
         let child = Command::new("target/release/vhost_user_blk")
             .args(&[
-                "--backend",
+                "--block-backend",
                 format!(
                     "image={},sock={},readonly={},direct={}",
                     blk_file_path, vubd_socket_path, rdonly, direct