From nobody Mon Feb 9 16:13:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) client-ip=216.205.24.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585120408; cv=none; d=zohomail.com; s=zohoarc; b=UnjYg9HN1ua7I6QcbJWX0oCkMagmaFMtfSl07dz/NXL35l1S3lA35KnzYsmjNHywVvnl9nrxOuGgG5HPio47QnoGmFTv8NNw2mdUs0Ei1DEdeNoe1WROt7FXqdweVGCE2+5BqA+1kOjt7/kI0hPM8myz0EWvgeNIikHu5dijCtw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585120408; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=iO0k4tX9OAKhHo7HZvYpF+UUnq2FzEo5rkKZridqxdU=; b=X5I/GA4Ybn2mSf5Q41/rgEfgdi+4GiRvDliWtHSZkT3qHlzIMDtnMAJ212DkKeT01dTIJBxDO/RakRDhUYLjWkp54NHGlmYrEgpTlqZO2v63sFlAd6Ty3a2R4DvtWrWEqvT1pcHoIKWMP/Z3KKqPFWk7VzH2OhfYXbQuJPynsMY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [216.205.24.74]) by mx.zohomail.com with SMTPS id 1585120408930144.92894819033359; Wed, 25 Mar 2020 00:13:28 -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-181-0VlfZ9uAMDKhAniZMLcfRA-1; Wed, 25 Mar 2020 03:13:23 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 99568801A01; Wed, 25 Mar 2020 07:13:16 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5E34610002A7; Wed, 25 Mar 2020 07:13:16 +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 03FDB87010; Wed, 25 Mar 2020 07:13:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02P7CUR6023905 for ; Wed, 25 Mar 2020 03:12:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5B9C910F1C0A; Wed, 25 Mar 2020 07:12:30 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 541E610F1CD4 for ; Wed, 25 Mar 2020 07:12:29 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 009B88F7834 for ; Wed, 25 Mar 2020 07:12:29 +0000 (UTC) Received: from mail-m24147.qiye.163.com (mail-m24147.qiye.163.com [220.194.24.147]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-62-_711TvVTM9CO4TuJi3bt7Q-1; Wed, 25 Mar 2020 03:12:25 -0400 Received: from localhost.localdomain (unknown [123.232.151.103]) by smtp4 (Coremail) with SMTP id JedpCgD3ftNNBHtey+koAw--.408S22; Wed, 25 Mar 2020 15:12:22 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585120405; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=iO0k4tX9OAKhHo7HZvYpF+UUnq2FzEo5rkKZridqxdU=; b=JozwnK51K/YLgXZM8KsYM6T1Xmm2/dwCLK4ZIDC7eakWhLlpeLx85HQhjbLjVYQZMWA9Et Ww+KjO+tQWHWl3qFTxAsMnTDd1nJoz14rjEDBLSLq4+/s1SZTW3ztTV/wfdM0VfFDhp/Oc uMJ8HZWRUQn4IBTYwSx/L46p6Cb46j4= X-MC-Unique: 0VlfZ9uAMDKhAniZMLcfRA-1 X-MC-Unique: _711TvVTM9CO4TuJi3bt7Q-1 From: Shi Lei To: libvir-list@redhat.com Subject: [RFC 20/29] conf: Replace virNetworkDNSTxtDefParseXML(hardcoded) with namesake(generated) Date: Wed, 25 Mar 2020 15:12:00 +0800 Message-Id: <20200325071209.20841-21-shi_lei@massclouds.com> In-Reply-To: <20200325071209.20841-1-shi_lei@massclouds.com> References: <20200325071209.20841-1-shi_lei@massclouds.com> X-CM-TRANSID: JedpCgD3ftNNBHtey+koAw--.408S22 X-Coremail-Antispam: 1Uf129KBjvJXoWxCFW8CFy3GrWfZF4fJw15twb_yoW5GFWxpF s5tFnFyw4rWFnxKrW7trn5Cwn8u3W8Jw4Ykryfuwn7AryfuryxJr4fXr1xu398GryFyr43 AFyaqrZ8Gr4UAF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zipnQUUUUUU= X-Originating-IP: [123.232.151.103] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbiiBbxT1tVgrMYdQAAsy X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 02P7CUR6023905 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.84 on 10.5.11.22 X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Shi Lei --- docs/schemas/network.rng | 1 + src/conf/network_conf.c | 37 +++++-------------------------------- 2 files changed, 6 insertions(+), 32 deletions(-) diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index b0f4a64..07fbd5b 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -294,6 +294,7 @@ "structure": {"output": "src/conf/network_conf"}, "clearfunc": {"output": "src/conf/network_conf"}, "parsefunc": { + "output": "src/conf/network_conf", "post": true, "args.noctxt": true, "args.instname": true, diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index f83799f..5180508 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -488,7 +488,7 @@ virSocketAddrRangeParseXML(const char *networkName, } =20 =20 -static int +int virNetworkDNSTxtDefParseXMLPost(xmlNodePtr curnode G_GNUC_UNUSED, virNetworkDNSTxtDefPtr def, const char *networkName, @@ -746,34 +746,6 @@ virNetworkDNSHostDefParseXMLPost(xmlNodePtr curnode G_= GNUC_UNUSED, } =20 =20 -static int -virNetworkDNSTxtDefParseXML(const char *networkName, - xmlNodePtr node, - virNetworkDNSTxtDefPtr def, - bool partialOkay) -{ - if (!(def->name =3D virXMLPropString(node, "name"))) { - virReportError(VIR_ERR_XML_DETAIL, - _("missing required name attribute in DNS TXT recor= d " - "of network %s"), networkName); - goto error; - } - - def->value =3D virXMLPropString(node, "value"); - - if (virNetworkDNSTxtDefParseXMLPost(node, def, - networkName, partialOkay, - def->name, def->value) < 0) - goto error; - - return 0; - - error: - virNetworkDNSTxtDefClear(def); - return -1; -} - - static int virNetworkDNSDefParseXML(const char *networkName, xmlNodePtr node, @@ -907,8 +879,9 @@ virNetworkDNSDefParseXML(const char *networkName, goto cleanup; =20 for (i =3D 0; i < ntxts; i++) { - if (virNetworkDNSTxtDefParseXML(networkName, txtNodes[i], - &def->txts[def->ntxts], false)= < 0) { + if (virNetworkDNSTxtDefParseXML(txtNodes[i], + &def->txts[def->ntxts], + networkName, false) < 0) { goto cleanup; } def->ntxts++; @@ -3513,7 +3486,7 @@ virNetworkDefUpdateDNSTxt(virNetworkDefPtr def, if (virNetworkDefUpdateCheckElementName(def, ctxt->node, "txt") < 0) goto cleanup; =20 - if (virNetworkDNSTxtDefParseXML(def->name, ctxt->node, &txt, !isAdd) <= 0) + if (virNetworkDNSTxtDefParseXML(ctxt->node, &txt, def->name, !isAdd) <= 0) goto cleanup; =20 for (foundIdx =3D 0; foundIdx < dns->ntxts; foundIdx++) { --=20 2.17.1