From nobody Mon Feb 9 09:33:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) client-ip=63.128.21.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 63.128.21.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585120444; cv=none; d=zohomail.com; s=zohoarc; b=XocCyVDj63GDHppy6cPKV3aiauMtMZmWHXFRFoq21EzwmvK7pDVjFzuqwIsnS9mjiQNSUVL2jZycCLlkzern5MFMhBxjCTGv4dzE8zCBrviDKgZaCXo/PQtb0trkTgYjPgZKBwkVUyBizo9ETrl9xPNTcP4rzv1Ye+DwAISC/Vs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585120444; 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=9B03+nrWCdJkBfeqVCl07qkWu4UxkZDUYa8nITsMWmw=; b=cNTdWaCMkptcwcw1SlM1NIMq+dc7uXz+/7XxDrkfjvFmestwwF0mRSdkXf1gt5DJDEcgZZlLCyrkTIVBOscWMuV+CuuADa0Rfl7qnv4ZmEbnA28yc3TcqvT1zd5rsVVcl7tOo6PE0sCDnT684gsjOyjd3rKMUlqzYUHfIRjvGLk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.74]) by mx.zohomail.com with SMTPS id 1585120444594800.3054743108828; Wed, 25 Mar 2020 00:14:04 -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-100-uHgVrL93PNicSnBEwIV9oA-1; Wed, 25 Mar 2020 03:13:17 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ABDB8189F76F; Wed, 25 Mar 2020 07:13:11 +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 75291A7FE; Wed, 25 Mar 2020 07:13:11 +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 21BD4863A8; Wed, 25 Mar 2020 07:13:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02P7CUe9023914 for ; Wed, 25 Mar 2020 03:12:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 75686108BE9; Wed, 25 Mar 2020 07:12:30 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6E47B108BDB for ; Wed, 25 Mar 2020 07:12:29 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (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 79CFC185A790 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-319-aJNmlG4WMGOh3sY1hUOD4g-1; Wed, 25 Mar 2020 03:12:26 -0400 Received: from localhost.localdomain (unknown [123.232.151.103]) by smtp4 (Coremail) with SMTP id JedpCgD3ftNNBHtey+koAw--.408S16; Wed, 25 Mar 2020 15:12:21 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585120443; 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=9B03+nrWCdJkBfeqVCl07qkWu4UxkZDUYa8nITsMWmw=; b=VCRHXB6LmetxWdgphEHtoUOnnsqohYjwzoLzoLPUQkPVJim+GGh+2BCIlBQHPT8461/Uy4 NWgHLq+v3PHz+wsDSBvNZvGqsWKTgILKwHW3G7vVrMOB24Rsx0IwM+LkD7T7gh2E+nyPdq k3IESmNMU2jSJ/qsztMKiAZ5ZmDTfFk= X-MC-Unique: uHgVrL93PNicSnBEwIV9oA-1 X-MC-Unique: aJNmlG4WMGOh3sY1hUOD4g-1 From: Shi Lei To: libvir-list@redhat.com Subject: [RFC 14/29] conf: Replace virNetworkDNSDefClear(hardcoded) with namesake(generated) Date: Wed, 25 Mar 2020 15:11:54 +0800 Message-Id: <20200325071209.20841-15-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--.408S16 X-Coremail-Antispam: 1Uf129KBjvJXoWxXrWDZryrAw45Aw1kXrWrKrg_yoWrXFykpF n5XF13Aw4xWFy5KFWUArZ5GwsI9r1vqF4UKryfC3sYv348Zr1xCayxG34IvFZ8WryFvr43 A34aq3y3JF4rur7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pEzBTPUUUUU= X-Originating-IP: [123.232.151.103] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbigxXxT1sfnFFyHAAAsP X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 02P7CUe9023914 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.23 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 | 13 ++++++--- src/conf/Makefile.inc.am | 2 ++ src/conf/network_conf.c | 60 ---------------------------------------- 3 files changed, 11 insertions(+), 64 deletions(-) diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 6127dae..919464d 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -258,7 +258,8 @@ and other features in the element --> @@ -275,7 +276,8 @@ @@ -289,7 +291,8 @@ @@ -298,7 +301,8 @@ @@ -331,6 +335,7 @@ diff --git a/src/conf/Makefile.inc.am b/src/conf/Makefile.inc.am index 1fbde38..b9ab535 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 84b4887..060d0e3 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -156,66 +156,6 @@ virNetworkIPDefClear(virNetworkIPDefPtr def) } =20 =20 -static void -virNetworkDNSTxtDefClear(virNetworkDNSTxtDefPtr def) -{ - VIR_FREE(def->name); - VIR_FREE(def->value); -} - - -static void -virNetworkDNSHostDefClear(virNetworkDNSHostDefPtr def) -{ - while (def->nnames) - VIR_FREE(def->names[--def->nnames]); - VIR_FREE(def->names); -} - - -static void -virNetworkDNSSrvDefClear(virNetworkDNSSrvDefPtr def) -{ - VIR_FREE(def->domain); - VIR_FREE(def->service); - VIR_FREE(def->protocol); - VIR_FREE(def->target); -} - - -static void -virNetworkDNSForwarderClear(virNetworkDNSForwarderPtr def) -{ - VIR_FREE(def->domain); -} - - -static void -virNetworkDNSDefClear(virNetworkDNSDefPtr def) -{ - if (def->forwarders) { - while (def->nforwarders) - virNetworkDNSForwarderClear(&def->forwarders[--def->nforwarder= s]); - VIR_FREE(def->forwarders); - } - if (def->txts) { - while (def->ntxts) - virNetworkDNSTxtDefClear(&def->txts[--def->ntxts]); - VIR_FREE(def->txts); - } - if (def->hosts) { - while (def->nhosts) - virNetworkDNSHostDefClear(&def->hosts[--def->nhosts]); - VIR_FREE(def->hosts); - } - if (def->srvs) { - while (def->nsrvs) - virNetworkDNSSrvDefClear(&def->srvs[--def->nsrvs]); - VIR_FREE(def->srvs); - } -} - - static void virNetworkForwardDefClear(virNetworkForwardDefPtr def) { --=20 2.17.1