From nobody Mon Feb 9 12:43:32 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=1585120426; cv=none; d=zohomail.com; s=zohoarc; b=irQ9U66OahDbXqma0y3Qbz/4zvEY7qEYK2J3ir45tkvZ22SSSolfCxR0mj8I6ZWY6qI4tfC2fUqW7OLeb28E91HggE2aQXoX2bTptBubtJTyNOe4CHj9BqRYxHU7DzC/dwq5wcSgfggMZcdP0robyh/9ZZMicpTZBIj764wQEnc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585120426; 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=j8APz1ZWMXWYeHQFcRXLiJqBP8LGZyvzbSUjy1iWJIU=; b=esXHJ0SkNIXycoDy3XTf/iRZbWZUZoa3ave1MGBP/emJ8Z+X+Ib3m6z/axPZLKqNF1R9YqNf49WWZD7bwdbaCTS7Z7KCH3ouxrnoX7u1vRPmsHWDMZEWbOKYI26qDVkkx6ZDTStaMFKr9yA2cBxx+uNXq26V+yv1igSmZtFsKMc= 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 158512042606752.21118970285863; Wed, 25 Mar 2020 00:13:46 -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-185-JzinR7gIMOmL_y6tMyfSmA-1; Wed, 25 Mar 2020 03:13:42 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0C01F801A1C; Wed, 25 Mar 2020 07:13:37 +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 D6FA28D576; Wed, 25 Mar 2020 07:13:36 +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 851068A03E; Wed, 25 Mar 2020 07:13:36 +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 02P7CUBh023909 for ; Wed, 25 Mar 2020 03:12:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5F78510F1C10; Wed, 25 Mar 2020 07:12:30 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 58F3610F1C06 for ; Wed, 25 Mar 2020 07:12:28 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (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 5D4028007CB for ; Wed, 25 Mar 2020 07:12:28 +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-412-n80oNN6HP7SfivJ6J-bDog-1; Wed, 25 Mar 2020 03:12:24 -0400 Received: from localhost.localdomain (unknown [123.232.151.103]) by smtp4 (Coremail) with SMTP id JedpCgD3ftNNBHtey+koAw--.408S15; 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=1585120424; 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=j8APz1ZWMXWYeHQFcRXLiJqBP8LGZyvzbSUjy1iWJIU=; b=TwQnlxlm9Yt3zvaHQWyMzM7cIus/+gKhcJ2cwvTb5C3giXT2omWqu3AWIWVbQyiKVidVOO GYue75pcFSTgsvtQVR9VihyAY/igv4SPmej12lmhykUdpeyJ3KWQ0NmcnUFfVRTJn0ALsg ej5/Ljhy6yyJZBVCFYFzuBk9HA8SkA8= X-MC-Unique: JzinR7gIMOmL_y6tMyfSmA-1 X-MC-Unique: n80oNN6HP7SfivJ6J-bDog-1 From: Shi Lei To: libvir-list@redhat.com Subject: [RFC 13/29] conf: Replace virNetworkDNSDef(hardcoded) with namesake(generated) Date: Wed, 25 Mar 2020 15:11:53 +0800 Message-Id: <20200325071209.20841-14-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--.408S15 X-Coremail-Antispam: 1Uf129KBjvJXoWxAw48Wr45uw1xZry7tr47Jwb_yoWrJrW5p3 ZxXF15JrW8WF1jgrW7Zw4rKFnxuFykXa45Gr97u342v3y8tryxCr1xCFyxZFs8Wr1Yyr43 A3WFqrn8Jw48JaUanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zEqjgrUUUUU= X-Originating-IP: [123.232.151.103] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbiTBXxT1dqAGQzywAAsG 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 02P7CUBh023909 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.11 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 | 3 +++ src/conf/network_conf.c | 12 ++++++------ src/conf/network_conf.h | 15 --------------- src/network/bridge_driver.c | 2 +- 4 files changed, 10 insertions(+), 22 deletions(-) diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 0034c4f..6127dae 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -257,6 +257,9 @@ + diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 819b645..84b4887 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -194,8 +194,8 @@ static void virNetworkDNSDefClear(virNetworkDNSDefPtr def) { if (def->forwarders) { - while (def->nfwds) - virNetworkDNSForwarderClear(&def->forwarders[--def->nfwds]); + while (def->nforwarders) + virNetworkDNSForwarderClear(&def->forwarders[--def->nforwarder= s]); VIR_FREE(def->forwarders); } if (def->txts) { @@ -931,7 +931,7 @@ virNetworkDNSDefParseXML(const char *networkName, goto cleanup; } VIR_FREE(addr); - def->nfwds++; + def->nforwarders++; } } =20 @@ -2156,7 +2156,7 @@ virNetworkDNSDefFormat(virBufferPtr buf, { size_t i, j; =20 - if (!(def->enable || def->forwardPlainNames || def->nfwds || def->nhos= ts || + if (!(def->enable || def->forwardPlainNames || def->nforwarders || def= ->nhosts || def->nsrvs || def->ntxts)) return 0; =20 @@ -2183,7 +2183,7 @@ virNetworkDNSDefFormat(virBufferPtr buf, } virBufferAsprintf(buf, " forwardPlainNames=3D'%s'", fwd); } - if (!(def->nfwds || def->nhosts || def->nsrvs || def->ntxts)) { + if (!(def->nforwarders || def->nhosts || def->nsrvs || def->ntxts)) { virBufferAddLit(buf, "/>\n"); return 0; } @@ -2191,7 +2191,7 @@ virNetworkDNSDefFormat(virBufferPtr buf, virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); =20 - for (i =3D 0; i < def->nfwds; i++) { + for (i =3D 0; i < def->nforwarders; i++) { =20 virBufferAddLit(buf, "forwarders[i].domain) { diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 1f96999..db0119d 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -104,21 +104,6 @@ struct _virNetworkDHCPHostDef { virSocketAddr ip; }; =20 -typedef struct _virNetworkDNSDef virNetworkDNSDef; -typedef virNetworkDNSDef *virNetworkDNSDefPtr; -struct _virNetworkDNSDef { - int enable; /* enum virTristateBool */ - int forwardPlainNames; /* enum virTristateBool */ - size_t ntxts; - virNetworkDNSTxtDefPtr txts; - size_t nhosts; - virNetworkDNSHostDefPtr hosts; - size_t nsrvs; - virNetworkDNSSrvDefPtr srvs; - size_t nfwds; - virNetworkDNSForwarderPtr forwarders; -}; - typedef struct _virNetworkIPDef virNetworkIPDef; typedef virNetworkIPDef *virNetworkIPDefPtr; struct _virNetworkIPDef { diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index f060992..3cccbe5 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1112,7 +1112,7 @@ networkDnsmasqConfContents(virNetworkObjPtr obj, */ bool addNoResolv =3D false; =20 - for (i =3D 0; i < def->dns.nfwds; i++) { + for (i =3D 0; i < def->dns.nforwarders; i++) { virNetworkDNSForwarderPtr fwd =3D &def->dns.forwarders[i]; =20 virBufferAddLit(&configbuf, "server=3D"); --=20 2.17.1