[libvirt PATCH v6 4/8] virxml: Add virXMLPropUInt
Convenience function to return the value of an unsigned integer XML attribute.
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
Reviewed-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/libvirt_private.syms | 1 +
src/util/virxml.c | 60 ++++++++++++++++++++++++++++++++++++++++
src/util/virxml.h | 8 ++++++
3 files changed, 69 insertions(+)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 11e7b0c741..9c94edb523 100644
--- 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 6da4a2b1f6..662a700262 100644
--- 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 10c2404f5f..aed4715123 100644
--- a/src/util/virxml.h
+++ b/src/util/virxml.h
@@ -37,6 +37,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;
int virXPathBoolean(const char *xpath,
@@ -104,6 +105,13 @@ int 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,
const char *filename,
--
2.26.2