From 545e5571f9bafc61c65b563ca69907f8cc935f72 Mon Sep 17 00:00:00 2001
From: John Ferlan <jferlan@redhat.com>
Date: Sat, 9 Jan 2016 08:36:35 -0500
Subject: [PATCH] virsh: Create macro for common "interface" option

Rather than continually cut-n-paste the strings into each command,
create a common macro to be used generically.  Note that not all
'{.name = "interface",' entries are replaced, just those that have the
common .help string of "interface name or MAC address".

Signed-off-by: John Ferlan <jferlan@redhat.com>
---
 tools/virsh-interface.c | 37 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c
index c36b92d2c6..99ac84ea9b 100644
--- a/tools/virsh-interface.c
+++ b/tools/virsh-interface.c
@@ -23,6 +23,13 @@
  *
  */
 
+#define VIRSH_COMMON_OPT_INTERFACE                     \
+    {.name = "interface",                              \
+     .type = VSH_OT_DATA,                              \
+     .flags = VSH_OFLAG_REQ,                           \
+     .help = N_("interface name or MAC address")       \
+    }                                                  \
+
 #include <config.h>
 #include "virsh-interface.h"
 
@@ -100,11 +107,7 @@ static const vshCmdInfo info_interface_edit[] = {
 };
 
 static const vshCmdOptDef opts_interface_edit[] = {
-    {.name = "interface",
-     .type = VSH_OT_DATA,
-     .flags = VSH_OFLAG_REQ,
-     .help = N_("interface name or MAC address")
-    },
+    VIRSH_COMMON_OPT_INTERFACE,
     {.name = NULL}
 };
 
@@ -464,11 +467,7 @@ static const vshCmdInfo info_interface_dumpxml[] = {
 };
 
 static const vshCmdOptDef opts_interface_dumpxml[] = {
-    {.name = "interface",
-     .type = VSH_OT_DATA,
-     .flags = VSH_OFLAG_REQ,
-     .help = N_("interface name or MAC address")
-    },
+    VIRSH_COMMON_OPT_INTERFACE,
     {.name = "inactive",
      .type = VSH_OT_BOOL,
      .help = N_("show inactive defined XML")
@@ -565,11 +564,7 @@ static const vshCmdInfo info_interface_undefine[] = {
 };
 
 static const vshCmdOptDef opts_interface_undefine[] = {
-    {.name = "interface",
-     .type = VSH_OT_DATA,
-     .flags = VSH_OFLAG_REQ,
-     .help = N_("interface name or MAC address")
-    },
+    VIRSH_COMMON_OPT_INTERFACE,
     {.name = NULL}
 };
 
@@ -608,11 +603,7 @@ static const vshCmdInfo info_interface_start[] = {
 };
 
 static const vshCmdOptDef opts_interface_start[] = {
-    {.name = "interface",
-     .type = VSH_OT_DATA,
-     .flags = VSH_OFLAG_REQ,
-     .help = N_("interface name or MAC address")
-    },
+    VIRSH_COMMON_OPT_INTERFACE,
     {.name = NULL}
 };
 
@@ -651,11 +642,7 @@ static const vshCmdInfo info_interface_destroy[] = {
 };
 
 static const vshCmdOptDef opts_interface_destroy[] = {
-    {.name = "interface",
-     .type = VSH_OT_DATA,
-     .flags = VSH_OFLAG_REQ,
-     .help = N_("interface name or MAC address")
-    },
+    VIRSH_COMMON_OPT_INTERFACE,
     {.name = NULL}
 };