[libvirt PATCH v6 7/8] virDomainIOThreadIDDefParseXML: Use virXMLProp*

Tim Wiederhake twiederh at redhat.com
Fri Apr 16 09:41:51 UTC 2021


Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
Reviewed-by: Peter Krempa <pkrempa at redhat.com>
---
 src/conf/domain_conf.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index a0fb7731d9..858ef5db9d 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -18229,21 +18229,13 @@ static virDomainIOThreadIDDef *
 virDomainIOThreadIDDefParseXML(xmlNodePtr node)
 {
     virDomainIOThreadIDDef *iothrid;
-    g_autofree char *tmp = NULL;
 
     iothrid = g_new0(virDomainIOThreadIDDef, 1);
 
-    if (!(tmp = virXMLPropString(node, "id"))) {
-        virReportError(VIR_ERR_XML_ERROR, "%s",
-                       _("Missing 'id' attribute in <iothread> element"));
-        goto error;
-    }
-    if (virStrToLong_uip(tmp, NULL, 10, &iothrid->iothread_id) < 0 ||
-        iothrid->iothread_id == 0) {
-        virReportError(VIR_ERR_XML_ERROR,
-                       _("invalid iothread 'id' value '%s'"), tmp);
+    if (virXMLPropUInt(node, "id", 10,
+                       VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO,
+                       &iothrid->iothread_id) < 0)
         goto error;
-    }
 
     return iothrid;
 
-- 
2.26.2




More information about the libvir-list mailing list