[libvirt PATCH 10/10] virNodeDeviceDefParseXML: Use virXMLProp*
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
src/conf/node_device_conf.c | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 04014f75dc..4477a8d9d2 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -2089,24 +2089,13 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt,
for (i = 0, m = 0; i < n; i++) {
xmlNodePtr node = nodes[i];
- g_autofree char *tmp = virXMLPropString(node, "type");
- int val;
+ virNodeDevDevnodeType val;
- if (!tmp) {
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("missing devnode type"));
+ if (virXMLPropEnum(node, "type", virNodeDevDevnodeTypeFromString,
+ VIR_XML_PROP_REQUIRED, &val) < 0)
goto error;
- }
-
- val = virNodeDevDevnodeTypeFromString(tmp);
-
- if (val < 0) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
- _("unknown devnode type '%s'"), tmp);
- goto error;
- }
- switch ((virNodeDevDevnodeType)val) {
+ switch (val) {
case VIR_NODE_DEV_DEVNODE_DEV:
if (!(def->devnode = virXMLNodeContentString(node)))
goto error;
--
2.26.3