[libvirt PATCH 07/10] virNodeDevCapsDefParseXML: Use virXMLProp*

Tim Wiederhake twiederh at redhat.com
Mon May 10 12:48:38 UTC 2021


Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
---
 src/conf/node_device_conf.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

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:
-- 
2.26.3




More information about the libvir-list mailing list