virxml: Add virXMLPropUInt

Convenience function to return the value of an unsigned integer XML attribute.

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 11e7b0c741c54924b6ae65a7b575fde93022b356..9c94edb5233a3161a4a0ee33e36a2b506e6350c3 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -3553,6 +3553,7 @@ virXMLPropString;
 virXMLPropStringLimit;
 virXMLPropTristateBool;
 virXMLPropTristateSwitch;
+virXMLPropUInt;
 virXMLSaveFile;
 virXMLValidateAgainstSchema;
 virXMLValidatorFree;

diff --git a/src/util/virxml.c b/src/util/virxml.c
index babfb3fa54395ef1ca66c76a3cb9b31d347c7cc6..9d89dd85c71f90de52c06879435c77772e0c3105 100644 (file)
--- a/src/util/virxml.c
+++ b/src/util/virxml.c
@@ -699,6 +699,66 @@ virXMLPropInt(xmlNodePtr node,
 }
 
 
+/**
+ * virXMLPropUInt:
+ * @node: XML dom node pointer
+ * @name: Name of the property (attribute) to get
+ * @base: Number base, see strtol
+ * @flags: Bitwise or of virXMLPropFlags
+ * @result: The returned value
+ *
+ * Convenience function to return value of an unsigned integer attribute.
+ *
+ * Returns 1 in case of success in which case @result is set,
+ *         or 0 if the attribute is not present,
+ *         or -1 and reports an error on failure.
+ */
+int
+virXMLPropUInt(xmlNodePtr node,
+               const char* name,
+               int base,
+               virXMLPropFlags flags,
+               unsigned int *result)
+{
+    g_autofree char *tmp = NULL;
+    int ret;
+    unsigned int val;
+
+    if (!(tmp = virXMLPropString(node, name))) {
+        if (!(flags & VIR_XML_PROP_REQUIRED))
+            return 0;
+
+        virReportError(VIR_ERR_XML_ERROR,
+                       _("Missing required attribute '%s' in element '%s'"),
+                       name, node->name);
+        return -1;
+    }
+
+    if (flags & VIR_XML_PROP_WRAPNEGATIVE) {
+        ret = virStrToLong_ui(tmp, NULL, base, &val);
+    } else {
+        ret = virStrToLong_uip(tmp, NULL, base, &val);
+    }
+
+    if (ret < 0) {
+        virReportError(VIR_ERR_XML_ERROR,
+                       _("Invalid value for attribute '%s' in element '%s': '%s'. Expected integer value"),
+                       name, node->name, tmp);
+        return -1;
+    }
+
+    if ((flags & VIR_XML_PROP_NONZERO) && (val == 0)) {
+        virReportError(VIR_ERR_XML_ERROR,
+                       _("Invalid value for attribute '%s' in element '%s': Zero is not permitted"),
+                       name, node->name);
+        return -1;
+    }
+
+    *result = val;
+    return 1;
+}
+
+
 /**
  * virXPathBoolean:
  * @xpath: the XPath string to evaluate

diff --git a/src/util/virxml.h b/src/util/virxml.h
index 428b6936b5146f1dbffe22b17da230657f73eeba..5eaf9db3a89003d8ae1a6e996a22ed0d2b517bf9 100644 (file)
--- a/src/util/virxml.h
+++ b/src/util/virxml.h
@@ -38,6 +38,7 @@ 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;
 
 
@@ -126,6 +127,14 @@ virXMLPropInt(xmlNodePtr node,
               int *result)
     ATTRIBUTE_NONNULL(0) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4);
 
+int
+virXMLPropUInt(xmlNodePtr node,
+               const char* name,
+               int base,
+               virXMLPropFlags flags,
+               unsigned int *result)
+    ATTRIBUTE_NONNULL(0) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4);
+
 /* Internal function; prefer the macros below.  */
 xmlDocPtr
 virXMLParseHelper(int domcode,