From nobody Mon Feb 9 10:29:33 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=1585120412; cv=none; d=zohomail.com; s=zohoarc; b=PAitmLv/jMNtq2y+0LUisg2De8VHy7MhXMOinkizn/529fi5BDkqdnY2d5U+HdzAqfi1YNA6UCRyM/2zjFOvVFg7FGC/UlxsjuRz/C3xq2ymFT/fmLA/Aa7etpAXBk9VyD4CDGNB+gcR87dcZ2auuW5Ga8EolkId9Nb6HiuKpU4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585120412; 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=lwAVBTyjhZT2fRlKAc79p2oJYFbaW6lDuK47lFfP68Y=; b=dqb6ER0uOKBaLOBPWhMfrAkWEqcuaGLDyQa14cUAqQCvF9dCJznRjGMI4lyeh1G5NKDWjvpXQOoqq5qkKQ+heAU2nqkXnE2laOyGRegALxFDeOQkWQALXsCmJiyt3Pt43/fVy9h7gHNSgkH8LXcDvu0MyCbkkGAlPEGW3SAWEyQ= 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 1585120412339354.78161775637784; Wed, 25 Mar 2020 00:13:32 -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-229-lPU1WMGKMqyYm78D_c5A1A-1; Wed, 25 Mar 2020 03:13:28 -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 79D4A108592A; Wed, 25 Mar 2020 07:13:21 +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 5087294B5D; Wed, 25 Mar 2020 07:13:21 +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 00AC18701F; Wed, 25 Mar 2020 07:13:20 +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 02P7CUOa023895 for ; Wed, 25 Mar 2020 03:12:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1D7C02037E5A; 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 19CA92037E4F for ; Wed, 25 Mar 2020 07:12:30 +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 003378007D4 for ; Wed, 25 Mar 2020 07:12:30 +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-328-x7ddIc5cN6ChwG0zkvwbaw-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--.408S31; Wed, 25 Mar 2020 15:12:23 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585120411; 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=lwAVBTyjhZT2fRlKAc79p2oJYFbaW6lDuK47lFfP68Y=; b=DH+8REg01Bfelkp9+CjhzQlmSCioZVDWyGK18RYVQlb/7noPjp74/7lfJMc+kMsY9nKg2e noPkI0iNGaYQ6DIhmYpL8OrdoEEtr5tOnwCSzDierJPx2wRzvKYYF12/Vlv/KGa1xSQTku hdAV/BenbhZBK7AEaE+7xYu1ZNMQ8e0= X-MC-Unique: lPU1WMGKMqyYm78D_c5A1A-1 X-MC-Unique: x7ddIc5cN6ChwG0zkvwbaw-1 From: Shi Lei To: libvir-list@redhat.com Subject: [RFC 29/29] conf: Replace virNetworkDNSDefFormat(hardcoded) with virNetworkDNSDefFormatBuf(generated) Date: Wed, 25 Mar 2020 15:12:09 +0800 Message-Id: <20200325071209.20841-30-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--.408S31 X-Coremail-Antispam: 1Uf129KBjvJXoWxCFWDCw1xKFWxuF18JFW3Awb_yoW5ArykpF n3tFnIyFW8WF98trWjy3yfKr98uFWkJ3yrCrZ7W347Z345GryfZryxWry0va4YgryYyrWY y3WrXrs8J3y8JF7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zRU5r7UUUUU= X-Originating-IP: [123.232.151.103] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbiPRfxT1bdHD83ogAAsp X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 02P7CUOa023895 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 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 | 71 +--------------------------------------- 2 files changed, 3 insertions(+), 71 deletions(-) diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index ba5db0b..db04b7c 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -264,7 +264,8 @@ "output": "src/conf/network_conf", "post": true, "args.instname": true - } + }, + "formatfunc": {"output": "src/conf/network_conf"} } --> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index e5d6e49..e46c208 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1922,75 +1922,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]) < 0) - return -1; - } - - for (i =3D 0; i < def->ntxts; i++) { - if (virNetworkDNSTxtDefFormatBuf(buf, "txt", &def->txts[i]) < 0) - return -1; - } - - for (i =3D 0; i < def->nsrvs; i++) { - if (virNetworkDNSSrvDefFormatBuf(buf, "srv", &def->srvs[i]) < 0) - return -1; - } - - if (def->nhosts) { - for (i =3D 0; i < def->nhosts; i++) { - if (virNetworkDNSHostDefFormatBuf(buf, "host", &def->hosts[i])= < 0) - return -1; - } - } - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); - return 0; -} - - static int virNetworkIPDefFormat(virBufferPtr buf, const virNetworkIPDef *def) @@ -2366,7 +2297,7 @@ virNetworkDefFormatBuf(virBufferPtr buf, virBufferAddLit(buf, "/>\n"); } =20 - if (virNetworkDNSDefFormat(buf, &def->dns) < 0) + if (virNetworkDNSDefFormatBuf(buf, "dns", &def->dns) < 0) return -1; =20 if (virNetDevVlanFormat(&def->vlan, buf) < 0) --=20 2.17.1