External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 14:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf/domain_conf: use virStringParseYesNo helper

Browse Source 
This helper performs a conversion from a "yes|no" string
to a corresponding boolean, and several conversions were
already done, but there are still some omissions.

For most of the remaining usages in domain_conf.c only
"yes" is explicitly checked for. This means all other
values are implicitly handled as 'false'. In this case,
use virStringParseYesNo to handle the conversion and
reserve the original logic of not raise an error, so
ignore the return value of helper.

Reviewed-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com>
This commit is contained in:
Mao Zhongyi 2019-10-17 11:19:31 +08:00 committed by Cole Robinson
parent a8ee07e0d1
commit 7ae802ebb3
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/conf/domain_conf.c
View File

@ -7589,10 +7589,8 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
}
}
if ((autoAddress = virXMLPropString(node, "autoAddress"))) {
if (STREQ(autoAddress, "yes"))
usbsrc->autoAddress = true;
}
if ((autoAddress = virXMLPropString(node, "autoAddress")))
ignore_value(virStringParseYesNo(autoAddress, &usbsrc->autoAddress));
/* Product can validly be 0, so we need some extra help to determine
* if it is uninitialized*/
@ -8143,10 +8141,8 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
* element that might be (pure hostdev, or higher level device
* (e.g. <interface>) with type='hostdev')
*/
if ((managed = virXMLPropString(node, "managed")) != NULL) {
if (STREQ(managed, "yes"))
def->managed = true;
}
if ((managed = virXMLPropString(node, "managed")) != NULL)
ignore_value(virStringParseYesNo(managed, &def->managed));
sgio = virXMLPropString(node, "sgio");
rawio = virXMLPropString(node, "rawio");
@ -13714,9 +13710,7 @@ virDomainGraphicsListenDefParseXML(virDomainGraphicsListenDefPtr def,
if (autoGenerated &&
flags & VIR_DOMAIN_DEF_PARSE_STATUS) {
if (STREQ(autoGenerated, "yes")) {
def->autoGenerated = true;
} else if (STRNEQ(autoGenerated, "no")) {
if (virStringParseYesNo(autoGenerated, &def->autoGenerated) < 0) {
virReportError(VIR_ERR_XML_ERROR,
_("Invalid autoGenerated value: %s"),
autoGenerated);
@ -13846,13 +13840,10 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDefPtr def,
}
if (autoport) {
if (STREQ(autoport, "yes")) {
if (flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)
def->data.vnc.port = 0;
def->data.vnc.autoport = true;
} else {
def->data.vnc.autoport = false;
}
ignore_value(virStringParseYesNo(autoport, &def->data.vnc.autoport));
if (def->data.vnc.autoport && flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)
def->data.vnc.port = 0;
}
if (websocket) {
@ -13865,8 +13856,9 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDefPtr def,
}
}
if (websocketGenerated && STREQ(websocketGenerated, "yes"))
def->data.vnc.websocketGenerated = true;
if (websocketGenerated)
ignore_value(virStringParseYesNo(websocketGenerated,
&def->data.vnc.websocketGenerated));
if (sharePolicy) {
int policy =
@ -15420,8 +15412,7 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr xmlopt,
heads = virXMLPropString(cur, "heads");
if ((primary = virXMLPropString(cur, "primary")) != NULL) {
if (STREQ(primary, "yes"))
def->primary = true;
ignore_value(virStringParseYesNo(primary, &def->primary));
VIR_FREE(primary);
}