NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

conf: Don't pass PROP_NONZERO to virXMLPropTristateBool()

Browse Source 
It's the default behavior.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Andrea Bolognani 2022-03-24 14:04:09 +01:00
parent 67c77744d7
commit f655f27b66
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf/domain_conf.c
View File

@ -7868,7 +7868,7 @@ virSecurityLabelDefParseXML(xmlXPathContextPtr ctxt,
seclabel->type == VIR_DOMAIN_SECLABEL_NONE) seclabel->type == VIR_DOMAIN_SECLABEL_NONE)
seclabel->relabel = false; seclabel->relabel = false;
if (virXMLPropTristateBool(ctxt->node, "relabel", VIR_XML_PROP_NONZERO, &relabel) < 0) if (virXMLPropTristateBool(ctxt->node, "relabel", VIR_XML_PROP_NONE, &relabel) < 0)
return NULL; return NULL;
virTristateBoolToBool(relabel, &seclabel->relabel); virTristateBoolToBool(relabel, &seclabel->relabel);
@ -8085,7 +8085,7 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLabelDef ***seclabels_rtn,
seclabels[i]->model = g_steal_pointer(&model); seclabels[i]->model = g_steal_pointer(&model);
} }
if (virXMLPropTristateBool(list[i], "relabel", VIR_XML_PROP_NONZERO, &t) < 0) if (virXMLPropTristateBool(list[i], "relabel", VIR_XML_PROP_NONE, &t) < 0)
goto error; goto error;
seclabels[i]->relabel = true; seclabels[i]->relabel = true;
@ -8094,7 +8094,7 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLabelDef ***seclabels_rtn,
/* labelskip is only parsed on live images */ /* labelskip is only parsed on live images */
seclabels[i]->labelskip = false; seclabels[i]->labelskip = false;
if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)) { if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)) {
if (virXMLPropTristateBool(list[i], "labelskip", VIR_XML_PROP_NONZERO, &t) < 0) if (virXMLPropTristateBool(list[i], "labelskip", VIR_XML_PROP_NONE, &t) < 0)
goto error; goto error;
virTristateBoolToBool(t, &seclabels[i]->labelskip); virTristateBoolToBool(t, &seclabels[i]->labelskip);

2
src/conf/interface_conf.c
View File

@ -233,7 +233,7 @@ virInterfaceDefParseDhcp(virInterfaceProtocolDef *def,
def->dhcp = 1; def->dhcp = 1;
def->peerdns = -1; def->peerdns = -1;
if (virXMLPropTristateBool(dhcp, "peerdns", VIR_XML_PROP_NONZERO, &peerdns) < 0) if (virXMLPropTristateBool(dhcp, "peerdns", VIR_XML_PROP_NONE, &peerdns) < 0)
return -1; return -1;
if (peerdns != VIR_TRISTATE_BOOL_ABSENT) { if (peerdns != VIR_TRISTATE_BOOL_ABSENT) {