From nobody Mon Feb 9 15:45:24 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=1585120398; cv=none; d=zohomail.com; s=zohoarc; b=AKTTEE4J/Xi2o48EdZaOUAZMPk69TNZntg/B8QbMyJwxdQfNl0rtHNmUK5DQutp0TH6jdm6G+zs20sZ/A8OyYGwrraROCRIn5ijP4aim2HquBqB/mfCh75crfBaj0MUNS6j3UjNR91KuXowUdpP9EQ/V28Yp5UYoyy8xTkOv1w8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585120398; 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=bRfyvD91JUSR2PrhWlhkJX8BAAp9XGc3xT0iY9lQsnk=; b=aocOTV2HHqlnOKD6xoIBOpN0w08/o/zPGtPIO0lDH/rtbFzFBTo21f8ryHGFGCleEWtEvkg3SNhWGhgt6+z5s9PG/Ogdu5kT38IfEB3MoY9KrrzVK6LWdUVjkZftQl4c6wEoIRuXcgVq+8NilN+itIJNrSZxJ2+xa+BG2XFRYW8= 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 1585120398209310.82973731386926; Wed, 25 Mar 2020 00:13:18 -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-446-44xTEAFKMT2zzuHznoy3wQ-1; Wed, 25 Mar 2020 03:13:13 -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 26291DB77; Wed, 25 Mar 2020 07:13:08 +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 EFED85D9C5; Wed, 25 Mar 2020 07:13:07 +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 A37C4180085D; Wed, 25 Mar 2020 07:13:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02P7CS8n023848 for ; Wed, 25 Mar 2020 03:12:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 36C712166B2C; Wed, 25 Mar 2020 07:12:29 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 332442166B2A for ; Wed, 25 Mar 2020 07:12:29 +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 1EDB2800298 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-66-UZWjyBy6MOGdMiRmBcF9jA-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--.408S27; Wed, 25 Mar 2020 15:12:22 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585120397; 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=bRfyvD91JUSR2PrhWlhkJX8BAAp9XGc3xT0iY9lQsnk=; b=do8m2j+7PtRAqWGynQAb6XaQZXv09N+clGUtujUMcVGF7dekEZZo6sEvha9KzQtZztZobV EOATISA99JACmCs3oOEqtIrA+zeD/o/f3F9FOsYDtqUYWO3zlEwlQC+Ca0QEG992iO68Gk Kq7LThsart9YJ+r6F8G3TAn0IAVbyiU= X-MC-Unique: 44xTEAFKMT2zzuHznoy3wQ-1 X-MC-Unique: UZWjyBy6MOGdMiRmBcF9jA-1 From: Shi Lei To: libvir-list@redhat.com Subject: [RFC 25/29] conf: Apply virNetworkDNSForwarderFormatBuf(generated) in virNetworkDNSDefFormat Date: Wed, 25 Mar 2020 15:12:05 +0800 Message-Id: <20200325071209.20841-26-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--.408S27 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjTRBmh7UUUUU X-Originating-IP: [123.232.151.103] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbiRxbxT1dqAIIyagABsJ X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 02P7CS8n023848 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 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 | 4 ++++ src/conf/network_conf.c | 17 ++--------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 7084248..cd5be22 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -288,6 +288,10 @@ "post": true, "args.noctxt": true, "args.instname": true + }, + "formatfunc": { + "output": "src/conf/network_conf", + "order": ["domain", "addr"] } } --> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 905c01f..19444d6 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1964,22 +1964,9 @@ virNetworkDNSDefFormat(virBufferPtr buf, virBufferAdjustIndent(buf, 2); =20 for (i =3D 0; i < def->nforwarders; i++) { - - virBufferAddLit(buf, "forwarders[i].domain) { - virBufferEscapeString(buf, " domain=3D'%s'", - def->forwarders[i].domain); - } - if (VIR_SOCKET_ADDR_VALID(&def->forwarders[i].addr)) { - char *addr =3D virSocketAddrFormat(&def->forwarders[i].addr); - - if (!addr) + if (virNetworkDNSForwarderFormatBuf(buf, "forwarder", + &def->forwarders[i]) < 0) return -1; - - virBufferAsprintf(buf, " addr=3D'%s'", addr); - VIR_FREE(addr); - } - virBufferAddLit(buf, "/>\n"); } =20 for (i =3D 0; i < def->ntxts; i++) { --=20 2.17.1