From nobody Mon Feb 9 07:05:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1591752417; cv=none; d=zohomail.com; s=zohoarc; b=hGl30AYmZMKlb6BITeP0dhpdOBVVmTn/jRjpIJ4GlZXxoDI34Hk954a5iMtZ7VZkf/hWr5lSpNlrBTsxBxEjk7TEtc3vTFZVrXQha1+2ul1uAPsvrp0bIuJeKNal37UHQgXLC0PToqp5jL+yT3+UHtbS69Gwotx6LuQgu0SkqsY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591752417; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Y1lzl3H6091Op8TE8WkatRNf4q1fJnv2vRiXImKhi7Y=; b=a1ULZ4mvcU/R53OTVY/WBys8g0qmZgRYMhyEMp+z8n6JkPWE0NFQpxVZ01sI3ot5ZNxEnSwh458A/jRqzWeGOp/ay3ycNX/rga4vzEknsV9Ufhz6SqzNSe4oSqgUVjS/BGnB0AdLVfjHZBdb1oDVQCLmIaFaq2Xsv7T0p+Lr/+s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1591752417326954.3990740398355; Tue, 9 Jun 2020 18:26:57 -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-183-j2M1sz_ANjWBEHdyAtjWdg-1; Tue, 09 Jun 2020 21:26:53 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 77B2B107ACF3; Wed, 10 Jun 2020 01:26:48 +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 5BD4B78FC5; Wed, 10 Jun 2020 01:26:48 +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 275341809557; Wed, 10 Jun 2020 01:26:48 +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 05A1QhMG027262 for ; Tue, 9 Jun 2020 21:26:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id EB1B810E60F6; Wed, 10 Jun 2020 01:26:42 +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 E620210EE6E0 for ; Wed, 10 Jun 2020 01:26:42 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.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 58336856FFF for ; Wed, 10 Jun 2020 01:26:42 +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-242-06UeyVr3OoerCDMkBWZz5Q-1; Tue, 09 Jun 2020 21:26:39 -0400 Received: from localhost.localdomain (unknown [58.56.27.130]) by smtp4 (Coremail) with SMTP id JedpCgCnxdh_NeBeVKS4Bw--.7295S9; Wed, 10 Jun 2020 09:21:26 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591752416; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:content-type:content-type: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Y1lzl3H6091Op8TE8WkatRNf4q1fJnv2vRiXImKhi7Y=; b=bJY5YDDo9cyaQCD6UcB5xyN5eZYxGbt712BSS9+XHuD7VSmroQH4z2LhT2TSSzzNN99ApC 8nSnS0tSllYt/u4cn9Tytx1lphf74MOYUYG7BaFJ8dsc1/HYtqsB5seDpvnuBz9yhoQa6p VjOMPh2jlfgFEzvrUf0VIWQZsRcmbx4= X-MC-Unique: j2M1sz_ANjWBEHdyAtjWdg-1 X-MC-Unique: 06UeyVr3OoerCDMkBWZz5Q-1 From: Shi Lei To: libvir-list@redhat.com Subject: [RFC 07/21] conf: Replace virNetworkDNSTxtDefParseXML(hardcoded) with namesake(generated) Date: Wed, 10 Jun 2020 09:20:35 +0800 Message-Id: <20200610012049.10774-8-shi_lei@massclouds.com> In-Reply-To: <20200610012049.10774-1-shi_lei@massclouds.com> References: <20200610012049.10774-1-shi_lei@massclouds.com> X-CM-TRANSID: JedpCgCnxdh_NeBeVKS4Bw--.7295S9 X-Coremail-Antispam: 1Uf129KBjvJXoWxCFWrKryUtryfJFyftF45trb_yoWrurWfpa n8tF1qyw48WF1fKFW7Ar95CrnrCw1kXw4Ykryfu347Aw4rZryxGr1fKr1xXr45GryFyF43 CF1aqr98Gr4UAFUanT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0p_6wCtUUUUU= X-Originating-IP: [58.56.27.130] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbiHxc-T1uyHIthsgAAsV X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 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.15 X-Mimecast-Spam-Score: 2 X-Mimecast-Originator: redhat.com X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Shi Lei --- po/POTFILES.in | 1 + src/conf/Makefile.inc.am | 2 ++ src/conf/network_conf.c | 47 ++++++---------------------------------- src/conf/network_conf.h | 8 ++++--- 4 files changed, 15 insertions(+), 43 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 2d7eb1e..a0bd358 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -3,6 +3,7 @@ @BUILDDIR@/src/access/viraccessapicheckqemu.c @BUILDDIR@/src/admin/admin_client.h @BUILDDIR@/src/admin/admin_server_dispatch_stubs.h +@BUILDDIR@/src/conf/network_conf.generated.c @BUILDDIR@/src/remote/remote_client_bodies.h @BUILDDIR@/src/remote/remote_daemon_dispatch_stubs.h @SRCDIR@/build-aux/generator/directive.py diff --git a/src/conf/Makefile.inc.am b/src/conf/Makefile.inc.am index 3bd2199..0b36a8b 100644 --- a/src/conf/Makefile.inc.am +++ b/src/conf/Makefile.inc.am @@ -161,6 +161,8 @@ DEVICE_CONF_SOURCES =3D \ $(NULL) =20 CONF_GENERATED_SOURCES =3D \ + conf/network_conf.generated.c \ + conf/network_conf.generated.h \ $(NULL) =20 CONF_SOURCES =3D \ diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 47aaef3..964a8a7 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -174,14 +174,6 @@ virNetworkIPDefClear(virNetworkIPDefPtr def) } =20 =20 -static void -virNetworkDNSTxtDefClear(virNetworkDNSTxtDefPtr def) -{ - VIR_FREE(def->name); - VIR_FREE(def->value); -} - - static void virNetworkDNSHostDefClear(virNetworkDNSHostDefPtr def) { @@ -903,7 +895,7 @@ virNetworkDNSSrvDefParseXML(const char *networkName, } =20 =20 -static int +int virNetworkDNSTxtDefParseXMLHook(xmlNodePtr node G_GNUC_UNUSED, virNetworkDNSTxtDefPtr def, const char *networkName, @@ -943,33 +935,6 @@ virNetworkDNSTxtDefParseXMLHook(xmlNodePtr node 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 (virNetworkDNSTxtDefParseXMLHook(node, def, networkName, - &partialOkay) < 0) - goto error; - - return 0; - - error: - virNetworkDNSTxtDefClear(def); - return -1; -} - - static int virNetworkDNSDefParseXML(const char *networkName, xmlNodePtr node, @@ -1100,10 +1065,10 @@ 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->n= txts], + networkName, NULL) < 0) goto cleanup; - } + def->ntxts++; } } @@ -3714,6 +3679,7 @@ virNetworkDefUpdateDNSTxt(virNetworkDefPtr def, virNetworkDNSTxtDef txt; bool isAdd =3D (command =3D=3D VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST || command =3D=3D VIR_NETWORK_UPDATE_COMMAND_ADD_LAST); + bool notAdd; =20 memset(&txt, 0, sizeof(txt)); =20 @@ -3727,7 +3693,8 @@ virNetworkDefUpdateDNSTxt(virNetworkDefPtr def, if (virNetworkDefUpdateCheckElementName(def, ctxt->node, "txt") < 0) goto cleanup; =20 - if (virNetworkDNSTxtDefParseXML(def->name, ctxt->node, &txt, !isAdd) <= 0) + notAdd =3D !isAdd; + if (virNetworkDNSTxtDefParseXML(ctxt->node, &txt, def->name, ¬Add) = < 0) goto cleanup; =20 for (foundIdx =3D 0; foundIdx < dns->ntxts; foundIdx++) { diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index f2dc388..eac8a76 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -130,9 +130,9 @@ struct _virNetworkDHCPHostDef { =20 typedef struct _virNetworkDNSTxtDef virNetworkDNSTxtDef; typedef virNetworkDNSTxtDef *virNetworkDNSTxtDefPtr; -struct _virNetworkDNSTxtDef { - char *name; - char *value; +struct _virNetworkDNSTxtDef { /* genparse:concisehook */ + char *name; /* xmlattr, required */ + char *value; /* xmlattr */ }; =20 typedef struct _virNetworkDNSSrvDef virNetworkDNSSrvDef; @@ -440,3 +440,5 @@ virNetworkDefUpdateSection(virNetworkDefPtr def, unsigned int flags); /* virNetworkUpdateFlags = */ =20 VIR_ENUM_DECL(virNetworkTaint); + +#include "network_conf.generated.h" --=20 2.17.1