From: Tim Wiederhake <twiederh@redhat.com>
Date: Mon, 10 May 2021 12:48:38 +0000 (+0200)
Subject: virNodeDevCapsDefParseXML: Use virXMLProp*
X-Git-Tag: v7.4.0-rc1~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afedd6dde58c843be51bc340edeed6cad3dde079;p=thirdparty%2Flibvirt.git

virNodeDevCapsDefParseXML: Use virXMLProp*

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 34c8aa988e..b3d5bc1515 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -1972,24 +1972,13 @@ virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt,
                           const char *virt_type)
 {
     virNodeDevCapsDef *caps;
-    g_autofree char *tmp = NULL;
-    int val, ret = -1;
+    int ret = -1;
 
     caps = g_new0(virNodeDevCapsDef, 1);
 
-    tmp = virXMLPropString(node, "type");
-    if (!tmp) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       "%s", _("missing capability type"));
+    if (virXMLPropEnum(node, "type", virNodeDevCapTypeFromString,
+                       VIR_XML_PROP_REQUIRED, &caps->data.type) < 0)
         goto error;
-    }
-
-    if ((val = virNodeDevCapTypeFromString(tmp)) < 0) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("unknown capability type '%s'"), tmp);
-        goto error;
-    }
-    caps->data.type = val;
 
     switch (caps->data.type) {
     case VIR_NODE_DEV_CAP_SYSTEM: