External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Create macro for common "persistent" option

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

Non replaced instances are unique to the command.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2016-01-09 08:36:25 -05:00
parent b6fb1e245c
commit c7ccd8b2e6
1 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tools/virsh-domain.c
View File

@ -66,6 +66,12 @@
#define VIRSH_COMMON_OPT_DOMAIN_FULL \ #define VIRSH_COMMON_OPT_DOMAIN_FULL \
VIRSH_COMMON_OPT_DOMAIN(N_("domain name, id or uuid")) \ VIRSH_COMMON_OPT_DOMAIN(N_("domain name, id or uuid")) \
#define VIRSH_COMMON_OPT_DOMAIN_PERSISTENT \
{.name = "persistent", \
.type = VSH_OT_BOOL, \
.help = N_("make live change persistent") \
} \
static virDomainPtr static virDomainPtr
virshLookupDomainInternal(vshControl *ctl, virshLookupDomainInternal(vshControl *ctl,
const char *cmdname, const char *cmdname,
@ -214,10 +220,7 @@ static const vshCmdOptDef opts_attach_device[] = {
.flags = VSH_OFLAG_REQ, .flags = VSH_OFLAG_REQ,
.help = N_("XML file") .help = N_("XML file")
}, },
{.name = "persistent", VIRSH_COMMON_OPT_DOMAIN_PERSISTENT,
.type = VSH_OT_BOOL,
.help = N_("make live change persistent")
},
{.name = "config", {.name = "config",
.type = VSH_OT_BOOL, .type = VSH_OT_BOOL,
.help = N_("affect next boot") .help = N_("affect next boot")
@ -377,10 +380,7 @@ static const vshCmdOptDef opts_attach_disk[] = {
.type = VSH_OT_BOOL, .type = VSH_OT_BOOL,
.help = N_("print XML document rather than attach the disk") .help = N_("print XML document rather than attach the disk")
}, },
{.name = "persistent", VIRSH_COMMON_OPT_DOMAIN_PERSISTENT,
.type = VSH_OT_BOOL,
.help = N_("make live change persistent")
},
{.name = "config", {.name = "config",
.type = VSH_OT_BOOL, .type = VSH_OT_BOOL,
.help = N_("affect next boot") .help = N_("affect next boot")
@ -837,10 +837,7 @@ static const vshCmdOptDef opts_attach_interface[] = {
.type = VSH_OT_STRING, .type = VSH_OT_STRING,
.help = N_("control domain's outgoing traffics") .help = N_("control domain's outgoing traffics")
}, },
{.name = "persistent", VIRSH_COMMON_OPT_DOMAIN_PERSISTENT,
.type = VSH_OT_BOOL,
.help = N_("make live change persistent")
},
{.name = "config", {.name = "config",
.type = VSH_OT_BOOL, .type = VSH_OT_BOOL,
.help = N_("affect next boot") .help = N_("affect next boot")
@ -10863,10 +10860,7 @@ static const vshCmdOptDef opts_detach_device[] = {
.flags = VSH_OFLAG_REQ, .flags = VSH_OFLAG_REQ,
.help = N_("XML file") .help = N_("XML file")
}, },
{.name = "persistent", VIRSH_COMMON_OPT_DOMAIN_PERSISTENT,
.type = VSH_OT_BOOL,
.help = N_("make live change persistent")
},
{.name = "config", {.name = "config",
.type = VSH_OT_BOOL, .type = VSH_OT_BOOL,
.help = N_("affect next boot") .help = N_("affect next boot")
@ -10960,10 +10954,7 @@ static const vshCmdOptDef opts_update_device[] = {
.flags = VSH_OFLAG_REQ, .flags = VSH_OFLAG_REQ,
.help = N_("XML file") .help = N_("XML file")
}, },
{.name = "persistent", VIRSH_COMMON_OPT_DOMAIN_PERSISTENT,
.type = VSH_OT_BOOL,
.help = N_("make live change persistent")
},
{.name = "config", {.name = "config",
.type = VSH_OT_BOOL, .type = VSH_OT_BOOL,
.help = N_("affect next boot") .help = N_("affect next boot")
@ -11062,10 +11053,7 @@ static const vshCmdOptDef opts_detach_interface[] = {
.type = VSH_OT_STRING, .type = VSH_OT_STRING,
.help = N_("MAC address") .help = N_("MAC address")
}, },
{.name = "persistent", VIRSH_COMMON_OPT_DOMAIN_PERSISTENT,
.type = VSH_OT_BOOL,
.help = N_("make live change persistent")
},
{.name = "config", {.name = "config",
.type = VSH_OT_BOOL, .type = VSH_OT_BOOL,
.help = N_("affect next boot") .help = N_("affect next boot")
@ -11474,10 +11462,7 @@ static const vshCmdOptDef opts_detach_disk[] = {
.flags = VSH_OFLAG_REQ, .flags = VSH_OFLAG_REQ,
.help = N_("target of disk device") .help = N_("target of disk device")
}, },
{.name = "persistent", VIRSH_COMMON_OPT_DOMAIN_PERSISTENT,
.type = VSH_OT_BOOL,
.help = N_("make live change persistent")
},
{.name = "config", {.name = "config",
.type = VSH_OT_BOOL, .type = VSH_OT_BOOL,
.help = N_("affect next boot") .help = N_("affect next boot")