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.
Signed-off-by: Mao Zhongyi <maozhon...@cmss.chinamobile.com>
Signed-off-by: Zhang Shengju <zhangshen...@cmss.chinamobile.com>
---
src/conf/domain_conf.c | 35 +++++++++++++----------------------
1 file changed, 13 insertions(+), 22 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 10d6bf0eea..370e2840eb 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -7600,10 +7600,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*/
@@ -8167,10 +8165,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");
@@ -13807,9 +13803,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);
@@ -13939,13 +13933,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) {
@@ -13958,8 +13949,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 =
@@ -15479,8 +15471,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);
}
--
2.17.1
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
