From nobody Mon Feb 9 12:24:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.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 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1591752429; cv=none; d=zohomail.com; s=zohoarc; b=izUTW4JHQZvVl/fwo57Kg9/mcM0MT9feMbUqq1KW9r8bEVZrnwUq4HQWbSbOh/qBkEdlvKcvtOD5FmKmcd+6Qd5Vn0T5C0ezOfA3FiOBsyB5dej9DnRqU648RzmcopMZrJTDxKhFerbTmFRs96InYc+5O7wCV6BG2WukXZ7mp9Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591752429; 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=v6swf/Zfvj0TQzNLt/6vrfbqJOvypnyq2bO+lG6PbDc=; b=H46itCwdkJgUu7kMJ6WBc6nuaP7NDQEePSHxYSGPkQzxwySuRf2bovsMlSXMrTJZjn1YA/SZTnThInK7gRGTno6raGRc+A0KKsGZAitIZvf7yxy/nqgo8ZvlZ8wDAq4BVlRgxPplBKUSPWOSThQph9yXaMwovscgBH0wh+OLlF8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.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 [205.139.110.120]) by mx.zohomail.com with SMTPS id 1591752429749539.7814931570834; Tue, 9 Jun 2020 18:27:09 -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-6-F3bjMQ0ROAGrefGgXSAjrA-1; Tue, 09 Jun 2020 21:27:05 -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 B3806107ACF6; Wed, 10 Jun 2020 01:26:58 +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 954F97C377; Wed, 10 Jun 2020 01:26:58 +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 66858180530E; Wed, 10 Jun 2020 01:26:58 +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 05A1Qt3m027348 for ; Tue, 9 Jun 2020 21:26:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id B81D22166BA3; Wed, 10 Jun 2020 01:26:55 +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 B3C662166BA2 for ; Wed, 10 Jun 2020 01:26:55 +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 98AE780CDB7 for ; Wed, 10 Jun 2020 01:26:55 +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-491-cPxNiME4PqKI8zbh6um5yg-1; Tue, 09 Jun 2020 21:26:52 -0400 Received: from localhost.localdomain (unknown [58.56.27.130]) by smtp4 (Coremail) with SMTP id JedpCgCnxdh_NeBeVKS4Bw--.7295S10; Wed, 10 Jun 2020 09:21:29 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591752428; 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=v6swf/Zfvj0TQzNLt/6vrfbqJOvypnyq2bO+lG6PbDc=; b=IniPKBNYWFyxjZWnQE7vfFfBiNY4lIHF5uRB5Jr4PsEcAg+GvfGH2fx1xrBhrnncQp6dBg HAx+ClO7UmIu8PZVJLpjK7VRCB3cDTpzP1Il4GE7uXgAO79avcFW08QNNq0fm4k0jDXLTO lynRq5tZNUqKsODWAnl6TFjRqO1ThnI= X-MC-Unique: F3bjMQ0ROAGrefGgXSAjrA-1 X-MC-Unique: cPxNiME4PqKI8zbh6um5yg-1 From: Shi Lei To: libvir-list@redhat.com Subject: [RFC 08/21] conf: Generate virNetworkDNSTxtDefFormatBuf Date: Wed, 10 Jun 2020 09:20:36 +0800 Message-Id: <20200610012049.10774-9-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--.7295S10 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUU5529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjTRpE_MDUUUU X-Originating-IP: [58.56.27.130] X-CM-SenderInfo: pvklsz1hl6ztxvvfz0xxgvhudrp/1tbiWhk-T1f4pkbTIAAAsP X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 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 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 | 4 ++-- src/conf/network_conf.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 964a8a7..b807bac 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2280,8 +2280,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], NULL) = < 0) + return -1; } =20 for (i =3D 0; i < def->nsrvs; i++) { diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index eac8a76..b3c2895 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -130,7 +130,7 @@ struct _virNetworkDHCPHostDef { =20 typedef struct _virNetworkDNSTxtDef virNetworkDNSTxtDef; typedef virNetworkDNSTxtDef *virNetworkDNSTxtDefPtr; -struct _virNetworkDNSTxtDef { /* genparse:concisehook */ +struct _virNetworkDNSTxtDef { /* genparse:concisehook, genformat */ char *name; /* xmlattr, required */ char *value; /* xmlattr */ }; --=20 2.17.1