From e12179a3e66f9a26cd9ef95eb1fcb5a69e57aa3e 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_net: Rename "--backend" to "--net-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_net.rs | 8 ++++----
 src/main.rs               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bin/vhost_user_net.rs b/src/bin/vhost_user_net.rs
index d1f7592b9..bf3abff03 100644
--- a/src/bin/vhost_user_net.rs
+++ b/src/bin/vhost_user_net.rs
@@ -431,10 +431,10 @@ fn main() {
         .author(crate_authors!())
         .about("Launch a vhost-user-net backend.")
         .arg(
-            Arg::with_name("backend")
-                .long("backend")
+            Arg::with_name("net-backend")
+                .long("net-backend")
                 .help(
-                    "Backend parameters \"ip=<ip_addr>,\
+                    "vhost-user-net backend parameters \"ip=<ip_addr>,\
                      mask=<net_mask>,sock=<socket_path>,\
                      num_queues=<number_of_queues>,\
                      queue_size=<size_of_each_queue>\"",
@@ -444,7 +444,7 @@ fn main() {
         )
         .get_matches();
 
-    let vhost_user_net_backend = cmd_arguments.value_of("backend").unwrap();
+    let vhost_user_net_backend = cmd_arguments.value_of("net-backend").unwrap();
 
     let backend_config = match VhostUserNetBackendConfig::parse(vhost_user_net_backend) {
         Ok(config) => config,
diff --git a/src/main.rs b/src/main.rs
index a39eee176..975eba47d 100755
--- a/src/main.rs
+++ b/src/main.rs
@@ -2638,7 +2638,7 @@ mod tests {
             // Start the daemon
             let mut daemon_child = Command::new("target/release/vhost_user_net")
                 .args(&[
-                    "--backend",
+                    "--net-backend",
                     format!(
                         "ip={},mask=255.255.255.0,sock=/tmp/vunet.sock,num_queues=4,queue_size=1024",
                         guest.network.host_ip