[libvirt PATCH 05/10] virDomainIOThreadPinDefParseXML: Use virXMLProp*

Tim Wiederhake twiederh at redhat.com
Tue May 4 14:02:30 UTC 2021


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

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e95be17989..d7cef00246 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -17319,24 +17319,10 @@ virDomainIOThreadPinDefParseXML(xmlNodePtr node,
     g_autofree char *tmp = NULL;
     g_autoptr(virBitmap) cpumask = NULL;
 
-    if (!(tmp = virXMLPropString(node, "iothread"))) {
-        virReportError(VIR_ERR_XML_ERROR, "%s",
-                       _("missing iothread id in iothreadpin"));
-        return -1;
-    }
-
-    if (virStrToLong_uip(tmp, NULL, 10, &iothreadid) < 0) {
-        virReportError(VIR_ERR_XML_ERROR,
-                       _("invalid setting for iothread '%s'"), tmp);
-        return -1;
-    }
-    VIR_FREE(tmp);
-
-    if (iothreadid == 0) {
-        virReportError(VIR_ERR_XML_ERROR, "%s",
-                       _("zero is an invalid iothread id value"));
+    if (virXMLPropUInt(node, "iothread", 10,
+                       VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO,
+                       &iothreadid) < 0)
         return -1;
-    }
 
     if (!(iothrid = virDomainIOThreadIDFind(def, iothreadid))) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-- 
2.26.3




More information about the libvir-list mailing list