From nobody Mon Feb 9 10:27:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1591752448; cv=none; d=zohomail.com; s=zohoarc; b=lV9BiRyFfCe4kNYiCNfWbxhYeZeIbQI3ihYT5t6pyYYBcUFNY6J7hhPzusg69zKXNllp0xu9Usnt5zg6I8GtsQNfonSwVcFLlpTp2/oYK3MvsmwVz1aBDNVFu+ldpBmDBK1SRxI3s0pkiCqpQdeFYoDbCuZRnOgT1Pd/79pGVCs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591752448; 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=NUyG3JG1ojbAClrn/01eRDSuh0G/J5iwU5OWvhcxsMY=; b=S1FWQkO2t4AwrdSWL81yHf4Z50hgBEg3fVs3YBcZiTZ+bA5+UzBEfhCkYgBmzzOsKBf6z2Fyy7c7v4bZAjIrQGjtQUUlo+0C5DgkJAWzBzqxbuzc2NRbuf4FXgp9nHg8JYSRiqMwJFlDOpO419+em3yWD0JUfyVLdQ3QT2s9XX8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1591752448505265.3577163066627; Tue, 9 Jun 2020 18:27: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-291-nrPy07zoMyeVzdslSN8bsw-1; Tue, 09 Jun 2020 21:27:23 -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 E5AB61054F93; Wed, 10 Jun 2020 01:27:17 +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 C56795D9F5; Wed, 10 Jun 2020 01:27:17 +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 83578104811; Wed, 10 Jun 2020 01:27:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 05A1RFnW027581 for ; Tue, 9 Jun 2020 21:27:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id B89EB2026E1C; Wed, 10 Jun 2020 01:27:15 +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 B4C072026D5D for ; Wed, 10 Jun 2020 01:27:13 +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 0D9CC185A78B for ; Wed, 10 Jun 2020 01:27:13 +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-408-3bFVNl0JO4-3kdvtKV8JtQ-1; Tue, 09 Jun 2020 21:27:09 -0400 Received: from localhost.localdomain (unknown [58.56.27.130]) by smtp4 (Coremail) with SMTP id JedpCgCnxdh_NeBeVKS4Bw--.7295S23; Wed, 10 Jun 2020 09:21:57 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591752447; 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=NUyG3JG1ojbAClrn/01eRDSuh0G/J5iwU5OWvhcxsMY=; b=aJWhutwsFLPJYNC3OP8srypTp/jr1+qK0EO3057iwnlG8AM0STvicXy1clcLNJtCi7qpfd /cfTPn5zjS/mDL+1hONJavQAGm48gAzUIC0F7G5+t+6fEKd9M+QWxAQsd+MOsEmjvv3+rJ FY6Bdm7WKhxWr0yEPQHUI/0azfSC13U= X-MC-Unique: nrPy07zoMyeVzdslSN8bsw-1 X-MC-Unique: 3bFVNl0JO4-3kdvtKV8JtQ-1 From: Shi Lei To: libvir-list@redhat.com Subject: [RFC 21/21] conf: Generate virNetworkDNSDefFormatBuf Date: Wed, 10 Jun 2020 09:20:49 +0800 Message-Id: <20200610012049.10774-22-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--.7295S23 X-Coremail-Antispam: 1Uf129KBjvJXoWxAFW7CFy8Gw4UtF1fJF1xGrg_yoWrAr43pF nxtF1DAF4rWFnYqry2yw4rKr98CFykJa15GrZ7W347Z3yUKrySkryfCry0vF4rWrWYkrW5 AF1Ygrs8J3yUGFUanT9S1TB71UUUUUDqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0piFoGJUUUUU= X-Originating-IP: [58.56.27.130] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbiGRU-T1nkgmIU2QAAss X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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 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 --- src/conf/network_conf.c | 77 ++--------------------------------------- src/conf/network_conf.h | 10 +++--- 2 files changed, 8 insertions(+), 79 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index db2b75f..604e589 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -881,10 +881,10 @@ virNetworkDNSDefParseXMLHook(xmlNodePtr node G_GNUC_U= NUSED, void *opaque G_GNUC_UNUSED, const char *enable G_GNUC_UNUSED, const char *forwardPlainNames G_GNUC_UNUSED, + int nfwds, int ntxts, - int nhosts, int nsrvs, - int nfwds) + int nhosts) { if (def->enable =3D=3D VIR_TRISTATE_BOOL_NO && (nfwds || nhosts || nsrvs || ntxts)) { @@ -2024,77 +2024,6 @@ virNetworkDefParseNode(xmlDocPtr xml, } =20 =20 -static int -virNetworkDNSDefFormat(virBufferPtr buf, - const virNetworkDNSDef *def) -{ - size_t i; - - if (!(def->enable || def->forwardPlainNames || def->nforwarders || def= ->nhosts || - def->nsrvs || def->ntxts)) - return 0; - - virBufferAddLit(buf, "enable) { - const char *fwd =3D virTristateBoolTypeToString(def->enable); - - if (!fwd) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown enable type %d in network"), - def->enable); - return -1; - } - virBufferAsprintf(buf, " enable=3D'%s'", fwd); - } - if (def->forwardPlainNames) { - const char *fwd =3D virTristateBoolTypeToString(def->forwardPlainN= ames); - - if (!fwd) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown forwardPlainNames type %d in network= "), - def->forwardPlainNames); - return -1; - } - virBufferAsprintf(buf, " forwardPlainNames=3D'%s'", fwd); - } - if (!(def->nforwarders || def->nhosts || def->nsrvs || def->ntxts)) { - virBufferAddLit(buf, "/>\n"); - return 0; - } - - virBufferAddLit(buf, ">\n"); - virBufferAdjustIndent(buf, 2); - - for (i =3D 0; i < def->nforwarders; i++) { - if (virNetworkDNSForwarderFormatBuf(buf, "forwarder", - &def->forwarders[i], NULL) < 0) - return -1; - } - - for (i =3D 0; i < def->ntxts; i++) { - if (virNetworkDNSTxtDefFormatBuf(buf, "txt", &def->txts[i], NULL) = < 0) - return -1; - } - - for (i =3D 0; i < def->nsrvs; i++) { - if (def->srvs[i].service && def->srvs[i].protocol) { - if (virNetworkDNSSrvDefFormatBuf(buf, "srv", &def->srvs[i], NU= LL) < 0) - return -1; - } - } - - if (def->nhosts) { - for (i =3D 0; i < def->nhosts; i++) { - if (virNetworkDNSHostDefFormatBuf(buf, "host", &def->hosts[i],= NULL) < 0) - return -1; - } - } - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); - return 0; -} - - static int virNetworkIPDefFormat(virBufferPtr buf, const virNetworkIPDef *def) @@ -2502,7 +2431,7 @@ virNetworkDefFormatBuf(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } =20 - if (virNetworkDNSDefFormat(buf, &def->dns) < 0) + if (virNetworkDNSDefFormatBuf(buf, "dns", &def->dns, NULL) < 0) return -1; =20 if (virNetDevVlanFormat(&def->vlan, buf) < 0) diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 462d97d..cfbd7c9 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -165,17 +165,17 @@ struct _virNetworkDNSForwarder { /* genparse:withh= ook, genformat */ =20 typedef struct _virNetworkDNSDef virNetworkDNSDef; typedef virNetworkDNSDef *virNetworkDNSDefPtr; -struct _virNetworkDNSDef { /* genparse:withhook */ +struct _virNetworkDNSDef { /* genparse:withhook, genformat */ virTristateBool enable; /* xmlattr */ virTristateBool forwardPlainNames; /* xmlattr */ + size_t nforwarders; + virNetworkDNSForwarderPtr forwarders; /* xmlelem, array */ size_t ntxts; virNetworkDNSTxtDefPtr txts; /* xmlelem, array */ - size_t nhosts; - virNetworkDNSHostDefPtr hosts; /* xmlelem, array */ size_t nsrvs; virNetworkDNSSrvDefPtr srvs; /* xmlelem, array */ - size_t nforwarders; - virNetworkDNSForwarderPtr forwarders; /* xmlelem, array */ + size_t nhosts; + virNetworkDNSHostDefPtr hosts; /* xmlelem, array */ }; =20 typedef struct _virNetworkIPDef virNetworkIPDef; --=20 2.17.1