From 124357c17add4ea3ee6c1d25706f44ccad8e3419 Mon Sep 17 00:00:00 2001 From: Tim Wiederhake Date: Tue, 4 May 2021 16:02:30 +0200 Subject: [PATCH] virDomainIOThreadPinDefParseXML: Use virXMLProp* Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- 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 f729de7e76..a534aa77ad 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17135,24 +17135,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")); + if (virXMLPropUInt(node, "iothread", 10, + VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO, + &iothreadid) < 0) 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")); - return -1; - } if (!(iothrid = virDomainIOThreadIDFind(def, iothreadid))) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED,