mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-06 06:15:46 +00:00
virsh: cmdDesc: Use separate flags variable for getters
The getters have a different set of flags. Add a variable for the getter to avoid having to construct flags when calling the getter. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
2337098b63
commit
a3ef5414ed
@ -8341,12 +8341,15 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd)
|
|||||||
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
|
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
|
||||||
bool ret = false;
|
bool ret = false;
|
||||||
unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT;
|
unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT;
|
||||||
|
unsigned int queryflags = 0;
|
||||||
|
|
||||||
VSH_EXCLUSIVE_OPTIONS_VAR(current, live);
|
VSH_EXCLUSIVE_OPTIONS_VAR(current, live);
|
||||||
VSH_EXCLUSIVE_OPTIONS_VAR(current, config);
|
VSH_EXCLUSIVE_OPTIONS_VAR(current, config);
|
||||||
|
|
||||||
if (config)
|
if (config) {
|
||||||
flags |= VIR_DOMAIN_AFFECT_CONFIG;
|
flags |= VIR_DOMAIN_AFFECT_CONFIG;
|
||||||
|
queryflags |= VIR_DOMAIN_XML_INACTIVE;
|
||||||
|
}
|
||||||
if (live)
|
if (live)
|
||||||
flags |= VIR_DOMAIN_AFFECT_LIVE;
|
flags |= VIR_DOMAIN_AFFECT_LIVE;
|
||||||
|
|
||||||
@ -8370,8 +8373,7 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd)
|
|||||||
|
|
||||||
if (edit || desc) {
|
if (edit || desc) {
|
||||||
if (!desc) {
|
if (!desc) {
|
||||||
desc = virshGetDomainDescription(ctl, dom, title,
|
desc = virshGetDomainDescription(ctl, dom, title, queryflags);
|
||||||
config?VIR_DOMAIN_XML_INACTIVE:0);
|
|
||||||
if (!desc)
|
if (!desc)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
@ -8420,8 +8422,7 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd)
|
|||||||
title ? _("Domain title updated successfully") :
|
title ? _("Domain title updated successfully") :
|
||||||
_("Domain description updated successfully"));
|
_("Domain description updated successfully"));
|
||||||
} else {
|
} else {
|
||||||
desc = virshGetDomainDescription(ctl, dom, title,
|
desc = virshGetDomainDescription(ctl, dom, title, queryflags);
|
||||||
config?VIR_DOMAIN_XML_INACTIVE:0);
|
|
||||||
if (!desc)
|
if (!desc)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user