From nobody Mon Feb 9 04:31:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1553277712977579.7712276075086; Fri, 22 Mar 2019 11:01:52 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 12FCC46288; Fri, 22 Mar 2019 18:01:51 +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 D6FF15C553; Fri, 22 Mar 2019 18:01:50 +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 794703D387; Fri, 22 Mar 2019 18:01:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2MI1XT8009032 for ; Fri, 22 Mar 2019 14:01:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id CD7405D9D5; Fri, 22 Mar 2019 18:01:33 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 55DD65D9D2 for ; Fri, 22 Mar 2019 18:01:33 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Fri, 22 Mar 2019 19:01:01 +0100 Message-Id: <1b2e120e63e630fcd9e9760945d5c6b3f6803312.1553277561.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 25/29] conf: use virXMLFormatElement in virDomainDiskDefFormatMirror 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 22 Mar 2019 18:01:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 852489e185..5c82ac0a18 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -24017,8 +24017,12 @@ virDomainDiskDefFormatMirror(virBufferPtr buf, unsigned int flags, virDomainXMLOptionPtr xmlopt) { + VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; + VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER; const char *formatStr =3D NULL; + virBufferSetChildIndent(&childBuf, buf); + /* For now, mirroring is currently output-only: we only output it * for live domains, therefore we ignore it on input except for * the internal parse on libvirtd restart. We prefer to output @@ -24032,28 +24036,25 @@ virDomainDiskDefFormatMirror(virBufferPtr buf, if (disk->mirror->format) formatStr =3D virStorageFileFormatTypeToString(disk->mirror->forma= t); - virBufferAsprintf(buf, "mirror->type)); if (disk->mirror->type =3D=3D VIR_STORAGE_TYPE_FILE && disk->mirrorJob =3D=3D VIR_DOMAIN_BLOCK_JOB_TYPE_COPY) { - virBufferEscapeString(buf, " file=3D'%s'", disk->mirror->path); - virBufferEscapeString(buf, " format=3D'%s'", formatStr); + virBufferEscapeString(&attrBuf, " file=3D'%s'", disk->mirror->path= ); + virBufferEscapeString(&attrBuf, " format=3D'%s'", formatStr); } - virBufferEscapeString(buf, " job=3D'%s'", + virBufferEscapeString(&attrBuf, " job=3D'%s'", virDomainBlockJobTypeToString(disk->mirrorJob)); - if (disk->mirrorState) { - const char *mirror; + if (disk->mirrorState) + virBufferEscapeString(&attrBuf, " ready=3D'%s'", + virDomainDiskMirrorStateTypeToString(disk->m= irrorState)); - mirror =3D virDomainDiskMirrorStateTypeToString(disk->mirrorState); - virBufferEscapeString(buf, " ready=3D'%s'", mirror); - } - virBufferAddLit(buf, ">\n"); - virBufferAdjustIndent(buf, 2); - virBufferEscapeString(buf, "\n", formatStr); - if (virDomainDiskSourceFormat(buf, disk->mirror, 0, false, 0, xmlopt) = < 0) + virBufferEscapeString(&childBuf, "\n", formatStr); + if (virDomainDiskSourceFormat(&childBuf, disk->mirror, 0, false, 0, xm= lopt) < 0) + return -1; + + if (virXMLFormatElement(buf, "mirror", &attrBuf, &childBuf) < 0) return -1; - virBufferAdjustIndent(buf, -2); - virBufferAddLit(buf, "\n"); return 0; } --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list