From nobody Sun Feb 8 18:43:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1618497020; cv=none; d=zohomail.com; s=zohoarc; b=RB5QBdJ3RNOGy+G8DF3NbUqw6DF+tWc/9cphp5/VBtwFmHrkgZF24ZF1LibxQWXI2EZk0VntmaDLmfwsjT6tg5C8s3I3i1BAJ5FBTI9BQ/A1pKk2oFqvigHYEn3fJp9VrSnNW7KziA4bU15Gyumai3Na24ersILpi8lvQk4MQaA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618497020; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=I28gQgdnX5Wa8hH7ezRwmXN5d9emGDPP7QSuuzKRA+g=; b=TaVnVOnf1disXmDuoIPUsh9V6sQQ6oBtXUsgqCek2W0zhyNOIGjAB9A0cGC8xEKbqGYIDTqzyo6R8pUDj/mB7u2oQ7pD0NULsfJYsIsEDdQoVcMT9XYFZLpOmovngS/JLxOk0lxXjzBM2Rq2jFofUsVv8TOQ0/x6bokuXQp4TtQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1618497020389175.3641766447222; Thu, 15 Apr 2021 07:30:20 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-582-uZmLy3IEMQm7y2xaFYgldQ-1; Thu, 15 Apr 2021 10:28:54 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 055F59F931; Thu, 15 Apr 2021 14:27:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D143C607CB; Thu, 15 Apr 2021 14:27:52 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9BF77180B617; Thu, 15 Apr 2021 14:27:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13FERm1c024380 for ; Thu, 15 Apr 2021 10:27:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id AE0E553CC3; Thu, 15 Apr 2021 14:27:48 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.196.1]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DDED60917 for ; Thu, 15 Apr 2021 14:27:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618497018; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=I28gQgdnX5Wa8hH7ezRwmXN5d9emGDPP7QSuuzKRA+g=; b=Brl9wAFnDR2HYetJtNWETo/jUOfIqBsgWrxKgJsaVIAoW8slaVsbPsHyotf35/XqOhN8Yz U3Mtgl1guyTr6wQZDLAY3JK7R8fW2Eudc4OX2IKLhWORjaNysWDYAQd1DKLzMq3fAIWTJb 3I+qn/LmU0V1RZ7FNn22gFEOSp8r2IM= X-MC-Unique: uZmLy3IEMQm7y2xaFYgldQ-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH 15/21] Refactoring virDomainChrSourceDefParseXML() to use XPath Date: Thu, 15 Apr 2021 16:26:30 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Kristina Hanicova --- src/conf/domain_conf.c | 190 ++++++++++++++++++++--------------------- 1 file changed, 94 insertions(+), 96 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ca9d54a47a..0748c93567 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11929,112 +11929,112 @@ virDomainChrSourceDefParseXML(virDomainChrSourc= eDef *def, virDomainChrDef *chr_def, xmlXPathContextPtr ctxt) { - bool logParsed =3D false; - bool protocolParsed =3D false; - int sourceParsed =3D 0; + xmlNodePtr log =3D NULL; + xmlNodePtr protocol =3D NULL; + g_autofree xmlNodePtr *source =3D NULL; + int n =3D 0; + VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 - for (; cur; cur =3D cur->next) { - if (cur->type !=3D XML_ELEMENT_NODE) - continue; + ctxt->node =3D cur; =20 - if (virXMLNodeNameEqual(cur, "source")) { - /* Parse only the first source element since only one is used - * for chardev devices, the only exception is UDP type, where - * user can specify two source elements. */ - if (sourceParsed >=3D 1 && def->type !=3D VIR_DOMAIN_CHR_TYPE_= UDP) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("only one source element is allowed for " - "character device")); - goto error; - } else if (sourceParsed >=3D 2) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("only two source elements are allowed for= " - "character device")); - goto error; - } - sourceParsed++; + if ((n =3D virXPathNodeSet("./source", ctxt, &source)) > 0) { + /* Parse only the first source element since only one is used + * for chardev devices, the only exception is UDP type, where + * user can specify two source elements. */ + if (n > 1 && def->type !=3D VIR_DOMAIN_CHR_TYPE_UDP) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("only one source element is allowed for " + "character device")); + goto error; + } else if (n > 2) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("only two source elements are allowed for " + "character device")); + goto error; + } =20 - switch ((virDomainChrType) def->type) { - case VIR_DOMAIN_CHR_TYPE_FILE: - if (virDomainChrSourceDefParseFile(def, cur) < 0) - goto error; - break; + switch ((virDomainChrType) def->type) { + case VIR_DOMAIN_CHR_TYPE_FILE: + if (virDomainChrSourceDefParseFile(def, source[0]) < 0) + goto error; + break; =20 - case VIR_DOMAIN_CHR_TYPE_PTY: - /* PTY path is only parsed from live xml. */ - if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)) - def->data.file.path =3D virXMLPropString(cur, "path"); - break; + case VIR_DOMAIN_CHR_TYPE_PTY: + /* PTY path is only parsed from live xml. */ + if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE)) + def->data.file.path =3D virXPathString("string(./source/@p= ath)", ctxt); + break; =20 - case VIR_DOMAIN_CHR_TYPE_DEV: - case VIR_DOMAIN_CHR_TYPE_PIPE: - def->data.file.path =3D virXMLPropString(cur, "path"); - break; + case VIR_DOMAIN_CHR_TYPE_DEV: + case VIR_DOMAIN_CHR_TYPE_PIPE: + def->data.file.path =3D virXPathString("string(./source/@path)= ", ctxt); + break; =20 - case VIR_DOMAIN_CHR_TYPE_UNIX: - if (virDomainChrSourceDefParseUnix(def, cur, ctxt) < 0) - goto error; - break; + case VIR_DOMAIN_CHR_TYPE_UNIX: + if (virDomainChrSourceDefParseUnix(def, source[0], ctxt) < 0) + goto error; + break; =20 - case VIR_DOMAIN_CHR_TYPE_UDP: - if (virDomainChrSourceDefParseUDP(def, cur) < 0) + case VIR_DOMAIN_CHR_TYPE_UDP: + if ((virDomainChrSourceDefParseUDP(def, source[0]) < 0) || + (source[1] && virDomainChrSourceDefParseUDP(def, source[1]= ) < 0)) goto error; - break; + break; =20 - case VIR_DOMAIN_CHR_TYPE_TCP: - if (virDomainChrSourceDefParseTCP(def, cur, ctxt, flags) <= 0) - goto error; - break; + case VIR_DOMAIN_CHR_TYPE_TCP: + if (virDomainChrSourceDefParseTCP(def, source[0], ctxt, flags)= < 0) + goto error; + break; =20 - case VIR_DOMAIN_CHR_TYPE_SPICEPORT: - def->data.spiceport.channel =3D virXMLPropString(cur, "cha= nnel"); - break; + case VIR_DOMAIN_CHR_TYPE_SPICEPORT: + def->data.spiceport.channel =3D virXPathString("string(./sourc= e/@channel)", ctxt); + break; =20 - case VIR_DOMAIN_CHR_TYPE_NMDM: - def->data.nmdm.master =3D virXMLPropString(cur, "master"); - def->data.nmdm.slave =3D virXMLPropString(cur, "slave"); - break; + case VIR_DOMAIN_CHR_TYPE_NMDM: + def->data.nmdm.master =3D virXPathString("string(./source/@mas= ter)", ctxt); + def->data.nmdm.slave =3D virXPathString("string(./source/@slav= e)", ctxt); + break; =20 - case VIR_DOMAIN_CHR_TYPE_LAST: - case VIR_DOMAIN_CHR_TYPE_NULL: - case VIR_DOMAIN_CHR_TYPE_VC: - case VIR_DOMAIN_CHR_TYPE_STDIO: - case VIR_DOMAIN_CHR_TYPE_SPICEVMC: - break; - } + case VIR_DOMAIN_CHR_TYPE_LAST: + case VIR_DOMAIN_CHR_TYPE_NULL: + case VIR_DOMAIN_CHR_TYPE_VC: + case VIR_DOMAIN_CHR_TYPE_STDIO: + case VIR_DOMAIN_CHR_TYPE_SPICEVMC: + break; + } =20 - /* Check for an optional seclabel override in . */ - if (chr_def) { - VIR_XPATH_NODE_AUTORESTORE(ctxt) - ctxt->node =3D cur; - if (virSecurityDeviceLabelDefParseXML(&def->seclabels, - &def->nseclabels, - ctxt, - flags) < 0) { - goto error; - } - } - } else if (virXMLNodeNameEqual(cur, "log")) { - if (logParsed) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("only one protocol element is allowed for= " - "character device")); - goto error; - } - logParsed =3D true; - if (virDomainChrSourceDefParseLog(def, cur) < 0) - goto error; - } else if (virXMLNodeNameEqual(cur, "protocol")) { - if (protocolParsed) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("only one log element is allowed for " - "character device")); + /* Check for an optional seclabel override in . */ + if (chr_def) { + xmlNodePtr tmp =3D ctxt->node; + ctxt->node =3D source[0]; + if (virSecurityDeviceLabelDefParseXML(&def->seclabels, &def->n= seclabels, + ctxt, flags) < 0) { goto error; } - protocolParsed =3D true; - if (virDomainChrSourceDefParseProtocol(def, cur) < 0) - goto error; + ctxt->node =3D tmp; + } + } + + if ((log =3D virXPathNode("./log", ctxt))) { + if (virXPathBoolean("boolean(count(./log) > 1)", ctxt)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("only one log element is allowed for " + "character device")); + goto error; + } + if (virDomainChrSourceDefParseLog(def, log) < 0) + goto error; + } + + if ((protocol =3D virXPathNode("./protocol", ctxt))) { + if (virXPathBoolean("boolean(count(./protocol) > 1)", ctxt)) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("only one protocol element is allowed for " + "character device")); + goto error; } + if (virDomainChrSourceDefParseProtocol(def, protocol) < 0) + goto error; } =20 return 0; @@ -12188,7 +12188,7 @@ virDomainChrDefParseXML(virDomainXMLOption *xmlopt, ((def->targetType =3D virDomainChrDefaultTargetType(def->deviceTyp= e)) < 0)) goto error; =20 - if (virDomainChrSourceDefParseXML(def->source, node->children, flags, = def, + if (virDomainChrSourceDefParseXML(def->source, node, flags, def, ctxt) < 0) goto error; =20 @@ -12312,7 +12312,7 @@ virDomainSmartcardDefParseXML(virDomainXMLOption *x= mlopt, } =20 cur =3D node->children; - if (virDomainChrSourceDefParseXML(def->data.passthru, cur, flags, + if (virDomainChrSourceDefParseXML(def->data.passthru, node, flags, NULL, ctxt) < 0) return NULL; =20 @@ -14375,7 +14375,7 @@ virDomainRNGDefParseXML(virDomainXMLOption *xmlopt, } =20 if (virDomainChrSourceDefParseXML(def->source.chardev, - backends[0]->children, flags, + backends[0], flags, NULL, ctxt) < 0) goto error; break; @@ -15393,7 +15393,6 @@ virDomainRedirdevDefParseXML(virDomainXMLOption *xm= lopt, xmlXPathContextPtr ctxt, unsigned int flags) { - xmlNodePtr cur; virDomainRedirdevDef *def; g_autofree char *bus =3D NULL; g_autofree char *type =3D NULL; @@ -15427,10 +15426,9 @@ virDomainRedirdevDefParseXML(virDomainXMLOption *x= mlopt, goto error; } =20 - cur =3D node->children; /* boot gets parsed in virDomainDeviceInfoParseXML * source gets parsed in virDomainChrSourceDefParseXML */ - if (virDomainChrSourceDefParseXML(def->source, cur, flags, + if (virDomainChrSourceDefParseXML(def->source, node, flags, NULL, ctxt) < 0) goto error; =20 --=20 2.30.2