From nobody Mon Feb 9 10:48:32 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=1585120410; cv=none; d=zohomail.com; s=zohoarc; b=frvbpUzo/HydoJD4HpD0pv+cpfsIqEpC7RBQP4Z4VpcSrlrZxWvKa6eWYR/FrB/kNk9vn/UEt7/i9ye/iAK8lGqWr/8Ag7DsQ+oQl4QwPTCFDk3zYV/JzstbZ3zSzeAiy9MaMDdqbtVmhc9PrXhMVGl9WKXgjvSEYJ2KdWjQvy0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585120410; 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=zO72f8ipPP+p3V6iEm7Itbb6oF45LwuaDKfiPYarYrU=; b=T3/QKPYsuhT5Ni7HQ+c+bgkaEgsqiYczIOINMRi8zOZG2+LXJenURP4NFT+XD9clP75DpjwP3t1aJQl1529oo4xZKCZUjEH6WOgXjyaPaBDI6IQ//+frofCvXpAr/0/KwfQa0GX7uDsLYwWxyaIT65PUMKz+R9N6bgs+Ab6+VcM= 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 1585120410071861.4449551988816; Wed, 25 Mar 2020 00:13:30 -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-286-bMTTMW1PPaeldaoS74H6yg-1; Wed, 25 Mar 2020 03:13:26 -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 EE8CA1007273; Wed, 25 Mar 2020 07:13:20 +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 BDC22A7ED; Wed, 25 Mar 2020 07:13:20 +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 4602118034EC; 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 02P7CUSY023896 for ; Wed, 25 Mar 2020 03:12:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id A2CF52037E4D; 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 9F5A92026D67 for ; Wed, 25 Mar 2020 07:12:29 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.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 7CC61800298 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-419-mT-txWU1Pqu5Rj-Per6xwQ-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--.408S28; 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=1585120408; 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=zO72f8ipPP+p3V6iEm7Itbb6oF45LwuaDKfiPYarYrU=; b=J1zm4emFnxVm4brKTW7AMEWTfyS3qB8aPlmG+x62dPjvgrm9NOXyFzCSJE2sgUVBKDKC6l KG507AJgdpR6bpfkvWg2bsKNEj5xqB6/EkSr3dsk61rVxOErytggTHr+16IXJqb+dVoat+ M8R6gfrMVuEIGv3mmra0AHcwe0kU4vw= X-MC-Unique: bMTTMW1PPaeldaoS74H6yg-1 X-MC-Unique: mT-txWU1Pqu5Rj-Per6xwQ-1 From: Shi Lei To: libvir-list@redhat.com Subject: [RFC 26/29] conf: Apply virNetworkDNSTxtDefFormatBuf(generated) in virNetworkDNSDefFormat Date: Wed, 25 Mar 2020 15:12:06 +0800 Message-Id: <20200325071209.20841-27-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--.408S28 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjTRBmh7UUUUU X-Originating-IP: [123.232.151.103] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbicRfxT1lZvBphvQAAsi 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 02P7CUSY023896 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 | 1 + src/conf/network_conf.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index cd5be22..1d7b854 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -317,6 +317,7 @@ {"name": "partialOkay", "type": "Bool"} ] }, + "formatfunc": {"output": "src/conf/network_conf"}, "members": [ {"id": "value", "opt": true} ] diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 19444d6..b40ab4d 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1970,8 +1970,8 @@ virNetworkDNSDefFormat(virBufferPtr buf, } =20 for (i =3D 0; i < def->ntxts; i++) { - virBufferEscapeString(buf, "txts[i].name); - virBufferEscapeString(buf, "value=3D'%s'/>\n", def->txts[i].value); + if (virNetworkDNSTxtDefFormatBuf(buf, "txt", &def->txts[i]) < 0) + return -1; } =20 for (i =3D 0; i < def->nsrvs; i++) { --=20 2.17.1