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>
This commit is contained in:
John Ferlan 2016-01-09 08:36:35 -05:00
parent 2165522819
commit 545e5571f9
1 changed files with 12 additions and 25 deletions

View File

@ -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}
};