From nobody Mon Feb 9 18:45:16 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 15529245624641003.0619825917661; Mon, 18 Mar 2019 08:56:02 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1220381DE3; Mon, 18 Mar 2019 15:56:00 +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 DD26D619F9; Mon, 18 Mar 2019 15:55:59 +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 8BF163F5A0; Mon, 18 Mar 2019 15:55:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x2IFtaCF022670 for ; Mon, 18 Mar 2019 11:55:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 98AFD1001DC8; Mon, 18 Mar 2019 15:55:36 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1FC061001E6A for ; Mon, 18 Mar 2019 15:55:35 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Mon, 18 Mar 2019 16:55:01 +0100 Message-Id: <1a99c5f9e5152179c92266da673823cd91703680.1552924270.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 12/34] conf: Add possibility to format full chain with virDomainStorageSourceFormatFull 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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 18 Mar 2019 15:56:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Add switch which will allow formating full chain. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 11 ++++++++++- src/conf/domain_conf.h | 1 + src/qemu/qemu_domain.c | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b67f9bbd2c..fb98629c77 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -23910,6 +23910,7 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf, * @src: storage source to format * @elemname: name of the top level element to use * @status: output status-XML style private data + * @backingStore: output full backing chain of @src * @xmlopt: formatter callback data structure * * Formats @src into a XML element called @elemname. The element has both = 'type' @@ -23920,6 +23921,7 @@ virDomainStorageSourceFormatFull(virBufferPtr buf, virStorageSourcePtr src, const char *elemname, bool status, + bool backingStore, virDomainXMLOptionPtr xmlopt) { VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; @@ -23939,7 +23941,14 @@ virDomainStorageSourceFormatFull(virBufferPtr buf, true, true, 0, xmlopt) < 0) return -1; - return virXMLFormatElement(buf, elemname, &attrBuf, &childBuf); + if (virXMLFormatElement(buf, elemname, &attrBuf, &childBuf) < 0) + return -1; + + if (backingStore && src->backingStore && + virDomainDiskBackingStoreFormat(buf, src->backingStore, xmlopt, fl= ags) < 0) + return -1; + + return 0; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index b373dbf939..0bdd6c0f55 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3465,6 +3465,7 @@ virDomainStorageSourceFormatFull(virBufferPtr buf, virStorageSourcePtr src, const char *elemname, bool status, + bool backingStore, virDomainXMLOptionPtr xmlopt) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 78287b4d3e..ea70979f8b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2364,7 +2364,7 @@ qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPt= r buf, if (diskPriv->migrSource && virDomainStorageSourceFormatFull(&childBuf, diskPriv->migrSour= ce, - "migrationSource", true, + "migrationSource", true, fals= e, priv->driver->xmlopt) < 0) goto cleanup; --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list