[PATCH 1/2] util: xml: Remove VIR_XML_PROP_WRAPNEGATIVE

Peter Krempa pkrempa at redhat.com
Wed Apr 21 06:59:37 UTC 2021


As I've pointed out in my review, the negative number wrapping for
unsigned variables is an anti-feature which should not be promoted in
any way.

Remove VIR_XML_PROP_WRAPNEGATIVE which would make it more accessible.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/util/virxml.c | 6 +-----
 src/util/virxml.h | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/util/virxml.c b/src/util/virxml.c
index d0d9494009..bfb4005e62 100644
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -734,11 +734,7 @@ virXMLPropUInt(xmlNodePtr node,
         return -1;
     }

-    if (flags & VIR_XML_PROP_WRAPNEGATIVE) {
-        ret = virStrToLong_ui(tmp, NULL, base, &val);
-    } else {
-        ret = virStrToLong_uip(tmp, NULL, base, &val);
-    }
+    ret = virStrToLong_uip(tmp, NULL, base, &val);

     if (ret < 0) {
         virReportError(VIR_ERR_XML_ERROR,
diff --git a/src/util/virxml.h b/src/util/virxml.h
index 2b40398eee..a8f088fb43 100644
--- a/src/util/virxml.h
+++ b/src/util/virxml.h
@@ -38,7 +38,6 @@ typedef enum {
     VIR_XML_PROP_OPTIONAL = 0, /* Attribute may be absent */
     VIR_XML_PROP_REQUIRED = 1 << 0, /* Attribute may not be absent */
     VIR_XML_PROP_NONZERO = 1 << 1, /* Attribute may not be zero */
-    VIR_XML_PROP_WRAPNEGATIVE = 1 << 2, /* Wrap around negative values */
 } virXMLPropFlags;


-- 
2.30.2




More information about the libvir-list mailing list