Rather than continually cut-n-paste the strings into each command,
create a common macro to be used generically. Note that not all
'{.name = "domain",' entries are replaced, just those that have the
common .help string of "domain name, id or uuid" and those that are
required.
Other instances won't take all 3 options, but some subset of those
options as directed by the virshCommandOptDomainBy flags argument or
in some instances where the domain is not a required option.
Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx>
---
tools/virsh-domain.c | 445 +++++++++------------------------------------------
tools/virsh.h | 7 +
2 files changed, 81 insertions(+), 371 deletions(-)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 7c65bf4..29b18c9 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -63,7 +63,6 @@
# define SA_SIGINFO 0
#endif
-
static virDomainPtr
virshLookupDomainInternal(vshControl *ctl,
const char *cmdname,
@@ -206,11 +205,7 @@ static const vshCmdInfo info_attach_device[] = {
};
static const vshCmdOptDef opts_attach_device[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "file",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -308,11 +303,7 @@ static const vshCmdInfo info_attach_disk[] = {
};
static const vshCmdOptDef opts_attach_disk[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "source",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ | VSH_OFLAG_EMPTY_OK,
@@ -808,11 +799,7 @@ static const vshCmdInfo info_attach_interface[] = {
};
static const vshCmdOptDef opts_attach_interface[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "type",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -1135,11 +1122,7 @@ static const vshCmdInfo info_autostart[] = {
};
static const vshCmdOptDef opts_autostart[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "disable",
.type = VSH_OT_BOOL,
.help = N_("disable autostarting")
@@ -1191,11 +1174,7 @@ static const vshCmdInfo info_blkdeviotune[] = {
};
static const vshCmdOptDef opts_blkdeviotune[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "device",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -1534,11 +1513,7 @@ static const vshCmdInfo info_blkiotune[] = {
};
static const vshCmdOptDef opts_blkiotune[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "weight",
.type = VSH_OT_INT,
.help = N_("IO Weight")
@@ -2007,11 +1982,7 @@ static const vshCmdInfo info_block_commit[] = {
};
static const vshCmdOptDef opts_block_commit[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "path",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -2227,11 +2198,7 @@ static const vshCmdInfo info_block_copy[] = {
};
static const vshCmdOptDef opts_block_copy[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "path",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -2532,11 +2499,7 @@ static const vshCmdInfo info_block_job[] = {
};
static const vshCmdOptDef opts_block_job[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "path",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -2777,11 +2740,7 @@ static const vshCmdInfo info_block_pull[] = {
};
static const vshCmdOptDef opts_block_pull[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "path",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -2916,11 +2875,7 @@ static const vshCmdInfo info_block_resize[] = {
};
static const vshCmdOptDef opts_block_resize[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "path",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -2984,11 +2939,7 @@ static const vshCmdInfo info_console[] = {
};
static const vshCmdOptDef opts_console[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "devname", /* sc_prohibit_devname */
.type = VSH_OT_STRING,
.help = N_("character device name")
@@ -3082,11 +3033,7 @@ static const vshCmdInfo info_domif_setlink[] = {
};
static const vshCmdOptDef opts_domif_setlink[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "interface",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -3269,11 +3216,7 @@ static const vshCmdInfo info_domiftune[] = {
};
static const vshCmdOptDef opts_domiftune[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "interface",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -3479,11 +3422,7 @@ static const vshCmdInfo info_suspend[] = {
};
static const vshCmdOptDef opts_suspend[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = NULL}
};
@@ -3525,11 +3464,7 @@ static const vshCmdInfo info_dom_pm_suspend[] = {
};
static const vshCmdOptDef opts_dom_pm_suspend[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "target",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -3607,11 +3542,7 @@ static const vshCmdInfo info_dom_pm_wakeup[] = {
};
static const vshCmdOptDef opts_dom_pm_wakeup[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = NULL}
};
@@ -4257,11 +4188,7 @@ static const vshCmdInfo info_save[] = {
};
static const vshCmdOptDef opts_save[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "file",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -4727,11 +4654,7 @@ static const vshCmdInfo info_managedsave[] = {
};
static const vshCmdOptDef opts_managedsave[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "bypass-cache",
.type = VSH_OT_BOOL,
.help = N_("avoid file system cache when saving")
@@ -4851,11 +4774,7 @@ static const vshCmdInfo info_managedsaveremove[] = {
};
static const vshCmdOptDef opts_managedsaveremove[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = NULL}
};
@@ -4910,11 +4829,7 @@ static const vshCmdInfo info_schedinfo[] = {
};
static const vshCmdOptDef opts_schedinfo[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "weight",
.type = VSH_OT_INT,
.flags = VSH_OFLAG_REQ_OPT,
@@ -5238,11 +5153,7 @@ static const vshCmdInfo info_dump[] = {
};
static const vshCmdOptDef opts_dump[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "file",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -5421,11 +5332,7 @@ static const vshCmdInfo info_screenshot[] = {
};
static const vshCmdOptDef opts_screenshot[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "file",
.type = VSH_OT_STRING,
.help = N_("where to store the screenshot")
@@ -5568,11 +5475,7 @@ static const vshCmdInfo info_set_user_password[] = {
};
static const vshCmdOptDef opts_set_user_password[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "user",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -5636,11 +5539,7 @@ static const vshCmdInfo info_resume[] = {
};
static const vshCmdOptDef opts_resume[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = NULL}
};
@@ -5679,11 +5578,7 @@ static const vshCmdInfo info_shutdown[] = {
};
static const vshCmdOptDef opts_shutdown[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "mode",
.type = VSH_OT_STRING,
.help = N_("shutdown mode: acpi|agent|initctl|signal|paravirt")
@@ -5768,11 +5663,7 @@ static const vshCmdInfo info_reboot[] = {
};
static const vshCmdOptDef opts_reboot[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "mode",
.type = VSH_OT_STRING,
.help = N_("shutdown mode: acpi|agent|initctl|signal|paravirt")
@@ -5852,11 +5743,7 @@ static const vshCmdInfo info_reset[] = {
};
static const vshCmdOptDef opts_reset[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = NULL}
};
@@ -5895,11 +5782,7 @@ static const vshCmdInfo info_domjobinfo[] = {
};
static const vshCmdOptDef opts_domjobinfo[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "completed",
.type = VSH_OT_BOOL,
.help = N_("return statistics of a recently completed job")
@@ -6197,11 +6080,7 @@ static const vshCmdInfo info_domjobabort[] = {
};
static const vshCmdOptDef opts_domjobabort[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = NULL}
};
@@ -6235,11 +6114,7 @@ static const vshCmdInfo info_vcpucount[] = {
};
static const vshCmdOptDef opts_vcpucount[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "maximum",
.type = VSH_OT_BOOL,
.help = N_("get maximum count of vcpus")
@@ -6450,11 +6325,7 @@ static const vshCmdInfo info_vcpuinfo[] = {
};
static const vshCmdOptDef opts_vcpuinfo[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "pretty",
.type = VSH_OT_BOOL,
.help = N_("return human readable output")
@@ -6565,11 +6436,7 @@ static const vshCmdInfo info_vcpupin[] = {
};
static const vshCmdOptDef opts_vcpupin[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "vcpu",
.type = VSH_OT_INT,
.help = N_("vcpu number")
@@ -6777,11 +6644,7 @@ static const vshCmdInfo info_emulatorpin[] = {
};
static const vshCmdOptDef opts_emulatorpin[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "cpulist",
.type = VSH_OT_STRING,
.flags = VSH_OFLAG_EMPTY_OK,
@@ -6894,11 +6757,7 @@ static const vshCmdInfo info_setvcpus[] = {
};
static const vshCmdOptDef opts_setvcpus[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "count",
.type = VSH_OT_INT,
.flags = VSH_OFLAG_REQ,
@@ -6995,11 +6854,7 @@ static const vshCmdInfo info_iothreadinfo[] = {
{.name = NULL}
};
static const vshCmdOptDef opts_iothreadinfo[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "config",
.type = VSH_OT_BOOL,
.help = N_("affect next boot")
@@ -7084,11 +6939,7 @@ static const vshCmdInfo info_iothreadpin[] = {
};
static const vshCmdOptDef opts_iothreadpin[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "iothread",
.type = VSH_OT_INT,
.flags = VSH_OFLAG_REQ,
@@ -7179,11 +7030,7 @@ static const vshCmdInfo info_iothreadadd[] = {
};
static const vshCmdOptDef opts_iothreadadd[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "id",
.type = VSH_OT_INT,
.flags = VSH_OFLAG_REQ,
@@ -7257,11 +7104,7 @@ static const vshCmdInfo info_iothreaddel[] = {
};
static const vshCmdOptDef opts_iothreaddel[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "id",
.type = VSH_OT_INT,
.flags = VSH_OFLAG_REQ,
@@ -7554,11 +7397,7 @@ static const vshCmdInfo info_cpu_stats[] = {
};
static const vshCmdOptDef opts_cpu_stats[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "total",
.type = VSH_OT_BOOL,
.help = N_("Show total statistics only")
@@ -7905,11 +7744,7 @@ static const vshCmdInfo info_destroy[] = {
};
static const vshCmdOptDef opts_destroy[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "graceful",
.type = VSH_OT_BOOL,
.help = N_("terminate gracefully")
@@ -7962,11 +7797,7 @@ static const vshCmdInfo info_desc[] = {
};
static const vshCmdOptDef opts_desc[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "live",
.type = VSH_OT_BOOL,
.help = N_("modify/get running state")
@@ -8141,11 +7972,7 @@ static const vshCmdInfo info_metadata[] = {
};
static const vshCmdOptDef opts_metadata[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "uri",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -8300,11 +8127,7 @@ static const vshCmdInfo info_inject_nmi[] = {
};
static const vshCmdOptDef opts_inject_nmi[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = NULL}
};
@@ -8338,11 +8161,7 @@ static const vshCmdInfo info_send_key[] = {
};
static const vshCmdOptDef opts_send_key[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "codeset",
.type = VSH_OT_STRING,
.flags = VSH_OFLAG_REQ_OPT,
@@ -8438,11 +8257,7 @@ static const vshCmdInfo info_send_process_signal[] = {
};
static const vshCmdOptDef opts_send_process_signal[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "pid",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -8547,11 +8362,7 @@ static const vshCmdInfo info_setmem[] = {
};
static const vshCmdOptDef opts_setmem[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "kilobytes",
.type = VSH_OT_ALIAS,
.help = "size"
@@ -8641,11 +8452,7 @@ static const vshCmdInfo info_setmaxmem[] = {
};
static const vshCmdOptDef opts_setmaxmem[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "kilobytes",
.type = VSH_OT_ALIAS,
.help = "size"
@@ -8742,11 +8549,7 @@ static const vshCmdInfo info_memtune[] = {
};
static const vshCmdOptDef opts_memtune[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "hard-limit",
.type = VSH_OT_INT,
.help = N_("Max memory, as scaled integer (default KiB)")
@@ -8932,11 +8735,7 @@ static const vshCmdInfo info_numatune[] = {
};
static const vshCmdOptDef opts_numatune[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "mode",
.type = VSH_OT_STRING,
.help = N_("NUMA mode, one of strict, preferred and interleave \n"
@@ -9080,11 +8879,7 @@ static const vshCmdInfo info_qemu_monitor_command[] = {
};
static const vshCmdOptDef opts_qemu_monitor_command[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "hmp",
.type = VSH_OT_BOOL,
.help = N_("command is in human monitor protocol")
@@ -9374,11 +9169,7 @@ static const vshCmdInfo info_qemu_agent_command[] = {
};
static const vshCmdOptDef opts_qemu_agent_command[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "timeout",
.type = VSH_OT_INT,
.flags = VSH_OFLAG_REQ_OPT,
@@ -9501,11 +9292,7 @@ static const vshCmdInfo info_lxc_enter_namespace[] = {
};
static const vshCmdOptDef opts_lxc_enter_namespace[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "noseclabel",
.type = VSH_OT_BOOL,
.help = N_("Do not change process security label")
@@ -9644,11 +9431,7 @@ static const vshCmdInfo info_dumpxml[] = {
};
static const vshCmdOptDef opts_dumpxml[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "inactive",
.type = VSH_OT_BOOL,
.help = N_("show inactive defined XML")
@@ -9868,11 +9651,7 @@ static const vshCmdInfo info_domrename[] = {
};
static const vshCmdOptDef opts_domrename[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "new-name",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -10001,11 +9780,7 @@ static const vshCmdInfo info_migrate[] = {
};
static const vshCmdOptDef opts_migrate[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "desturi",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -10371,11 +10146,7 @@ static const vshCmdInfo info_migrate_setmaxdowntime[] = {
};
static const vshCmdOptDef opts_migrate_setmaxdowntime[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "downtime",
.type = VSH_OT_INT,
.flags = VSH_OFLAG_REQ,
@@ -10426,11 +10197,7 @@ static const vshCmdInfo info_migrate_compcache[] = {
};
static const vshCmdOptDef opts_migrate_compcache[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "size",
.type = VSH_OT_INT,
.flags = VSH_OFLAG_REQ_OPT,
@@ -10487,11 +10254,7 @@ static const vshCmdInfo info_migrate_setspeed[] = {
};
static const vshCmdOptDef opts_migrate_setspeed[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "bandwidth",
.type = VSH_OT_INT,
.flags = VSH_OFLAG_REQ,
@@ -10537,11 +10300,7 @@ static const vshCmdInfo info_migrate_getspeed[] = {
};
static const vshCmdOptDef opts_migrate_getspeed[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = NULL}
};
@@ -10582,11 +10341,7 @@ static const vshCmdInfo info_domdisplay[] = {
};
static const vshCmdOptDef opts_domdisplay[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "include-password",
.type = VSH_OT_BOOL,
.help = N_("includes the password into the connection URI if available")
@@ -10805,11 +10560,7 @@ static const vshCmdInfo info_vncdisplay[] = {
};
static const vshCmdOptDef opts_vncdisplay[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = NULL}
};
@@ -10890,11 +10641,7 @@ static const vshCmdInfo info_ttyconsole[] = {
};
static const vshCmdOptDef opts_ttyconsole[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = NULL}
};
@@ -10950,11 +10697,7 @@ static const vshCmdInfo info_domhostname[] = {
};
static const vshCmdOptDef opts_domhostname[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = NULL}
};
@@ -11113,11 +10856,7 @@ static const vshCmdInfo info_detach_device[] = {
};
static const vshCmdOptDef opts_detach_device[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "file",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -11214,11 +10953,7 @@ static const vshCmdInfo info_update_device[] = {
};
static const vshCmdOptDef opts_update_device[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "file",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -11316,11 +11051,7 @@ static const vshCmdInfo info_detach_interface[] = {
};
static const vshCmdOptDef opts_detach_interface[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "type",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -11736,11 +11467,7 @@ static const vshCmdInfo info_detach_disk[] = {
};
static const vshCmdOptDef opts_detach_disk[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "target",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -11852,11 +11579,7 @@ static const vshCmdInfo info_edit[] = {
};
static const vshCmdOptDef opts_edit[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "skip-validate",
.type = VSH_OT_BOOL,
.help = N_("skip validation of the XML against the schema")
@@ -12705,11 +12428,7 @@ static const vshCmdInfo info_change_media[] = {
};
static const vshCmdOptDef opts_change_media[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "path",
.type = VSH_OT_DATA,
.flags = VSH_OFLAG_REQ,
@@ -12877,11 +12596,7 @@ static const vshCmdInfo info_domfstrim[] = {
};
static const vshCmdOptDef opts_domfstrim[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "minimum",
.type = VSH_OT_INT,
.help = N_("Just a hint to ignore contiguous "
@@ -12934,11 +12649,7 @@ static const vshCmdInfo info_domfsfreeze[] = {
};
static const vshCmdOptDef opts_domfsfreeze[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "mountpoint",
.type = VSH_OT_ARGV,
.help = N_("mountpoint path to be frozen")
@@ -12991,11 +12702,7 @@ static const vshCmdInfo info_domfsthaw[] = {
};
static const vshCmdOptDef opts_domfsthaw[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = "mountpoint",
.type = VSH_OT_ARGV,
.help = N_("mountpoint path to be thawed")
@@ -13048,11 +12755,7 @@ static const vshCmdInfo info_domfsinfo[] = {
};
static const vshCmdOptDef opts_domfsinfo[] = {
- {.name = "domain",
- .type = VSH_OT_DATA,
- .flags = VSH_OFLAG_REQ,
- .help = N_("domain name, id or uuid")
- },
+ VIRSH_COMMON_OPT_DOMAIN,
{.name = NULL}
};
diff --git a/tools/virsh.h b/tools/virsh.h
index d9d5696..2101a00 100644
--- a/tools/virsh.h
+++ b/tools/virsh.h
@@ -69,6 +69,13 @@
.help = N_("pool name or uuid") \
} \
+# define VIRSH_COMMON_OPT_DOMAIN \
+ {.name = "domain", \
+ .type = VSH_OT_DATA, \
+ .flags = VSH_OFLAG_REQ, \
+ .help = N_("domain name, id or uuid") \
+ } \
+
typedef struct _virshControl virshControl;
typedef virshControl *virshControlPtr;
--
2.5.0
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list