From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 6 May 2021 13:08:44 +0000 (+0200)
Subject: virDomainDiskDefDriverParseXML: Fix usage of virXMLPropUInt
X-Git-Tag: v7.4.0-rc1~196
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84960ca118cd06622b1bc0caa6e87638d8fad49b;p=thirdparty%2Flibvirt.git

virDomainDiskDefDriverParseXML: Fix usage of virXMLPropUInt

VIR_XML_PROP_NONE has value of 0 so it's pointless to include it in an
binary-or expression.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index a2dd7d649f..baf5d31606 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -8923,9 +8923,7 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *def,
                        VIR_XML_PROP_NONZERO, &def->discard) < 0)
         return -1;
 
-    if (virXMLPropUInt(cur, "iothread", 10,
-                       VIR_XML_PROP_NONE | VIR_XML_PROP_NONZERO,
-                       &def->iothread) < 0)
+    if (virXMLPropUInt(cur, "iothread", 10, VIR_XML_PROP_NONZERO, &def->iothread) < 0)
         return -1;
 
     if ((tmp = virXMLPropString(cur, "type"))) {