Rather than continually cut-n-paste the strings into each command,
create a common macro to be used generically. Note that not all
'{.name = "current",' entries are replaced, just those that have the
common .help string of "affect current domain".
Non replaced instances are unique to the command.
Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx>
---
tools/virsh-domain.c | 111 +++++++++++++--------------------------------------
1 file changed, 27 insertions(+), 84 deletions(-)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 50d8225..e3ed216 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -81,6 +81,12 @@
.help = N_("affect running domain") \
} \
+#define VIRSH_COMMON_OPT_DOMAIN_CURRENT \
+ {.name = "current", \
+ .type = VSH_OT_BOOL, \
+ .help = N_("affect current domain") \
+ } \
+
static virDomainPtr
virshLookupDomainInternal(vshControl *ctl,
const char *cmdname,
@@ -232,10 +238,7 @@ static const vshCmdOptDef opts_attach_device[] = {
VIRSH_COMMON_OPT_DOMAIN_PERSISTENT,
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = NULL}
};
@@ -386,10 +389,7 @@ static const vshCmdOptDef opts_attach_disk[] = {
VIRSH_COMMON_OPT_DOMAIN_PERSISTENT,
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = NULL}
};
@@ -837,10 +837,7 @@ static const vshCmdOptDef opts_attach_interface[] = {
VIRSH_COMMON_OPT_DOMAIN_PERSISTENT,
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = "print-xml",
.type = VSH_OT_BOOL,
.help = N_("print XML document rather than attach the interface")
@@ -1277,10 +1274,7 @@ static const vshCmdOptDef opts_blkdeviotune[] = {
},
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = NULL}
};
@@ -1525,10 +1519,7 @@ static const vshCmdOptDef opts_blkiotune[] = {
},
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = NULL}
};
@@ -3208,10 +3199,7 @@ static const vshCmdOptDef opts_domiftune[] = {
},
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = NULL}
};
@@ -6418,10 +6406,7 @@ static const vshCmdOptDef opts_vcpupin[] = {
},
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = NULL}
};
@@ -6616,10 +6601,7 @@ static const vshCmdOptDef opts_emulatorpin[] = {
},
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = NULL}
};
@@ -6727,10 +6709,7 @@ static const vshCmdOptDef opts_setvcpus[] = {
},
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = "guest",
.type = VSH_OT_BOOL,
.help = N_("modify cpu state in the guest")
@@ -6809,10 +6788,7 @@ static const vshCmdOptDef opts_iothreadinfo[] = {
VIRSH_COMMON_OPT_DOMAIN,
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = NULL}
};
@@ -6898,10 +6874,7 @@ static const vshCmdOptDef opts_iothreadpin[] = {
},
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = NULL}
};
@@ -6978,10 +6951,7 @@ static const vshCmdOptDef opts_iothreadadd[] = {
},
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = NULL}
};
@@ -7046,10 +7016,7 @@ static const vshCmdOptDef opts_iothreaddel[] = {
},
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = NULL}
};
@@ -8302,10 +8269,7 @@ static const vshCmdOptDef opts_setmem[] = {
},
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = NULL}
};
@@ -8386,10 +8350,7 @@ static const vshCmdOptDef opts_setmaxmem[] = {
},
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = NULL}
};
@@ -8484,10 +8445,7 @@ static const vshCmdOptDef opts_memtune[] = {
},
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = NULL}
};
@@ -8657,10 +8615,7 @@ static const vshCmdOptDef opts_numatune[] = {
},
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = NULL}
};
@@ -10769,10 +10724,7 @@ static const vshCmdOptDef opts_detach_device[] = {
VIRSH_COMMON_OPT_DOMAIN_PERSISTENT,
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = NULL}
};
@@ -10857,10 +10809,7 @@ static const vshCmdOptDef opts_update_device[] = {
VIRSH_COMMON_OPT_DOMAIN_PERSISTENT,
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = "force",
.type = VSH_OT_BOOL,
.help = N_("force device update")
@@ -10950,10 +10899,7 @@ static const vshCmdOptDef opts_detach_interface[] = {
VIRSH_COMMON_OPT_DOMAIN_PERSISTENT,
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = NULL}
};
@@ -11353,10 +11299,7 @@ static const vshCmdOptDef opts_detach_disk[] = {
VIRSH_COMMON_OPT_DOMAIN_PERSISTENT,
VIRSH_COMMON_OPT_DOMAIN_CONFIG,
VIRSH_COMMON_OPT_DOMAIN_LIVE,
- {.name = "current",
- .type = VSH_OT_BOOL,
- .help = N_("affect current domain")
- },
+ VIRSH_COMMON_OPT_DOMAIN_CURRENT,
{.name = NULL}
};
--
2.5.0
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list