From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 15532776762421016.8352339692033;
 Fri, 22 Mar 2019 11:01:16 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
 [10.5.11.22])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 763FA88AB6;
	Fri, 22 Mar 2019 18:01:13 +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 3ED691001DE4;
	Fri, 22 Mar 2019 18:01:13 +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 D3E4E3FB11;
	Fri, 22 Mar 2019 18:01:12 +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 x2MI1CiY008806 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:12 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 16B9A5D9D2; Fri, 22 Mar 2019 18:01:12 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 8FB6E5D9D4
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:09 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:37 +0100
Message-Id: 
 <0ccb1739eaf08453bc7ea67b4f181afeb9e573a2.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 01/29] conf: Format seclabels for <backingStore>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]);
 Fri, 22 Mar 2019 18:01:14 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

We parse the seclabels and use them internally so omitting them when
formatting would be misleading. Additionally our schema actually allows
them.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/conf/domain_conf.c                                    | 3 +--
 tests/qemuxml2argvdata/disk-backing-chains.xml            | 6 +++++-
 tests/qemuxml2xmloutdata/disk-backing-chains-active.xml   | 6 +++++-
 tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml | 6 +++++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 9d8eabb42a..87db233d9f 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23876,8 +23876,7 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf,
     virBufferAdjustIndent(buf, 2);

     virBufferAsprintf(buf, "<format type=3D'%s'/>\n", format);
-    /* We currently don't output seclabels for backing chain element */
-    if (virDomainDiskSourceFormatInternal(buf, backingStore, 0, flags, fal=
se,
+    if (virDomainDiskSourceFormatInternal(buf, backingStore, 0, flags, tru=
e,
                                           false, xmlopt) < 0 ||
         virDomainDiskBackingStoreFormat(buf, backingStore->backingStore,
                                         xmlopt, flags) < 0)
diff --git a/tests/qemuxml2argvdata/disk-backing-chains.xml b/tests/qemuxml=
2argvdata/disk-backing-chains.xml
index 703c60c439..2eaafb34e7 100644
--- a/tests/qemuxml2argvdata/disk-backing-chains.xml
+++ b/tests/qemuxml2argvdata/disk-backing-chains.xml
@@ -38,7 +38,11 @@
           <source file=3D'/tmp/image2.qcow'/>
           <backingStore type=3D'file' index=3D'3'>
             <format type=3D'qcow2'/>
-            <source file=3D'/tmp/image3.qcow'/>
+            <source file=3D'/tmp/image3.qcow'>
+              <seclabel model=3D'selinux' relabel=3D'yes'>
+                <label>system_u:system_r:public_content_t:s0</label>
+              </seclabel>
+            </source>
             <backingStore type=3D'file' index=3D'4'>
               <format type=3D'qcow2'/>
               <source file=3D'/tmp/image4.qcow'/>
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml b/test=
s/qemuxml2xmloutdata/disk-backing-chains-active.xml
index d1fd2442c3..e24956f106 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml
@@ -39,7 +39,11 @@
           <source file=3D'/tmp/image2.qcow'/>
           <backingStore type=3D'file' index=3D'3'>
             <format type=3D'qcow2'/>
-            <source file=3D'/tmp/image3.qcow'/>
+            <source file=3D'/tmp/image3.qcow'>
+              <seclabel model=3D'selinux' relabel=3D'yes'>
+                <label>system_u:system_r:public_content_t:s0</label>
+              </seclabel>
+            </source>
             <backingStore type=3D'file' index=3D'4'>
               <format type=3D'qcow2'/>
               <source file=3D'/tmp/image4.qcow'/>
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml b/te=
sts/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
index c1af58ff6f..e39e218873 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
@@ -39,7 +39,11 @@
           <source file=3D'/tmp/image2.qcow'/>
           <backingStore type=3D'file'>
             <format type=3D'qcow2'/>
-            <source file=3D'/tmp/image3.qcow'/>
+            <source file=3D'/tmp/image3.qcow'>
+              <seclabel model=3D'selinux' relabel=3D'yes'>
+                <label>system_u:system_r:public_content_t:s0</label>
+              </seclabel>
+            </source>
             <backingStore type=3D'file'>
               <format type=3D'qcow2'/>
               <source file=3D'/tmp/image4.qcow'/>
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277681967386.1401524773497;
 Fri, 22 Mar 2019 11:01:21 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id 15D14307B485;
	Fri, 22 Mar 2019 18:01: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 D3E735D9D2;
	Fri, 22 Mar 2019 18:01:19 +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 79D2E18033A2;
	Fri, 22 Mar 2019 18:01:19 +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 x2MI1Coc008811 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:12 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id DBC3D5D9D4; Fri, 22 Mar 2019 18:01:12 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 6193C5D9D2
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:12 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:38 +0100
Message-Id: 
 <3bf6019d9a1d4ab555783327a44bff36f621c74e.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 02/29] conf: Remove @seclabels from
	virDomainStorageSourceFormat
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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.14
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]);
 Fri, 22 Mar 2019 18:01:20 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

All callers including transitive callers through
virDomainDiskSourceFormatInternal always pass true. Remove the argument.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/conf/domain_conf.c | 15 ++++++---------
 src/conf/domain_conf.h |  3 +--
 src/qemu/qemu_domain.c |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 87db233d9f..69fd4a7c57 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23720,8 +23720,7 @@ int
 virDomainStorageSourceFormat(virBufferPtr attrBuf,
                              virBufferPtr childBuf,
                              virStorageSourcePtr src,
-                             unsigned int flags,
-                             bool seclabels)
+                             unsigned int flags)
 {
     switch ((virStorageType)src->type) {
     case VIR_STORAGE_TYPE_FILE:
@@ -23761,7 +23760,7 @@ virDomainStorageSourceFormat(virBufferPtr attrBuf,
         return -1;
     }

-    if (seclabels && src->type !=3D VIR_STORAGE_TYPE_NETWORK)
+    if (src->type !=3D VIR_STORAGE_TYPE_NETWORK)
         virDomainSourceDefFormatSeclabel(childBuf, src->nseclabels,
                                          src->seclabels, flags);

@@ -23793,7 +23792,6 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf,
                                   virStorageSourcePtr src,
                                   int policy,
                                   unsigned int flags,
-                                  bool seclabels,
                                   bool attrIndex,
                                   virDomainXMLOptionPtr xmlopt)
 {
@@ -23803,8 +23801,7 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf,

     virBufferSetChildIndent(&childBuf, buf);

-    if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src, flags,
-                                     seclabels) < 0)
+    if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src, flags) < 0)
         goto cleanup;

     if (policy && src->type !=3D VIR_STORAGE_TYPE_NETWORK)
@@ -23834,7 +23831,7 @@ virDomainDiskSourceFormat(virBufferPtr buf,
                           unsigned int flags,
                           virDomainXMLOptionPtr xmlopt)
 {
-    return virDomainDiskSourceFormatInternal(buf, src, policy, flags, true,
+    return virDomainDiskSourceFormatInternal(buf, src, policy, flags,
                                              false, xmlopt);
 }

@@ -23876,7 +23873,7 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf,
     virBufferAdjustIndent(buf, 2);

     virBufferAsprintf(buf, "<format type=3D'%s'/>\n", format);
-    if (virDomainDiskSourceFormatInternal(buf, backingStore, 0, flags, tru=
e,
+    if (virDomainDiskSourceFormatInternal(buf, backingStore, 0, flags,
                                           false, xmlopt) < 0 ||
         virDomainDiskBackingStoreFormat(buf, backingStore->backingStore,
                                         xmlopt, flags) < 0)
@@ -24135,7 +24132,7 @@ virDomainDiskDefFormat(virBufferPtr buf,
         virStorageAuthDefFormat(buf, def->src->auth);

     if (virDomainDiskSourceFormatInternal(buf, def->src, def->startupPolic=
y,
-                                          flags, true, true, xmlopt) < 0)
+                                          flags, true, xmlopt) < 0)
         return -1;

     /* Don't format backingStore to inactive XMLs until the code for
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 4a25480662..25c10a9af3 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3459,8 +3459,7 @@ int virDomainDiskDefCheckDuplicateInfo(const virDomai=
nDiskDef *a,
 int virDomainStorageSourceFormat(virBufferPtr attrBuf,
                                  virBufferPtr childBuf,
                                  virStorageSourcePtr src,
-                                 unsigned int flags,
-                                 bool seclabels)
+                                 unsigned int flags)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);

 int virDomainStorageSourceParse(xmlNodePtr node,
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 9ca4ca33e5..a1b39220d1 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2358,7 +2358,7 @@ qemuDomainObjPrivateXMLFormatNBDMigrationSource(virBu=
fferPtr buf,
                       virStorageFileFormatTypeToString(src->format));

     if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src,
-                                     VIR_DOMAIN_DEF_FORMAT_STATUS, true) <=
 0)
+                                     VIR_DOMAIN_DEF_FORMAT_STATUS) < 0)
         goto cleanup;

     if (qemuStorageSourcePrivateDataFormat(src, &privateDataBuf) < 0)
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277678825686.6688252470747;
 Fri, 22 Mar 2019 11:01:18 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
 [10.5.11.22])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 9C1E631500AD;
	Fri, 22 Mar 2019 18:01:16 +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 5FD0E1001DFD;
	Fri, 22 Mar 2019 18:01:16 +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 EB23F180338C;
	Fri, 22 Mar 2019 18:01:15 +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 x2MI1DwP008819 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:13 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id ABC245D9E1; Fri, 22 Mar 2019 18:01:13 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 33BD25D9D2
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:13 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:39 +0100
Message-Id: 
 <ea859b5395515a4d06721a2a89941a6bdcbfed7a.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 03/29] conf: Merge
	virDomainDiskSourceFormatInternal into virDomainDiskSourceFormat
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]);
 Fri, 22 Mar 2019 18:01:17 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Remove the wrapper and fix callers.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/conf/domain_conf.c   | 35 +++++++++++------------------------
 src/conf/domain_conf.h   |  1 +
 src/conf/snapshot_conf.c |  2 +-
 tests/qemublocktest.c    |  2 +-
 tests/virstoragetest.c   |  2 +-
 5 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 69fd4a7c57..adb20e33f2 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23787,13 +23787,13 @@ virDomainStorageSourceFormat(virBufferPtr attrBuf,
 }


-static int
-virDomainDiskSourceFormatInternal(virBufferPtr buf,
-                                  virStorageSourcePtr src,
-                                  int policy,
-                                  unsigned int flags,
-                                  bool attrIndex,
-                                  virDomainXMLOptionPtr xmlopt)
+int
+virDomainDiskSourceFormat(virBufferPtr buf,
+                          virStorageSourcePtr src,
+                          int policy,
+                          bool attrIndex,
+                          unsigned int flags,
+                          virDomainXMLOptionPtr xmlopt)
 {
     VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER;
     VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER;
@@ -23824,18 +23824,6 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf,
 }


-int
-virDomainDiskSourceFormat(virBufferPtr buf,
-                          virStorageSourcePtr src,
-                          int policy,
-                          unsigned int flags,
-                          virDomainXMLOptionPtr xmlopt)
-{
-    return virDomainDiskSourceFormatInternal(buf, src, policy, flags,
-                                             false, xmlopt);
-}
-
-
 static int
 virDomainDiskBackingStoreFormat(virBufferPtr buf,
                                 virStorageSourcePtr backingStore,
@@ -23873,8 +23861,7 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf,
     virBufferAdjustIndent(buf, 2);

     virBufferAsprintf(buf, "<format type=3D'%s'/>\n", format);
-    if (virDomainDiskSourceFormatInternal(buf, backingStore, 0, flags,
-                                          false, xmlopt) < 0 ||
+    if (virDomainDiskSourceFormat(buf, backingStore, 0, false, flags, xmlo=
pt) < 0 ||
         virDomainDiskBackingStoreFormat(buf, backingStore->backingStore,
                                         xmlopt, flags) < 0)
         return -1;
@@ -24035,7 +24022,7 @@ virDomainDiskDefFormatMirror(virBufferPtr buf,
     virBufferAddLit(buf, ">\n");
     virBufferAdjustIndent(buf, 2);
     virBufferEscapeString(buf, "<format type=3D'%s'/>\n", formatStr);
-    if (virDomainDiskSourceFormat(buf, disk->mirror, 0, 0, xmlopt) < 0)
+    if (virDomainDiskSourceFormat(buf, disk->mirror, 0, false, 0, xmlopt) =
< 0)
         return -1;
     virBufferAdjustIndent(buf, -2);
     virBufferAddLit(buf, "</mirror>\n");
@@ -24131,8 +24118,8 @@ virDomainDiskDefFormat(virBufferPtr buf,
     if (def->src->auth && !def->src->authInherited)
         virStorageAuthDefFormat(buf, def->src->auth);

-    if (virDomainDiskSourceFormatInternal(buf, def->src, def->startupPolic=
y,
-                                          flags, true, xmlopt) < 0)
+    if (virDomainDiskSourceFormat(buf, def->src, def->startupPolicy, true,
+                                  flags, xmlopt) < 0)
         return -1;

     /* Don't format backingStore to inactive XMLs until the code for
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 25c10a9af3..f0c2a51212 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3014,6 +3014,7 @@ int virDomainDefFormatInternal(virDomainDefPtr def,
 int virDomainDiskSourceFormat(virBufferPtr buf,
                               virStorageSourcePtr src,
                               int policy,
+                              bool attrIndex,
                               unsigned int flags,
                               virDomainXMLOptionPtr xmlopt);

diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 52abafab0f..58d2cfee99 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -776,7 +776,7 @@ virDomainSnapshotDiskDefFormat(virBufferPtr buf,
     if (disk->src->format > 0)
         virBufferEscapeString(buf, "<driver type=3D'%s'/>\n",
                               virStorageFileFormatTypeToString(disk->src->=
format));
-    if (virDomainDiskSourceFormat(buf, disk->src, 0, 0, xmlopt) < 0)
+    if (virDomainDiskSourceFormat(buf, disk->src, 0, false, 0, xmlopt) < 0)
         return -1;

     virBufferAdjustIndent(buf, -2);
diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index becd31a0ad..46e75c2df5 100644
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -86,7 +86,7 @@ testBackingXMLjsonXML(const void *args)
         return -1;
     }

-    if (virDomainDiskSourceFormat(&buf, jsonsrc, 0, 0, NULL) < 0 ||
+    if (virDomainDiskSourceFormat(&buf, jsonsrc, 0, false, 0, NULL) < 0 ||
         !(actualxml =3D virBufferContentAndReset(&buf))) {
         fprintf(stderr, "failed to format disk source xml\n");
         return -1;
diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index fb98903f02..d29181dea9 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -657,7 +657,7 @@ testBackingParse(const void *args)
         goto cleanup;
     }

-    if (virDomainDiskSourceFormat(&buf, src, 0, 0, NULL) < 0 ||
+    if (virDomainDiskSourceFormat(&buf, src, 0, false, 0, NULL) < 0 ||
         !(xml =3D virBufferContentAndReset(&buf))) {
         fprintf(stderr, "failed to format disk source xml\n");
         goto cleanup;
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277684137232.84227896927632;
 Fri, 22 Mar 2019 11:01:24 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id E6C1030821B5;
	Fri, 22 Mar 2019 18:01:21 +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 AEE3B5D9D2;
	Fri, 22 Mar 2019 18:01:21 +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 5C68A3FB13;
	Fri, 22 Mar 2019 18:01:21 +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 x2MI1Ehs008828 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:14 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 7F2E55DA2C; Fri, 22 Mar 2019 18:01:14 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 06F175D9D2
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:13 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:40 +0100
Message-Id: 
 <7838026154e1c8e8a4ab2db6ad9debcc162e1a8d.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 04/29] conf: Export virDomainDiskSourceFormat
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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.14
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]);
 Fri, 22 Mar 2019 18:01:22 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/libvirt_private.syms | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index bf5625fbf4..c26c525d37 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -354,6 +354,7 @@ virDomainDiskSetDriver;
 virDomainDiskSetFormat;
 virDomainDiskSetSource;
 virDomainDiskSetType;
+virDomainDiskSourceFormat;
 virDomainDiskTranslateSourcePool;
 virDomainFeatureTypeFromString;
 virDomainFeatureTypeToString;
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277687069409.4870262390159;
 Fri, 22 Mar 2019 11:01:27 -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 4FBBD3168900;
	Fri, 22 Mar 2019 18:01:25 +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 A077460BFE;
	Fri, 22 Mar 2019 18:01:24 +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 4D8C33FB15;
	Fri, 22 Mar 2019 18:01:24 +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 x2MI1FTQ008835 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:15 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 539A85D9E1; Fri, 22 Mar 2019 18:01:15 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id CE1715D9D2
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:14 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:41 +0100
Message-Id: 
 <57af2a367d431f258f7134b48a89554abfa360be.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 05/29] tests: qemuxml2xml: Use
	virdeterministichashmock.so
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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.41]);
 Fri, 22 Mar 2019 18:01:26 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Block job related data will be stored in a has table and formatted into
the status XML. Use the mock to guarantee stable tests.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 tests/qemuxml2xmltest.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 83a0d1cf7b..408d20a92a 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1305,7 +1305,8 @@ mymain(void)

 VIR_TEST_MAIN_PRELOAD(mymain,
                       abs_builddir "/.libs/virpcimock.so",
-                      abs_builddir "/.libs/virrandommock.so")
+                      abs_builddir "/.libs/virrandommock.so",
+                      abs_builddir "/.libs/virdeterministichashmock.so")

 #else

--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277682334258.39183313822207;
 Fri, 22 Mar 2019 11:01:22 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id 733B0308623D;
	Fri, 22 Mar 2019 18:01: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 3D85F5D70A;
	Fri, 22 Mar 2019 18:01: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 DB3ED181A000;
	Fri, 22 Mar 2019 18:01:19 +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 x2MI1G2c008844 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:16 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 233D25D9D4; Fri, 22 Mar 2019 18:01:16 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id A04C85D9D2
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:15 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:42 +0100
Message-Id: 
 <e3c1c8f673670cf350ed9deb93389fe5791dcdf6.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 06/29] tests: qemustatusxml2xml: Add another
	disk to migration-out-nbd-tls case
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]);
 Fri, 22 Mar 2019 18:01:21 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Upcomming change will modify some aspects. To allow testing upgrade path
add another disk.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 .../migration-out-nbd-tls-in.xml              | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml b/tes=
ts/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml
index be1dc7347e..f3bbc752b6 100644
--- a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml
+++ b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml
@@ -247,6 +247,17 @@
         </privateData>
       </migrationSource>
     </disk>
+    <disk dev=3D'vdc' migrating=3D'yes'>
+      <migrationSource type=3D'network' format=3D'raw' protocol=3D'nbd' na=
me=3D'drive-virtio-disk2' tlsFromConfig=3D'0'>
+        <host name=3D'andariel.usersys.redhat.com' port=3D'49152'/>
+        <privateData>
+          <nodenames>
+            <nodename type=3D'storage' name=3D'migration-vdc-storage'/>
+            <nodename type=3D'format' name=3D'migration-vdc-format'/>
+          </nodenames>
+        </privateData>
+      </migrationSource>
+    </disk>
     <disk dev=3D'hda' migrating=3D'no'/>
   </job>
   <devices>
@@ -334,6 +345,14 @@
         <alias name=3D'virtio-disk1'/>
         <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0b'=
 function=3D'0x0'/>
       </disk>
+      <disk type=3D'file' device=3D'disk'>
+        <driver name=3D'qemu' type=3D'qcow2'/>
+        <source file=3D'/var/lib/libvirt/images/b.qcow2'/>
+        <backingStore/>
+        <target dev=3D'vdc' bus=3D'virtio'/>
+        <alias name=3D'virtio-disk2'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0c'=
 function=3D'0x0'/>
+      </disk>
       <disk type=3D'file' device=3D'cdrom'>
         <driver name=3D'qemu' type=3D'raw'/>
         <source file=3D'/var/lib/libvirt/images/systemrescuecd-x86-4.9.5.i=
so'/>
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 155327768860077.49868827206353;
 Fri, 22 Mar 2019 11:01:28 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 8320D99DD9;
	Fri, 22 Mar 2019 18:01:26 +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 4EE0960142;
	Fri, 22 Mar 2019 18:01:26 +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 F26BA3FAF4;
	Fri, 22 Mar 2019 18:01:25 +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 x2MI1Hbc008854 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:17 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 2CBA55D739; Fri, 22 Mar 2019 18:01:17 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 71C645D9D4
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:16 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:43 +0100
Message-Id: 
 <16696ea1a806caed8a828926e8c119d2743c8dce.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 07/29] tests: qemustatusxml2xml: Add separate
	output for migration-out-nbd-tls
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]);
 Fri, 22 Mar 2019 18:01:27 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Upcomming change will modify some aspects. To allow testing upgrade path
add a separate output file so that we can see the conversion from old to
new config.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 .../migration-out-nbd-tls-out.xml             | 484 +++++++++++++++++-
 1 file changed, 483 insertions(+), 1 deletion(-)
 mode change 120000 =3D> 100644 tests/qemustatusxml2xmldata/migration-out-n=
bd-tls-out.xml

diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml b/te=
sts/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
deleted file mode 120000
index e8cdbdb55e..0000000000
--- a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
+++ /dev/null
@@ -1 +0,0 @@
-migration-out-nbd-tls-in.xml
\ No newline at end of file
diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml b/te=
sts/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
new file mode 100644
index 0000000000..f3bbc752b6
--- /dev/null
+++ b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
@@ -0,0 +1,483 @@
+<domstatus state=3D'running' reason=3D'booted' pid=3D'68472'>
+  <taint flag=3D'high-privileges'/>
+  <monitor path=3D'/var/lib/libvirt/qemu/domain-3-upstream/monitor.sock' j=
son=3D'1' type=3D'unix'/>
+  <namespaces>
+    <mount/>
+  </namespaces>
+  <vcpus>
+    <vcpu id=3D'0' pid=3D'68477'/>
+    <vcpu id=3D'1' pid=3D'68478'/>
+  </vcpus>
+  <qemuCaps>
+    <flag name=3D'kvm'/>
+    <flag name=3D'mem-path'/>
+    <flag name=3D'drive-serial'/>
+    <flag name=3D'monitor-json'/>
+    <flag name=3D'sdl'/>
+    <flag name=3D'netdev'/>
+    <flag name=3D'rtc'/>
+    <flag name=3D'vhost-net'/>
+    <flag name=3D'no-hpet'/>
+    <flag name=3D'no-kvm-pit'/>
+    <flag name=3D'nodefconfig'/>
+    <flag name=3D'boot-menu'/>
+    <flag name=3D'fsdev'/>
+    <flag name=3D'name-process'/>
+    <flag name=3D'smbios-type'/>
+    <flag name=3D'spice'/>
+    <flag name=3D'vga-none'/>
+    <flag name=3D'boot-index'/>
+    <flag name=3D'hda-duplex'/>
+    <flag name=3D'drive-aio'/>
+    <flag name=3D'ccid-emulated'/>
+    <flag name=3D'ccid-passthru'/>
+    <flag name=3D'chardev-spicevmc'/>
+    <flag name=3D'virtio-tx-alg'/>
+    <flag name=3D'pci-multifunction'/>
+    <flag name=3D'virtio-blk-pci.ioeventfd'/>
+    <flag name=3D'sga'/>
+    <flag name=3D'virtio-blk-pci.event_idx'/>
+    <flag name=3D'virtio-net-pci.event_idx'/>
+    <flag name=3D'cache-directsync'/>
+    <flag name=3D'piix3-usb-uhci'/>
+    <flag name=3D'piix4-usb-uhci'/>
+    <flag name=3D'usb-ehci'/>
+    <flag name=3D'ich9-usb-ehci1'/>
+    <flag name=3D'vt82c686b-usb-uhci'/>
+    <flag name=3D'pci-ohci'/>
+    <flag name=3D'usb-redir'/>
+    <flag name=3D'usb-hub'/>
+    <flag name=3D'no-shutdown'/>
+    <flag name=3D'cache-unsafe'/>
+    <flag name=3D'ich9-ahci'/>
+    <flag name=3D'no-acpi'/>
+    <flag name=3D'fsdev-readonly'/>
+    <flag name=3D'virtio-blk-pci.scsi'/>
+    <flag name=3D'drive-copy-on-read'/>
+    <flag name=3D'fsdev-writeout'/>
+    <flag name=3D'drive-iotune'/>
+    <flag name=3D'system_wakeup'/>
+    <flag name=3D'scsi-disk.channel'/>
+    <flag name=3D'scsi-block'/>
+    <flag name=3D'transaction'/>
+    <flag name=3D'block-job-async'/>
+    <flag name=3D'scsi-cd'/>
+    <flag name=3D'ide-cd'/>
+    <flag name=3D'no-user-config'/>
+    <flag name=3D'hda-micro'/>
+    <flag name=3D'dump-guest-memory'/>
+    <flag name=3D'nec-usb-xhci'/>
+    <flag name=3D'balloon-event'/>
+    <flag name=3D'bridge'/>
+    <flag name=3D'lsi'/>
+    <flag name=3D'virtio-scsi-pci'/>
+    <flag name=3D'blockio'/>
+    <flag name=3D'disable-s3'/>
+    <flag name=3D'disable-s4'/>
+    <flag name=3D'usb-redir.filter'/>
+    <flag name=3D'ide-drive.wwn'/>
+    <flag name=3D'scsi-disk.wwn'/>
+    <flag name=3D'seccomp-sandbox'/>
+    <flag name=3D'reboot-timeout'/>
+    <flag name=3D'dump-guest-core'/>
+    <flag name=3D'seamless-migration'/>
+    <flag name=3D'block-commit'/>
+    <flag name=3D'vnc'/>
+    <flag name=3D'drive-mirror'/>
+    <flag name=3D'usb-redir.bootindex'/>
+    <flag name=3D'usb-host.bootindex'/>
+    <flag name=3D'blockdev-snapshot-sync'/>
+    <flag name=3D'qxl'/>
+    <flag name=3D'VGA'/>
+    <flag name=3D'cirrus-vga'/>
+    <flag name=3D'vmware-svga'/>
+    <flag name=3D'device-video-primary'/>
+    <flag name=3D'usb-serial'/>
+    <flag name=3D'usb-net'/>
+    <flag name=3D'add-fd'/>
+    <flag name=3D'nbd-server'/>
+    <flag name=3D'virtio-rng'/>
+    <flag name=3D'rng-random'/>
+    <flag name=3D'rng-egd'/>
+    <flag name=3D'dtb'/>
+    <flag name=3D'megasas'/>
+    <flag name=3D'ipv6-migration'/>
+    <flag name=3D'machine-opt'/>
+    <flag name=3D'machine-usb-opt'/>
+    <flag name=3D'tpm-passthrough'/>
+    <flag name=3D'tpm-tis'/>
+    <flag name=3D'pci-bridge'/>
+    <flag name=3D'vfio-pci'/>
+    <flag name=3D'vfio-pci.bootindex'/>
+    <flag name=3D'scsi-generic'/>
+    <flag name=3D'scsi-generic.bootindex'/>
+    <flag name=3D'mem-merge'/>
+    <flag name=3D'vnc-websocket'/>
+    <flag name=3D'drive-discard'/>
+    <flag name=3D'mlock'/>
+    <flag name=3D'vnc-share-policy'/>
+    <flag name=3D'device-del-event'/>
+    <flag name=3D'dmi-to-pci-bridge'/>
+    <flag name=3D'i440fx-pci-hole64-size'/>
+    <flag name=3D'q35-pci-hole64-size'/>
+    <flag name=3D'usb-storage'/>
+    <flag name=3D'usb-storage.removable'/>
+    <flag name=3D'virtio-mmio'/>
+    <flag name=3D'ich9-intel-hda'/>
+    <flag name=3D'kvm-pit-lost-tick-policy'/>
+    <flag name=3D'boot-strict'/>
+    <flag name=3D'pvpanic'/>
+    <flag name=3D'spice-file-xfer-disable'/>
+    <flag name=3D'spiceport'/>
+    <flag name=3D'usb-kbd'/>
+    <flag name=3D'host-pci-multidomain'/>
+    <flag name=3D'msg-timestamp'/>
+    <flag name=3D'active-commit'/>
+    <flag name=3D'change-backing-file'/>
+    <flag name=3D'memory-backend-ram'/>
+    <flag name=3D'numa'/>
+    <flag name=3D'memory-backend-file'/>
+    <flag name=3D'usb-audio'/>
+    <flag name=3D'rtc-reset-reinjection'/>
+    <flag name=3D'splash-timeout'/>
+    <flag name=3D'iothread'/>
+    <flag name=3D'migrate-rdma'/>
+    <flag name=3D'ivshmem'/>
+    <flag name=3D'drive-iotune-max'/>
+    <flag name=3D'VGA.vgamem_mb'/>
+    <flag name=3D'vmware-svga.vgamem_mb'/>
+    <flag name=3D'qxl.vgamem_mb'/>
+    <flag name=3D'pc-dimm'/>
+    <flag name=3D'machine-vmport-opt'/>
+    <flag name=3D'aes-key-wrap'/>
+    <flag name=3D'dea-key-wrap'/>
+    <flag name=3D'pci-serial'/>
+    <flag name=3D'vhost-user-multiqueue'/>
+    <flag name=3D'migration-event'/>
+    <flag name=3D'ioh3420'/>
+    <flag name=3D'x3130-upstream'/>
+    <flag name=3D'xio3130-downstream'/>
+    <flag name=3D'rtl8139'/>
+    <flag name=3D'e1000'/>
+    <flag name=3D'virtio-net'/>
+    <flag name=3D'gic-version'/>
+    <flag name=3D'incoming-defer'/>
+    <flag name=3D'virtio-gpu'/>
+    <flag name=3D'virtio-gpu.virgl'/>
+    <flag name=3D'virtio-keyboard'/>
+    <flag name=3D'virtio-mouse'/>
+    <flag name=3D'virtio-tablet'/>
+    <flag name=3D'virtio-input-host'/>
+    <flag name=3D'chardev-file-append'/>
+    <flag name=3D'ich9-disable-s3'/>
+    <flag name=3D'ich9-disable-s4'/>
+    <flag name=3D'vserport-change-event'/>
+    <flag name=3D'virtio-balloon-pci.deflate-on-oom'/>
+    <flag name=3D'mptsas1068'/>
+    <flag name=3D'qxl.vram64_size_mb'/>
+    <flag name=3D'chardev-logfile'/>
+    <flag name=3D'debug-threads'/>
+    <flag name=3D'secret'/>
+    <flag name=3D'pxb'/>
+    <flag name=3D'pxb-pcie'/>
+    <flag name=3D'device-tray-moved-event'/>
+    <flag name=3D'nec-usb-xhci-ports'/>
+    <flag name=3D'virtio-scsi-pci.iothread'/>
+    <flag name=3D'name-guest'/>
+    <flag name=3D'qxl.max_outputs'/>
+    <flag name=3D'spice-unix'/>
+    <flag name=3D'drive-detect-zeroes'/>
+    <flag name=3D'tls-creds-x509'/>
+    <flag name=3D'display'/>
+    <flag name=3D'intel-iommu'/>
+    <flag name=3D'smm'/>
+    <flag name=3D'virtio-pci-disable-legacy'/>
+    <flag name=3D'query-hotpluggable-cpus'/>
+    <flag name=3D'virtio-net.rx_queue_size'/>
+    <flag name=3D'virtio-vga'/>
+    <flag name=3D'drive-iotune-max-length'/>
+    <flag name=3D'ivshmem-plain'/>
+    <flag name=3D'ivshmem-doorbell'/>
+    <flag name=3D'query-qmp-schema'/>
+    <flag name=3D'gluster.debug_level'/>
+    <flag name=3D'vhost-scsi'/>
+    <flag name=3D'drive-iotune-group'/>
+    <flag name=3D'query-cpu-model-expansion'/>
+    <flag name=3D'virtio-net.host_mtu'/>
+    <flag name=3D'nvdimm'/>
+    <flag name=3D'pcie-root-port'/>
+    <flag name=3D'query-cpu-definitions'/>
+    <flag name=3D'block-write-threshold'/>
+    <flag name=3D'query-named-block-nodes'/>
+    <flag name=3D'cpu-cache'/>
+    <flag name=3D'qemu-xhci'/>
+    <flag name=3D'kernel-irqchip'/>
+    <flag name=3D'kernel-irqchip.split'/>
+    <flag name=3D'intel-iommu.intremap'/>
+    <flag name=3D'intel-iommu.caching-mode'/>
+    <flag name=3D'intel-iommu.eim'/>
+    <flag name=3D'intel-iommu.device-iotlb'/>
+    <flag name=3D'virtio.iommu_platform'/>
+    <flag name=3D'virtio.ats'/>
+    <flag name=3D'loadparm'/>
+    <flag name=3D'vnc-multi-servers'/>
+    <flag name=3D'virtio-net.tx_queue_size'/>
+    <flag name=3D'chardev-reconnect'/>
+    <flag name=3D'virtio-gpu.max_outputs'/>
+    <flag name=3D'vxhs'/>
+    <flag name=3D'virtio-blk.num-queues'/>
+    <flag name=3D'vmcoreinfo'/>
+    <flag name=3D'numa.dist'/>
+    <flag name=3D'disk-share-rw'/>
+    <flag name=3D'iscsi.password-secret'/>
+    <flag name=3D'isa-serial'/>
+    <flag name=3D'dump-completed'/>
+    <flag name=3D'nbd-tls'/>
+    <flag name=3D'blockdev-del'/>
+  </qemuCaps>
+  <job type=3D'none' async=3D'migration out' phase=3D'perform3' flags=3D'0=
x0'>
+    <disk dev=3D'vdb' migrating=3D'yes'>
+      <migrationSource type=3D'network' format=3D'raw' protocol=3D'nbd' na=
me=3D'drive-virtio-disk1' tlsFromConfig=3D'0'>
+        <host name=3D'andariel.usersys.redhat.com' port=3D'49152'/>
+        <privateData>
+          <nodenames>
+            <nodename type=3D'storage' name=3D'migration-vdb-storage'/>
+            <nodename type=3D'format' name=3D'migration-vdb-format'/>
+          </nodenames>
+        </privateData>
+      </migrationSource>
+    </disk>
+    <disk dev=3D'vdc' migrating=3D'yes'>
+      <migrationSource type=3D'network' format=3D'raw' protocol=3D'nbd' na=
me=3D'drive-virtio-disk2' tlsFromConfig=3D'0'>
+        <host name=3D'andariel.usersys.redhat.com' port=3D'49152'/>
+        <privateData>
+          <nodenames>
+            <nodename type=3D'storage' name=3D'migration-vdc-storage'/>
+            <nodename type=3D'format' name=3D'migration-vdc-format'/>
+          </nodenames>
+        </privateData>
+      </migrationSource>
+    </disk>
+    <disk dev=3D'hda' migrating=3D'no'/>
+  </job>
+  <devices>
+    <device alias=3D'rng0'/>
+    <device alias=3D'sound0-codec0'/>
+    <device alias=3D'virtio-disk1'/>
+    <device alias=3D'virtio-serial0'/>
+    <device alias=3D'video0'/>
+    <device alias=3D'serial0'/>
+    <device alias=3D'sound0'/>
+    <device alias=3D'balloon0'/>
+    <device alias=3D'channel1'/>
+    <device alias=3D'channel0'/>
+    <device alias=3D'net0'/>
+    <device alias=3D'input0'/>
+    <device alias=3D'redir0'/>
+    <device alias=3D'redir1'/>
+    <device alias=3D'scsi0'/>
+    <device alias=3D'usb'/>
+    <device alias=3D'ide0-0-0'/>
+  </devices>
+  <numad nodeset=3D'0' cpuset=3D'0-7'/>
+  <libDir path=3D'/var/lib/libvirt/qemu/domain-3-upstream'/>
+  <channelTargetDir path=3D'/var/lib/libvirt/qemu/channel/target/domain-3-=
upstream'/>
+  <chardevStdioLogd/>
+  <allowReboot value=3D'yes'/>
+  <blockjobs active=3D'no'/>
+  <domain type=3D'kvm' id=3D'3'>
+    <name>upstream</name>
+    <uuid>dcf47dbd-46d1-4d5b-b442-262a806a333a</uuid>
+    <memory unit=3D'KiB'>1024000</memory>
+    <currentMemory unit=3D'KiB'>1024000</currentMemory>
+    <memoryBacking>
+      <access mode=3D'shared'/>
+    </memoryBacking>
+    <vcpu placement=3D'auto' current=3D'2'>8</vcpu>
+    <numatune>
+      <memory mode=3D'strict' placement=3D'auto'/>
+    </numatune>
+    <resource>
+      <partition>/machine</partition>
+    </resource>
+    <os>
+      <type arch=3D'x86_64' machine=3D'pc-i440fx-2.9'>hvm</type>
+      <bootmenu enable=3D'yes'/>
+    </os>
+    <features>
+      <acpi/>
+      <apic/>
+      <vmport state=3D'off'/>
+    </features>
+    <cpu>
+      <numa>
+        <cell id=3D'0' cpus=3D'0,2,4,6' memory=3D'512000' unit=3D'KiB'/>
+        <cell id=3D'1' cpus=3D'1,3,5,7' memory=3D'512000' unit=3D'KiB'/>
+      </numa>
+    </cpu>
+    <clock offset=3D'utc'>
+      <timer name=3D'rtc' tickpolicy=3D'catchup'/>
+      <timer name=3D'pit' tickpolicy=3D'delay'/>
+      <timer name=3D'hpet' present=3D'no'/>
+    </clock>
+    <on_poweroff>destroy</on_poweroff>
+    <on_reboot>restart</on_reboot>
+    <on_crash>restart</on_crash>
+    <pm>
+      <suspend-to-mem enabled=3D'no'/>
+      <suspend-to-disk enabled=3D'no'/>
+    </pm>
+    <devices>
+      <emulator>/usr/bin/qemu-system-x86_64</emulator>
+      <disk type=3D'file' device=3D'disk'>
+        <driver name=3D'qemu' type=3D'qcow2' discard=3D'unmap' detect_zero=
es=3D'on'/>
+        <source file=3D'/var/lib/libvirt/images/a.qcow2'/>
+        <backingStore type=3D'file' index=3D'1'>
+          <format type=3D'qcow2'/>
+          <source file=3D'/var/lib/libvirt/images/base.qcow2'>
+            <privateData>
+              <relPath>base.qcow2</relPath>
+            </privateData>
+          </source>
+          <backingStore/>
+        </backingStore>
+        <target dev=3D'vdb' bus=3D'virtio'/>
+        <alias name=3D'virtio-disk1'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0b'=
 function=3D'0x0'/>
+      </disk>
+      <disk type=3D'file' device=3D'disk'>
+        <driver name=3D'qemu' type=3D'qcow2'/>
+        <source file=3D'/var/lib/libvirt/images/b.qcow2'/>
+        <backingStore/>
+        <target dev=3D'vdc' bus=3D'virtio'/>
+        <alias name=3D'virtio-disk2'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x0c'=
 function=3D'0x0'/>
+      </disk>
+      <disk type=3D'file' device=3D'cdrom'>
+        <driver name=3D'qemu' type=3D'raw'/>
+        <source file=3D'/var/lib/libvirt/images/systemrescuecd-x86-4.9.5.i=
so'/>
+        <backingStore/>
+        <target dev=3D'hda' bus=3D'ide'/>
+        <readonly/>
+        <boot order=3D'1'/>
+        <alias name=3D'ide0-0-0'/>
+        <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' un=
it=3D'0'/>
+      </disk>
+      <controller type=3D'usb' index=3D'0' model=3D'ich9-ehci1'>
+        <alias name=3D'usb'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06'=
 function=3D'0x7'/>
+      </controller>
+      <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci1'>
+        <alias name=3D'usb'/>
+        <master startport=3D'0'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06'=
 function=3D'0x0' multifunction=3D'on'/>
+      </controller>
+      <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci2'>
+        <alias name=3D'usb'/>
+        <master startport=3D'2'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06'=
 function=3D'0x1'/>
+      </controller>
+      <controller type=3D'usb' index=3D'0' model=3D'ich9-uhci3'>
+        <alias name=3D'usb'/>
+        <master startport=3D'4'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x06'=
 function=3D'0x2'/>
+      </controller>
+      <controller type=3D'pci' index=3D'0' model=3D'pci-root'>
+        <alias name=3D'pci.0'/>
+      </controller>
+      <controller type=3D'virtio-serial' index=3D'0'>
+        <alias name=3D'virtio-serial0'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x05'=
 function=3D'0x0'/>
+      </controller>
+      <controller type=3D'ide' index=3D'0'>
+        <alias name=3D'ide'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01'=
 function=3D'0x1'/>
+      </controller>
+      <controller type=3D'scsi' index=3D'0' model=3D'lsilogic'>
+        <alias name=3D'scsi0'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x09'=
 function=3D'0x0'/>
+      </controller>
+      <controller type=3D'fdc' index=3D'0'>
+        <alias name=3D'fdc0'/>
+      </controller>
+      <interface type=3D'network'>
+        <mac address=3D'52:54:00:36:bd:3b'/>
+        <source network=3D'default'/>
+        <actual type=3D'network'>
+          <source bridge=3D'virbr0'/>
+        </actual>
+        <target dev=3D'vnet0'/>
+        <model type=3D'virtio'/>
+        <alias name=3D'net0'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03'=
 function=3D'0x0'/>
+      </interface>
+      <serial type=3D'pty'>
+        <source path=3D'/dev/pts/67'/>
+        <target type=3D'isa-serial' port=3D'0'>
+          <model name=3D'isa-serial'/>
+        </target>
+        <alias name=3D'serial0'/>
+      </serial>
+      <console type=3D'pty' tty=3D'/dev/pts/67'>
+        <source path=3D'/dev/pts/67'/>
+        <target type=3D'serial' port=3D'0'/>
+        <alias name=3D'serial0'/>
+      </console>
+      <channel type=3D'unix'>
+        <source mode=3D'bind' path=3D'/var/lib/libvirt/qemu/channel/target=
/domain-3-upstream/org.qemu.guest_agent.0'/>
+        <target type=3D'virtio' name=3D'org.qemu.guest_agent.0' state=3D'd=
isconnected'/>
+        <alias name=3D'channel0'/>
+        <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D=
'1'/>
+      </channel>
+      <channel type=3D'spicevmc'>
+        <target type=3D'virtio' name=3D'com.redhat.spice.0' state=3D'disco=
nnected'/>
+        <alias name=3D'channel1'/>
+        <address type=3D'virtio-serial' controller=3D'0' bus=3D'0' port=3D=
'2'/>
+      </channel>
+      <input type=3D'tablet' bus=3D'usb'>
+        <alias name=3D'input0'/>
+        <address type=3D'usb' bus=3D'0' port=3D'1'/>
+      </input>
+      <input type=3D'mouse' bus=3D'ps2'>
+        <alias name=3D'input1'/>
+      </input>
+      <input type=3D'keyboard' bus=3D'ps2'>
+        <alias name=3D'input2'/>
+      </input>
+      <graphics type=3D'spice' port=3D'5900' autoport=3D'yes' listen=3D'12=
7.0.0.1'>
+        <listen type=3D'address' address=3D'127.0.0.1' fromConfig=3D'1' au=
toGenerated=3D'no'/>
+        <image compression=3D'off'/>
+      </graphics>
+      <sound model=3D'ich6'>
+        <alias name=3D'sound0'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04'=
 function=3D'0x0'/>
+      </sound>
+      <video>
+        <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'16384' =
heads=3D'1' primary=3D'yes'/>
+        <alias name=3D'video0'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x02'=
 function=3D'0x0'/>
+      </video>
+      <redirdev bus=3D'usb' type=3D'spicevmc'>
+        <alias name=3D'redir0'/>
+        <address type=3D'usb' bus=3D'0' port=3D'2'/>
+      </redirdev>
+      <redirdev bus=3D'usb' type=3D'spicevmc'>
+        <alias name=3D'redir1'/>
+        <address type=3D'usb' bus=3D'0' port=3D'3'/>
+      </redirdev>
+      <memballoon model=3D'virtio'>
+        <alias name=3D'balloon0'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x08'=
 function=3D'0x0'/>
+      </memballoon>
+      <rng model=3D'virtio'>
+        <backend model=3D'random'>/dev/random</backend>
+        <alias name=3D'rng0'/>
+        <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x07'=
 function=3D'0x0'/>
+      </rng>
+    </devices>
+    <seclabel type=3D'dynamic' model=3D'dac' relabel=3D'yes'>
+      <label>+0:+0</label>
+      <imagelabel>+0:+0</imagelabel>
+    </seclabel>
+  </domain>
+</domstatus>
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277687272834.030491115996;
 Fri, 22 Mar 2019 11:01:27 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 564225D671;
	Fri, 22 Mar 2019 18:01:25 +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 2013960145;
	Fri, 22 Mar 2019 18:01:25 +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 B7F16181A009;
	Fri, 22 Mar 2019 18:01:24 +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 x2MI1HlT008864 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:17 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id E4A0F5D9D2; Fri, 22 Mar 2019 18:01:17 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 6CB7A5D9CC
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:17 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:44 +0100
Message-Id: 
 <b385294cab1d16cfadef8a9200b95e7830342686.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 08/29] qemu: domain: Modify <migrationSource>
	to look like <disk>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]);
 Fri, 22 Mar 2019 18:01:26 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

When adding <migrationSource> I've used a slightly unusual approach. To
allow using the disk source XML parser and formatter convert
<migrationSource> to look like <disk>. This means that <source> will be
added as a subelement of <migrationSource> rather than being formatted
inline.

Conversion from the old format in the parser is very simple as it
involves only moving the XPath context current node slightly if the new
format is found.

The status XML to XML test shows that the upgrade is done correctly.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/qemu/qemu_domain.c                        | 23 ++++++------
 .../migration-out-nbd-tls-in.xml              | 18 +++++-----
 .../migration-out-nbd-tls-out.xml             | 36 ++++++++++---------
 3 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index a1b39220d1..3b0887a194 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2343,28 +2343,21 @@ qemuDomainObjPrivateXMLFormatPR(virBufferPtr buf,

 static int
 qemuDomainObjPrivateXMLFormatNBDMigrationSource(virBufferPtr buf,
-                                                virStorageSourcePtr src)
+                                                virStorageSourcePtr src,
+                                                virDomainXMLOptionPtr xmlo=
pt)
 {
     VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER;
     VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER;
-    VIR_AUTOCLEAN(virBuffer) privateDataBuf =3D VIR_BUFFER_INITIALIZER;
     int ret =3D -1;

     virBufferSetChildIndent(&childBuf, buf);
-    virBufferSetChildIndent(&privateDataBuf, &childBuf);

     virBufferAsprintf(&attrBuf, " type=3D'%s' format=3D'%s'",
                       virStorageTypeToString(src->type),
                       virStorageFileFormatTypeToString(src->format));

-    if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src,
-                                     VIR_DOMAIN_DEF_FORMAT_STATUS) < 0)
-        goto cleanup;
-
-    if (qemuStorageSourcePrivateDataFormat(src, &privateDataBuf) < 0)
-        goto cleanup;
-
-    if (virXMLFormatElement(&childBuf, "privateData", NULL, &privateDataBu=
f) < 0)
+    if (virDomainDiskSourceFormat(&childBuf, src, 0, false,
+                                  VIR_DOMAIN_DEF_FORMAT_STATUS, xmlopt) < =
0)
         goto cleanup;

     if (virXMLFormatElement(buf, "migrationSource", &attrBuf, &childBuf) <=
 0)
@@ -2381,6 +2374,7 @@ static int
 qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPtr buf,
                                           virDomainObjPtr vm)
 {
+    qemuDomainObjPrivatePtr priv =3D vm->privateData;
     VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER;
     VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER;
     size_t i;
@@ -2399,7 +2393,8 @@ qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPt=
r buf,

         if (diskPriv->migrSource &&
             qemuDomainObjPrivateXMLFormatNBDMigrationSource(&childBuf,
-                                                            diskPriv->migr=
Source) < 0)
+                                                            diskPriv->migr=
Source,
+                                                            priv->driver->=
xmlopt) < 0)
             goto cleanup;

         if (virXMLFormatElement(buf, "disk", &attrBuf, &childBuf) < 0)
@@ -2724,6 +2719,7 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr n=
ode,
     char *type =3D NULL;
     int ret =3D -1;
     VIR_AUTOUNREF(virStorageSourcePtr) migrSource =3D NULL;
+    xmlNodePtr sourceNode;

     ctxt->node =3D node;

@@ -2759,6 +2755,9 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr n=
ode,
         goto cleanup;
     }

+    if ((sourceNode =3D virXPathNode("./source", ctxt)))
+        ctxt->node =3D sourceNode;
+
     if (virDomainStorageSourceParse(ctxt->node, ctxt, migrSource,
                                     VIR_DOMAIN_DEF_PARSE_STATUS, NULL) < 0)
         goto cleanup;
diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml b/tes=
ts/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml
index f3bbc752b6..2cd6c9a5e9 100644
--- a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml
+++ b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml
@@ -237,14 +237,16 @@
   </qemuCaps>
   <job type=3D'none' async=3D'migration out' phase=3D'perform3' flags=3D'0=
x0'>
     <disk dev=3D'vdb' migrating=3D'yes'>
-      <migrationSource type=3D'network' format=3D'raw' protocol=3D'nbd' na=
me=3D'drive-virtio-disk1' tlsFromConfig=3D'0'>
-        <host name=3D'andariel.usersys.redhat.com' port=3D'49152'/>
-        <privateData>
-          <nodenames>
-            <nodename type=3D'storage' name=3D'migration-vdb-storage'/>
-            <nodename type=3D'format' name=3D'migration-vdb-format'/>
-          </nodenames>
-        </privateData>
+      <migrationSource type=3D'network' format=3D'raw'>
+        <source protocol=3D'nbd' name=3D'drive-virtio-disk1' tlsFromConfig=
=3D'0'>
+          <host name=3D'andariel.usersys.redhat.com' port=3D'49152'/>
+          <privateData>
+            <nodenames>
+              <nodename type=3D'storage' name=3D'migration-vdb-storage'/>
+              <nodename type=3D'format' name=3D'migration-vdb-format'/>
+            </nodenames>
+          </privateData>
+        </source>
       </migrationSource>
     </disk>
     <disk dev=3D'vdc' migrating=3D'yes'>
diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml b/te=
sts/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
index f3bbc752b6..869f37d488 100644
--- a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
+++ b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
@@ -237,25 +237,29 @@
   </qemuCaps>
   <job type=3D'none' async=3D'migration out' phase=3D'perform3' flags=3D'0=
x0'>
     <disk dev=3D'vdb' migrating=3D'yes'>
-      <migrationSource type=3D'network' format=3D'raw' protocol=3D'nbd' na=
me=3D'drive-virtio-disk1' tlsFromConfig=3D'0'>
-        <host name=3D'andariel.usersys.redhat.com' port=3D'49152'/>
-        <privateData>
-          <nodenames>
-            <nodename type=3D'storage' name=3D'migration-vdb-storage'/>
-            <nodename type=3D'format' name=3D'migration-vdb-format'/>
-          </nodenames>
-        </privateData>
+      <migrationSource type=3D'network' format=3D'raw'>
+        <source protocol=3D'nbd' name=3D'drive-virtio-disk1' tlsFromConfig=
=3D'0'>
+          <host name=3D'andariel.usersys.redhat.com' port=3D'49152'/>
+          <privateData>
+            <nodenames>
+              <nodename type=3D'storage' name=3D'migration-vdb-storage'/>
+              <nodename type=3D'format' name=3D'migration-vdb-format'/>
+            </nodenames>
+          </privateData>
+        </source>
       </migrationSource>
     </disk>
     <disk dev=3D'vdc' migrating=3D'yes'>
-      <migrationSource type=3D'network' format=3D'raw' protocol=3D'nbd' na=
me=3D'drive-virtio-disk2' tlsFromConfig=3D'0'>
-        <host name=3D'andariel.usersys.redhat.com' port=3D'49152'/>
-        <privateData>
-          <nodenames>
-            <nodename type=3D'storage' name=3D'migration-vdc-storage'/>
-            <nodename type=3D'format' name=3D'migration-vdc-format'/>
-          </nodenames>
-        </privateData>
+      <migrationSource type=3D'network' format=3D'raw'>
+        <source protocol=3D'nbd' name=3D'drive-virtio-disk2' tlsFromConfig=
=3D'0'>
+          <host name=3D'andariel.usersys.redhat.com' port=3D'49152'/>
+          <privateData>
+            <nodenames>
+              <nodename type=3D'storage' name=3D'migration-vdc-storage'/>
+              <nodename type=3D'format' name=3D'migration-vdc-format'/>
+            </nodenames>
+          </privateData>
+        </source>
       </migrationSource>
     </disk>
     <disk dev=3D'hda' migrating=3D'no'/>
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277692563863.7933364674806;
 Fri, 22 Mar 2019 11:01:32 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id C3AD9C02E60C;
	Fri, 22 Mar 2019 18:01:30 +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 946355D78F;
	Fri, 22 Mar 2019 18:01:30 +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 4537C3FA48;
	Fri, 22 Mar 2019 18:01:30 +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 x2MI1IbS008871 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:18 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id B82975D964; Fri, 22 Mar 2019 18:01:18 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 405535D9CC
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:18 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:45 +0100
Message-Id: 
 <bdc3cb643ba73a1ec846297f6bb6906b73d39b46.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 09/29] conf: Unexport
	virDomainStorageSourceFormat
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]);
 Fri, 22 Mar 2019 18:01:31 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

It's not used outside of src/conf/domain_conf.c

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/conf/domain_conf.c   | 2 +-
 src/conf/domain_conf.h   | 5 -----
 src/libvirt_private.syms | 1 -
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index adb20e33f2..ec81d380d5 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23716,7 +23716,7 @@ virDomainDiskSourceFormatPrivateData(virBufferPtr b=
uf,
 }


-int
+static int
 virDomainStorageSourceFormat(virBufferPtr attrBuf,
                              virBufferPtr childBuf,
                              virStorageSourcePtr src,
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index f0c2a51212..cca81be013 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3457,11 +3457,6 @@ int virDomainDiskDefCheckDuplicateInfo(const virDoma=
inDiskDef *a,
                                        const virDomainDiskDef *b)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);

-int virDomainStorageSourceFormat(virBufferPtr attrBuf,
-                                 virBufferPtr childBuf,
-                                 virStorageSourcePtr src,
-                                 unsigned int flags)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);

 int virDomainStorageSourceParse(xmlNodePtr node,
                                 xmlXPathContextPtr ctxt,
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index c26c525d37..681ff911b6 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -564,7 +564,6 @@ virDomainStateReasonToString;
 virDomainStateTypeFromString;
 virDomainStateTypeToString;
 virDomainStorageNetworkParseHost;
-virDomainStorageSourceFormat;
 virDomainStorageSourceParse;
 virDomainTaintTypeFromString;
 virDomainTaintTypeToString;
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277697224105.17555003983716;
 Fri, 22 Mar 2019 11:01:37 -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 35FF93084295;
	Fri, 22 Mar 2019 18:01:35 +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 084BD60BF1;
	Fri, 22 Mar 2019 18:01:35 +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 9FF1B181A847;
	Fri, 22 Mar 2019 18:01:34 +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 x2MI1JYb008876 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:19 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 8949F5D9D6; Fri, 22 Mar 2019 18:01:19 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 1178E5D9CC
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:18 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:46 +0100
Message-Id: 
 <c17482bd1834ce98e96900a0f5bab104e535d489.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 10/29] conf: Simplify control flow in
	virDomainDiskSourceFormat
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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.40]);
 Fri, 22 Mar 2019 18:01:35 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Now that the cleanup is handled automatically it can be removed.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/conf/domain_conf.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ec81d380d5..fa4454a6ca 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23797,12 +23797,11 @@ virDomainDiskSourceFormat(virBufferPtr buf,
 {
     VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER;
     VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER;
-    int ret =3D -1;

     virBufferSetChildIndent(&childBuf, buf);

     if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src, flags) < 0)
-        goto cleanup;
+        return -1;

     if (policy && src->type !=3D VIR_STORAGE_TYPE_NETWORK)
         virBufferEscapeString(&attrBuf, " startupPolicy=3D'%s'",
@@ -23812,15 +23811,12 @@ virDomainDiskSourceFormat(virBufferPtr buf,
         virBufferAsprintf(&attrBuf, " index=3D'%u'", src->id);

     if (virDomainDiskSourceFormatPrivateData(&childBuf, src, flags, xmlopt=
) < 0)
-        goto cleanup;
+        return -1;

     if (virXMLFormatElement(buf, "source", &attrBuf, &childBuf) < 0)
-        goto cleanup;
-
-    ret =3D 0;
+        return -1;

- cleanup:
-    return ret;
+    return 0;
 }


--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277702039923.9376894950991;
 Fri, 22 Mar 2019 11:01:42 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 15CA533025A;
	Fri, 22 Mar 2019 18:01:40 +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 CDC4F60857;
	Fri, 22 Mar 2019 18:01:39 +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 7D29A3FA4D;
	Fri, 22 Mar 2019 18:01:39 +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 x2MI1KTW008884 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:20 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 5C9D65D9CC; Fri, 22 Mar 2019 18:01:20 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id D6AA15D9E1
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:19 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:47 +0100
Message-Id: 
 <072e21939832b2ad1f2d04974c6a2b0364d93327.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 11/29] conf: Avoid temporary variable in
	virDomainDiskBackingStoreFormat
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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.13
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:40 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Modify the check that the format is in range to be standalone and use
the convertor function directly.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/conf/domain_conf.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index fa4454a6ca..5adca7c29c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23826,7 +23826,6 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf,
                                 virDomainXMLOptionPtr xmlopt,
                                 unsigned int flags)
 {
-    const char *format;
     bool inactive =3D flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE;

     if (!backingStore)
@@ -23841,8 +23840,7 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf,
         return 0;
     }

-    if (backingStore->format <=3D 0 ||
-        !(format =3D virStorageFileFormatTypeToString(backingStore->format=
))) {
+    if (backingStore->format <=3D 0 || backingStore->format >=3D VIR_STORA=
GE_FILE_LAST) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("unexpected disk backing store format %d"),
                        backingStore->format);
@@ -23856,7 +23854,8 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf,
     virBufferAddLit(buf, ">\n");
     virBufferAdjustIndent(buf, 2);

-    virBufferAsprintf(buf, "<format type=3D'%s'/>\n", format);
+    virBufferAsprintf(buf, "<format type=3D'%s'/>\n",
+                      virStorageFileFormatTypeToString(backingStore->forma=
t));
     if (virDomainDiskSourceFormat(buf, backingStore, 0, false, flags, xmlo=
pt) < 0 ||
         virDomainDiskBackingStoreFormat(buf, backingStore->backingStore,
                                         xmlopt, flags) < 0)
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277706323768.3885967083812;
 Fri, 22 Mar 2019 11:01:46 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
 [10.5.11.22])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 9CCA23082B1F;
	Fri, 22 Mar 2019 18:01:44 +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 6CFD11001E8F;
	Fri, 22 Mar 2019 18:01:44 +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 1A5063F5CC;
	Fri, 22 Mar 2019 18:01:44 +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 x2MI1LFY008894 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:21 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 2C91B5D9D2; Fri, 22 Mar 2019 18:01:21 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id A8CD45D9CC
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:20 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:48 +0100
Message-Id: 
 <5c0cc8e11e9db159c9ca3b63988d39cc2aa06261.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 12/29] conf: Use virXMLFormatElement in
	virDomainDiskBackingStoreFormat
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]);
 Fri, 22 Mar 2019 18:01:45 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/conf/domain_conf.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 5adca7c29c..89e2900df2 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23826,8 +23826,12 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf,
                                 virDomainXMLOptionPtr xmlopt,
                                 unsigned int flags)
 {
+    VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER;
+    VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER;
     bool inactive =3D flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE;

+    virBufferSetChildIndent(&childBuf, buf);
+
     if (!backingStore)
         return 0;

@@ -23847,22 +23851,23 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf,
         return -1;
     }

-    virBufferAsprintf(buf, "<backingStore type=3D'%s'",
+    virBufferAsprintf(&attrBuf, " type=3D'%s'",
                       virStorageTypeToString(backingStore->type));
     if (backingStore->id !=3D 0)
-        virBufferAsprintf(buf, " index=3D'%u'", backingStore->id);
-    virBufferAddLit(buf, ">\n");
-    virBufferAdjustIndent(buf, 2);
+        virBufferAsprintf(&attrBuf, " index=3D'%u'", backingStore->id);

-    virBufferAsprintf(buf, "<format type=3D'%s'/>\n",
+    virBufferAsprintf(&childBuf, "<format type=3D'%s'/>\n",
                       virStorageFileFormatTypeToString(backingStore->forma=
t));
-    if (virDomainDiskSourceFormat(buf, backingStore, 0, false, flags, xmlo=
pt) < 0 ||
-        virDomainDiskBackingStoreFormat(buf, backingStore->backingStore,
+    if (virDomainDiskSourceFormat(&childBuf, backingStore, 0, false, flags=
, xmlopt) < 0)
+        return -1;
+
+    if (virDomainDiskBackingStoreFormat(&childBuf, backingStore->backingSt=
ore,
                                         xmlopt, flags) < 0)
         return -1;

-    virBufferAdjustIndent(buf, -2);
-    virBufferAddLit(buf, "</backingStore>\n");
+    if (virXMLFormatElement(buf, "backingStore", &attrBuf, &childBuf) < 0)
+        return -1;
+
     return 0;
 }

--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 155327771096658.83556199405291;
 Fri, 22 Mar 2019 11:01:50 -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 178823007C3A;
	Fri, 22 Mar 2019 18:01:49 +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 BE09E60BFB;
	Fri, 22 Mar 2019 18:01:48 +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 6551D181A852;
	Fri, 22 Mar 2019 18:01:48 +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 x2MI1Mst008902 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:22 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id F27975D9D5; Fri, 22 Mar 2019 18:01:21 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 7B51A5D9CC
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:21 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:49 +0100
Message-Id: 
 <e29b31e91abcc810bc08c49ac8d9fe6cf5a083f6.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 13/29] conf: Merge virDomainStorageSourceFormat
	into virDomainDiskSourceFormat
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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.40]);
 Fri, 22 Mar 2019 18:01:49 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

There was only one caller, remove the unnecessary wrapper.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/conf/domain_conf.c | 60 ++++++++++++++++--------------------------
 1 file changed, 23 insertions(+), 37 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 89e2900df2..db02005f5b 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23716,38 +23716,45 @@ virDomainDiskSourceFormatPrivateData(virBufferPtr=
 buf,
 }


-static int
-virDomainStorageSourceFormat(virBufferPtr attrBuf,
-                             virBufferPtr childBuf,
-                             virStorageSourcePtr src,
-                             unsigned int flags)
+int
+virDomainDiskSourceFormat(virBufferPtr buf,
+                          virStorageSourcePtr src,
+                          int policy,
+                          bool attrIndex,
+                          unsigned int flags,
+                          virDomainXMLOptionPtr xmlopt)
 {
+    VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER;
+    VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER;
+
+    virBufferSetChildIndent(&childBuf, buf);
+
     switch ((virStorageType)src->type) {
     case VIR_STORAGE_TYPE_FILE:
-        virBufferEscapeString(attrBuf, " file=3D'%s'", src->path);
+        virBufferEscapeString(&attrBuf, " file=3D'%s'", src->path);
         break;

     case VIR_STORAGE_TYPE_BLOCK:
-        virBufferEscapeString(attrBuf, " dev=3D'%s'", src->path);
+        virBufferEscapeString(&attrBuf, " dev=3D'%s'", src->path);
         break;

     case VIR_STORAGE_TYPE_DIR:
-        virBufferEscapeString(attrBuf, " dir=3D'%s'", src->path);
+        virBufferEscapeString(&attrBuf, " dir=3D'%s'", src->path);
         break;

     case VIR_STORAGE_TYPE_NETWORK:
-        if (virDomainDiskSourceFormatNetwork(attrBuf, childBuf,
+        if (virDomainDiskSourceFormatNetwork(&attrBuf, &childBuf,
                                              src, flags) < 0)
             return -1;
         break;

     case VIR_STORAGE_TYPE_VOLUME:
         if (src->srcpool) {
-            virBufferEscapeString(attrBuf, " pool=3D'%s'", src->srcpool->p=
ool);
-            virBufferEscapeString(attrBuf, " volume=3D'%s'",
+            virBufferEscapeString(&attrBuf, " pool=3D'%s'", src->srcpool->=
pool);
+            virBufferEscapeString(&attrBuf, " volume=3D'%s'",
                                   src->srcpool->volume);
             if (src->srcpool->mode)
-                virBufferAsprintf(attrBuf, " mode=3D'%s'",
+                virBufferAsprintf(&attrBuf, " mode=3D'%s'",
                                   virStorageSourcePoolModeTypeToString(src=
->srcpool->mode));
         }

@@ -23761,7 +23768,7 @@ virDomainStorageSourceFormat(virBufferPtr attrBuf,
     }

     if (src->type !=3D VIR_STORAGE_TYPE_NETWORK)
-        virDomainSourceDefFormatSeclabel(childBuf, src->nseclabels,
+        virDomainSourceDefFormatSeclabel(&childBuf, src->nseclabels,
                                          src->seclabels, flags);

     /* Storage Source formatting will not carry through the blunder
@@ -23771,38 +23778,17 @@ virDomainStorageSourceFormat(virBufferPtr attrBuf,
      * So avoid formatting it for volumes. */
     if (src->auth && src->authInherited &&
         src->type !=3D VIR_STORAGE_TYPE_VOLUME)
-        virStorageAuthDefFormat(childBuf, src->auth);
+        virStorageAuthDefFormat(&childBuf, src->auth);

     /* If we found encryption as a child of <source>, then format it
      * as we found it. */
     if (src->encryption && src->encryptionInherited &&
-        virStorageEncryptionFormat(childBuf, src->encryption) < 0)
+        virStorageEncryptionFormat(&childBuf, src->encryption) < 0)
         return -1;

     if (src->pr)
-        virStoragePRDefFormat(childBuf, src->pr,
+        virStoragePRDefFormat(&childBuf, src->pr,
                               flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE);
-
-    return 0;
-}
-
-
-int
-virDomainDiskSourceFormat(virBufferPtr buf,
-                          virStorageSourcePtr src,
-                          int policy,
-                          bool attrIndex,
-                          unsigned int flags,
-                          virDomainXMLOptionPtr xmlopt)
-{
-    VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER;
-    VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER;
-
-    virBufferSetChildIndent(&childBuf, buf);
-
-    if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src, flags) < 0)
-        return -1;
-
     if (policy && src->type !=3D VIR_STORAGE_TYPE_NETWORK)
         virBufferEscapeString(&attrBuf, " startupPolicy=3D'%s'",
                               virDomainStartupPolicyTypeToString(policy));
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277715425284.42022907910416;
 Fri, 22 Mar 2019 11:01:55 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id 8DC093007C20;
	Fri, 22 Mar 2019 18:01:53 +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 5DC2E5D9E2;
	Fri, 22 Mar 2019 18:01:53 +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 096413D38B;
	Fri, 22 Mar 2019 18:01:53 +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 x2MI1Mk6008909 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:22 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id C464C5D9D5; Fri, 22 Mar 2019 18:01:22 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 4C7655D9CC
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:22 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:50 +0100
Message-Id: 
 <61c5b848e3cbdbb438f6cca02589e730386ac1ca.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 14/29] conf: Document virDomainDiskSourceFormat
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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.14
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]);
 Fri, 22 Mar 2019 18:01:54 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/conf/domain_conf.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index db02005f5b..fa50b6f000 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23716,6 +23716,18 @@ virDomainDiskSourceFormatPrivateData(virBufferPtr =
buf,
 }


+/**
+ * virDomainDiskSourceFormat:
+ * @buf: output buffer
+ * @src: storage source definition to format
+ * @policy: startup policy attribute value, if necessary
+ * @attrIndex: the 'index' attribute of <source> is formatted if true
+ * @flags: XML formatter flags
+ * @xmlopt: XML formatter callbacks
+ *
+ * Formats @src into a <source> element. Note that this doesn't format the
+ * 'type' and 'format' properties of @src.
+ */
 int
 virDomainDiskSourceFormat(virBufferPtr buf,
                           virStorageSourcePtr src,
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277693764988.7393361436161;
 Fri, 22 Mar 2019 11:01:33 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id EABD8C02500A;
	Fri, 22 Mar 2019 18:01:31 +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 BCA8C60142;
	Fri, 22 Mar 2019 18:01:31 +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 6A9B53FA4C;
	Fri, 22 Mar 2019 18:01:31 +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 x2MI1NpZ008922 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:23 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 973905D9D5; Fri, 22 Mar 2019 18:01:23 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 1F04F5D9D2
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:22 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:51 +0100
Message-Id: 
 <fd31023b6b67070d44634d6464ab05241e1cac5d.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 15/29] conf: Replace virDomainDiskSourceParse
	by virDomainStorageSourceParse
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]);
 Fri, 22 Mar 2019 18:01:32 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

virDomainDiskSourceParse was now just a thin wrapper without any extra
value. Replace all usage of it by the function it calls and remove the
function.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/conf/domain_conf.c   | 22 ++++------------------
 src/conf/domain_conf.h   |  5 -----
 src/conf/snapshot_conf.c |  2 +-
 tests/qemublocktest.c    |  2 +-
 4 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index fa50b6f000..c93c4df929 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -9111,20 +9111,6 @@ virDomainStorageSourceParse(xmlNodePtr node,
 }


-int
-virDomainDiskSourceParse(xmlNodePtr node,
-                         xmlXPathContextPtr ctxt,
-                         virStorageSourcePtr src,
-                         unsigned int flags,
-                         virDomainXMLOptionPtr xmlopt)
-{
-    if (virDomainStorageSourceParse(node, ctxt, src, flags, xmlopt) < 0)
-        return -1;
-
-    return 0;
-}
-
-
 static int
 virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt,
                                virStorageSourcePtr src,
@@ -9186,7 +9172,7 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctx=
t,
         return -1;
     }

-    if (virDomainDiskSourceParse(source, ctxt, backingStore, flags, xmlopt=
) < 0 ||
+    if (virDomainStorageSourceParse(source, ctxt, backingStore, flags, xml=
opt) < 0 ||
         virDomainDiskBackingStoreParse(ctxt, backingStore, flags, xmlopt) =
< 0)
         return -1;

@@ -9320,8 +9306,8 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def,
             return -1;
         }

-        if (virDomainDiskSourceParse(mirrorNode, ctxt, def->mirror,
-                                     flags, xmlopt) < 0)
+        if (virDomainStorageSourceParse(mirrorNode, ctxt, def->mirror,
+                                        flags, xmlopt) < 0)
             return -1;
     } else {
         /* For back-compat reasons, we handle a file name
@@ -9771,7 +9757,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
             continue;

         if (!source && virXMLNodeNameEqual(cur, "source")) {
-            if (virDomainDiskSourceParse(cur, ctxt, def->src, flags, xmlop=
t) < 0)
+            if (virDomainStorageSourceParse(cur, ctxt, def->src, flags, xm=
lopt) < 0)
                 goto error;

             /* If we've already found an <auth> as a child of <disk> and
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index cca81be013..f550c257d6 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3067,11 +3067,6 @@ virDomainDiskDefPtr
 virDomainDiskRemove(virDomainDefPtr def, size_t i);
 virDomainDiskDefPtr
 virDomainDiskRemoveByName(virDomainDefPtr def, const char *name);
-int virDomainDiskSourceParse(xmlNodePtr node,
-                             xmlXPathContextPtr ctxt,
-                             virStorageSourcePtr src,
-                             unsigned int flags,
-                             virDomainXMLOptionPtr xmlopt);

 int virDomainNetFindIdx(virDomainDefPtr def, virDomainNetDefPtr net);
 virDomainNetDefPtr virDomainNetFind(virDomainDefPtr def, const char *devic=
e);
diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c
index 58d2cfee99..93b5bafcd6 100644
--- a/src/conf/snapshot_conf.c
+++ b/src/conf/snapshot_conf.c
@@ -146,7 +146,7 @@ virDomainSnapshotDiskDefParseXML(xmlNodePtr node,
     }

     if ((cur =3D virXPathNode("./source", ctxt)) &&
-        virDomainDiskSourceParse(cur, ctxt, def->src, flags, xmlopt) < 0)
+        virDomainStorageSourceParse(cur, ctxt, def->src, flags, xmlopt) < =
0)
         goto cleanup;

     if ((driver =3D virXPathString("string(./driver/@type)", ctxt)) &&
diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index 46e75c2df5..1a365a411c 100644
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -62,7 +62,7 @@ testBackingXMLjsonXML(const void *args)
     if (!(xml =3D virXMLParseStringCtxt(data->xml, "(test storage source X=
ML)", &ctxt)))
         return -1;

-    if (virDomainDiskSourceParse(ctxt->node, ctxt, xmlsrc, 0, NULL) < 0) {
+    if (virDomainStorageSourceParse(ctxt->node, ctxt, xmlsrc, 0, NULL) < 0=
) {
         fprintf(stderr, "failed to parse disk source xml\n");
         return -1;
     }
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 15532777197272.4528286293402743;
 Fri, 22 Mar 2019 11:01:59 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
 [10.5.11.22])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id F0A8AA9639;
	Fri, 22 Mar 2019 18:01:57 +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 BE31A1001E8D;
	Fri, 22 Mar 2019 18:01:57 +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 6AA2C3D38F;
	Fri, 22 Mar 2019 18:01:57 +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 x2MI1Od1008930 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:24 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 688D75D9D6; Fri, 22 Mar 2019 18:01:24 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id E59EB5D9D2
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:23 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:52 +0100
Message-Id: 
 <960b365f41906b8a547dc43f1772a1f378404bc3.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 16/29] conf: introduce
	virDomainStorageSourceParseBase
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]);
 Fri, 22 Mar 2019 18:01:58 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

The helper converts the 'type', 'format' and index values to enum
values/numbers and does validation.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/conf/domain_conf.c   | 39 +++++++++++++++++++++++++++++++++++++++
 src/conf/domain_conf.h   |  5 +++++
 src/libvirt_private.syms |  1 +
 3 files changed, 45 insertions(+)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index c93c4df929..9b64e33ff5 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -9039,6 +9039,45 @@ virDomainDiskSourcePRParse(xmlNodePtr node,
 }


+virStorageSourcePtr
+virDomainStorageSourceParseBase(const char *type,
+                                const char *format,
+                                const char *index)
+{
+    VIR_AUTOUNREF(virStorageSourcePtr) src =3D NULL;
+    virStorageSourcePtr ret =3D NULL;
+
+    if (!(src =3D virStorageSourceNew()))
+        return NULL;
+
+    src->type =3D VIR_STORAGE_TYPE_FILE;
+
+    if (type &&
+        (src->type =3D virStorageTypeFromString(type)) <=3D 0) {
+        virReportError(VIR_ERR_XML_ERROR,
+                       _("unknown storage source type '%s'"), type);
+        return NULL;
+    }
+
+    if (format &&
+        (src->format =3D virStorageFileFormatTypeFromString(format)) <=3D =
0) {
+        virReportError(VIR_ERR_XML_ERROR,
+                       _("unknown storage source format '%s'"), format);
+        return NULL;
+    }
+
+    if (index &&
+        virStrToLong_uip(index, NULL, 10, &src->id) < 0) {
+        virReportError(VIR_ERR_XML_ERROR,
+                       _("invalid storage source index '%s'"), index);
+        return NULL;
+    }
+
+    VIR_STEAL_PTR(ret, src);
+    return ret;
+}
+
+
 int
 virDomainStorageSourceParse(xmlNodePtr node,
                             xmlXPathContextPtr ctxt,
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index f550c257d6..ce6e5b4748 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3452,6 +3452,11 @@ int virDomainDiskDefCheckDuplicateInfo(const virDoma=
inDiskDef *a,
                                        const virDomainDiskDef *b)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);

+virStorageSourcePtr
+virDomainStorageSourceParseBase(const char *type,
+                                const char *format,
+                                const char *index)
+    ATTRIBUTE_RETURN_CHECK;

 int virDomainStorageSourceParse(xmlNodePtr node,
                                 xmlXPathContextPtr ctxt,
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 681ff911b6..6246b4c034 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -565,6 +565,7 @@ virDomainStateTypeFromString;
 virDomainStateTypeToString;
 virDomainStorageNetworkParseHost;
 virDomainStorageSourceParse;
+virDomainStorageSourceParseBase;
 virDomainTaintTypeFromString;
 virDomainTaintTypeToString;
 virDomainTimerModeTypeFromString;
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277726211350.9182481808474;
 Fri, 22 Mar 2019 11:02:06 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id 7454A88AB6;
	Fri, 22 Mar 2019 18:02:02 +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 400D25D71E;
	Fri, 22 Mar 2019 18:02:02 +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 E51603D391;
	Fri, 22 Mar 2019 18:02:01 +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 x2MI1RCX008949 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:27 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 5DB4F5D9D2; Fri, 22 Mar 2019 18:01:27 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id DB8B65D9D6
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:24 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:53 +0100
Message-Id: 
 <b0ad843719b3800709578fd713c61c640339aba0.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 17/29] conf: Use
	virDomainStorageSourceParseBase in virDomainDiskBackingStoreParse
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]);
 Fri, 22 Mar 2019 18:02:03 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/conf/domain_conf.c | 37 ++++++++++---------------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 9b64e33ff5..15bb00e800 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -9166,31 +9166,15 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr c=
txt,
     if (!(ctxt->node =3D virXPathNode("./backingStore", ctxt)))
         return 0;

-    if (!(backingStore =3D virStorageSourceNew()))
-        return -1;
-
-    /* backing store is always read-only */
-    backingStore->readonly =3D true;
-
     /* terminator does not have a type */
     if (!(type =3D virXMLPropString(ctxt->node, "type"))) {
-        VIR_STEAL_PTR(src->backingStore, backingStore);
+        if (!(src->backingStore =3D virStorageSourceNew()))
+            return -1;
         return 0;
     }

-    if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) &&
-        (idx =3D virXMLPropString(ctxt->node, "index")) &&
-        virStrToLong_uip(idx, NULL, 10, &backingStore->id) < 0) {
-        virReportError(VIR_ERR_XML_ERROR, _("invalid disk index '%s'"), id=
x);
-        return -1;
-    }
-
-    backingStore->type =3D virStorageTypeFromString(type);
-    if (backingStore->type <=3D 0) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("unknown disk backing store type '%s'"), type);
-        return -1;
-    }
+    if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE))
+        idx =3D virXMLPropString(ctxt->node, "index");

     if (!(format =3D virXPathString("string(./format/@type)", ctxt))) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -9198,19 +9182,18 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr c=
txt,
         return -1;
     }

-    backingStore->format =3D virStorageFileFormatTypeFromString(format);
-    if (backingStore->format <=3D 0) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("unknown disk backing store format '%s'"), format=
);
-        return -1;
-    }
-
     if (!(source =3D virXPathNode("./source", ctxt))) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
                        _("missing disk backing store source"));
         return -1;
     }

+    if (!(backingStore =3D virDomainStorageSourceParseBase(type, format, i=
dx)))
+        return -1;
+
+    /* backing store is always read-only */
+    backingStore->readonly =3D true;
+
     if (virDomainStorageSourceParse(source, ctxt, backingStore, flags, xml=
opt) < 0 ||
         virDomainDiskBackingStoreParse(ctxt, backingStore, flags, xmlopt) =
< 0)
         return -1;
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277701112943.3271440114521;
 Fri, 22 Mar 2019 11:01:41 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 68C973078AA8;
	Fri, 22 Mar 2019 18:01:37 +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 3385B60146;
	Fri, 22 Mar 2019 18:01:37 +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 E269A181A84D;
	Fri, 22 Mar 2019 18:01:36 +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 x2MI1S9l008958 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:28 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 2F25B5D9D2; Fri, 22 Mar 2019 18:01:28 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id AB6E95D9D5
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:27 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:54 +0100
Message-Id: 
 <e367b5e29c81d22c0a9c0cc7f5e7e6f501d7f473.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 18/29] conf: Document
	virDomainStorageSourceParse
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]);
 Fri, 22 Mar 2019 18:01:38 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/conf/domain_conf.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 15bb00e800..8fa06aff03 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -9078,6 +9078,18 @@ virDomainStorageSourceParseBase(const char *type,
 }


+/**
+ * virDomainStorageSourceParse:
+ * @node: XML node pointing to the source element to parse
+ * @ctxt: XPath context
+ * @src: filled with parsed data
+ * @flags: XML parser flags
+ * @xmlopt: XML parser callbacks
+ *
+ * Parses @src definition from element pointed to by @node. Note that this
+ * does not parse the 'type' and 'format' attributes of @src and 'type' ne=
eds
+ * to be set correctly prior to calling this function.
+ */
 int
 virDomainStorageSourceParse(xmlNodePtr node,
                             xmlXPathContextPtr ctxt,
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277728602665.3365201631623;
 Fri, 22 Mar 2019 11:02:08 -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 C408E81E10;
	Fri, 22 Mar 2019 18:02:06 +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 982E460BF4;
	Fri, 22 Mar 2019 18:02:06 +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 505D4181A883;
	Fri, 22 Mar 2019 18:02:06 +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 x2MI1TRD008966 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:29 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id F2A1C5D9D5; Fri, 22 Mar 2019 18:01:28 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 7BEA65D9D2
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:28 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:55 +0100
Message-Id: 
 <ac261f509e5391569e5af1ee7ac60d0d817e9007.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 19/29] conf: Modify arguments passed to
	virDomainDiskBackingStoreFormat
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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]);
 Fri, 22 Mar 2019 18:02:07 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Pass in 'src' rather than the backing store of it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/conf/domain_conf.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 8fa06aff03..5773d07474 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -23840,13 +23840,14 @@ virDomainDiskSourceFormat(virBufferPtr buf,

 static int
 virDomainDiskBackingStoreFormat(virBufferPtr buf,
-                                virStorageSourcePtr backingStore,
+                                virStorageSourcePtr src,
                                 virDomainXMLOptionPtr xmlopt,
                                 unsigned int flags)
 {
     VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER;
     VIR_AUTOCLEAN(virBuffer) childBuf =3D VIR_BUFFER_INITIALIZER;
     bool inactive =3D flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE;
+    virStorageSourcePtr backingStore =3D src->backingStore;

     virBufferSetChildIndent(&childBuf, buf);

@@ -23879,8 +23880,7 @@ virDomainDiskBackingStoreFormat(virBufferPtr buf,
     if (virDomainDiskSourceFormat(&childBuf, backingStore, 0, false, flags=
, xmlopt) < 0)
         return -1;

-    if (virDomainDiskBackingStoreFormat(&childBuf, backingStore->backingSt=
ore,
-                                        xmlopt, flags) < 0)
+    if (virDomainDiskBackingStoreFormat(&childBuf, backingStore, xmlopt, f=
lags) < 0)
         return -1;

     if (virXMLFormatElement(buf, "backingStore", &attrBuf, &childBuf) < 0)
@@ -24142,8 +24142,7 @@ virDomainDiskDefFormat(virBufferPtr buf,

     /* Don't format backingStore to inactive XMLs until the code for
      * persistent storage of backing chains is ready. */
-    if (virDomainDiskBackingStoreFormat(buf, def->src->backingStore,
-                                        xmlopt, flags) < 0)
+    if (virDomainDiskBackingStoreFormat(buf, def->src, xmlopt, flags) < 0)
         return -1;

     virBufferEscapeString(buf, "<backenddomain name=3D'%s'/>\n", def->doma=
in_name);
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277703468198.67277407431038;
 Fri, 22 Mar 2019 11:01:43 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id C7E063002F62;
	Fri, 22 Mar 2019 18:01:41 +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 9517D5EDE5;
	Fri, 22 Mar 2019 18:01:41 +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 36785180338B;
	Fri, 22 Mar 2019 18:01:41 +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 x2MI1Tet008977 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:29 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id C365B5D9D5; Fri, 22 Mar 2019 18:01:29 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 4BE285D9D2
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:29 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:56 +0100
Message-Id: 
 <45de939aef379f9f2a5ff17b4e15e68b6ef8be84.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 20/29] conf: Allow convenient lookup of
	<source> in virDomainStorageSourceParse
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]);
 Fri, 22 Mar 2019 18:01:42 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

If NULL is passed, the function will lookup <source> in current context.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 src/conf/domain_conf.c | 12 +++++++++++-
 src/conf/domain_conf.h |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 5773d07474..852489e185 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -9080,7 +9080,7 @@ virDomainStorageSourceParseBase(const char *type,

 /**
  * virDomainStorageSourceParse:
- * @node: XML node pointing to the source element to parse
+ * @node: XML node pointing to the source element to parse (see below)
  * @ctxt: XPath context
  * @src: filled with parsed data
  * @flags: XML parser flags
@@ -9089,6 +9089,9 @@ virDomainStorageSourceParseBase(const char *type,
  * Parses @src definition from element pointed to by @node. Note that this
  * does not parse the 'type' and 'format' attributes of @src and 'type' ne=
eds
  * to be set correctly prior to calling this function.
+ *
+ * If @node is NULL a <source> subelement is looked up in @ctxt to be used=
 as
+ * source. Error is reported if the source is not found.
  */
 int
 virDomainStorageSourceParse(xmlNodePtr node,
@@ -9100,6 +9103,13 @@ virDomainStorageSourceParse(xmlNodePtr node,
     VIR_XPATH_NODE_AUTORESTORE(ctxt);
     xmlNodePtr tmp;

+    if (!node &&
+        !(node =3D virXPathNode("./source", ctxt))) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("missing <source> element for storage source"));
+        return -1;
+    }
+
     ctxt->node =3D node;

     switch ((virStorageType)src->type) {
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index ce6e5b4748..6fb73bdaf7 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3463,7 +3463,7 @@ int virDomainStorageSourceParse(xmlNodePtr node,
                                 virStorageSourcePtr src,
                                 unsigned int flags,
                                 virDomainXMLOptionPtr xmlopt)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
+    ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);

 int virDomainDefGetVcpuPinInfoHelper(virDomainDefPtr def,
                                      int maplen,
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277700689698.0970652518603;
 Fri, 22 Mar 2019 11:01:40 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id 05B2FC05B1E9;
	Fri, 22 Mar 2019 18:01:37 +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 C801E5D9D4;
	Fri, 22 Mar 2019 18:01:36 +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 6E9E23FA4E;
	Fri, 22 Mar 2019 18:01:36 +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 x2MI1Ugd008991 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:30 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 954DD5D9D5; Fri, 22 Mar 2019 18:01:30 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 1E4865D9D2
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:29 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:57 +0100
Message-Id: 
 <a3d00ef7c17866ab6205ce401f00a7be5c282e69.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 21/29] qemu: Use VIR_AUTOFREE in
	qemuDomainObjPrivateXMLParseJobNBDSource
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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.14
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]);
 Fri, 22 Mar 2019 18:01:37 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/qemu/qemu_domain.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 3b0887a194..9323421e49 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2715,8 +2715,8 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr n=
ode,
 {
     VIR_XPATH_NODE_AUTORESTORE(ctxt);
     qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk);
-    char *format =3D NULL;
-    char *type =3D NULL;
+    VIR_AUTOFREE(char *) format =3D NULL;
+    VIR_AUTOFREE(char *) type =3D NULL;
     int ret =3D -1;
     VIR_AUTOUNREF(virStorageSourcePtr) migrSource =3D NULL;
     xmlNodePtr sourceNode;
@@ -2770,8 +2770,6 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr n=
ode,
     ret =3D 0;

  cleanup:
-    VIR_FREE(format);
-    VIR_FREE(type);
     return ret;
 }

--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277703164262.3907325438497;
 Fri, 22 Mar 2019 11:01:43 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id 4E147308623F;
	Fri, 22 Mar 2019 18:01:41 +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 151A85D9E1;
	Fri, 22 Mar 2019 18:01:41 +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 B1FEE3FA51;
	Fri, 22 Mar 2019 18:01:40 +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 x2MI1V7n009004 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:31 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 676715D9D6; Fri, 22 Mar 2019 18:01:31 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id E35FD5D9D2
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:30 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:58 +0100
Message-Id: 
 <5db0f6b1769d5d412d3070f28f0f244174a0dc9d.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 22/29] qemu: Remove cleanup in
	qemuDomainObjPrivateXMLParseJobNBDSource
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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.14
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]);
 Fri, 22 Mar 2019 18:01:42 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/qemu/qemu_domain.c | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 9323421e49..c7454ce821 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2717,42 +2717,39 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr=
 node,
     qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk);
     VIR_AUTOFREE(char *) format =3D NULL;
     VIR_AUTOFREE(char *) type =3D NULL;
-    int ret =3D -1;
     VIR_AUTOUNREF(virStorageSourcePtr) migrSource =3D NULL;
     xmlNodePtr sourceNode;

     ctxt->node =3D node;

-    if (!(ctxt->node =3D virXPathNode("./migrationSource", ctxt))) {
-        ret =3D 0;
-        goto cleanup;
-    }
+    if (!(ctxt->node =3D virXPathNode("./migrationSource", ctxt)))
+        return 0;

     if (!(migrSource =3D virStorageSourceNew()))
-        goto cleanup;
+        return -1;

     if (!(type =3D virXMLPropString(ctxt->node, "type"))) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
                        _("missing storage source type"));
-        goto cleanup;
+        return -1;
     }

     if (!(format =3D virXMLPropString(ctxt->node, "format"))) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
                        _("missing storage source format"));
-        goto cleanup;
+        return -1;
     }

     if ((migrSource->type =3D virStorageTypeFromString(type)) <=3D 0) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("unknown storage source type '%s'"), type);
-        goto cleanup;
+        return -1;
     }

     if ((migrSource->format =3D virStorageFileFormatTypeFromString(format)=
) <=3D 0) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("unknown storage source format '%s'"), format);
-        goto cleanup;
+        return -1;
     }

     if ((sourceNode =3D virXPathNode("./source", ctxt)))
@@ -2760,17 +2757,14 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr=
 node,

     if (virDomainStorageSourceParse(ctxt->node, ctxt, migrSource,
                                     VIR_DOMAIN_DEF_PARSE_STATUS, NULL) < 0)
-        goto cleanup;
+        return -1;

     if ((ctxt->node =3D virXPathNode("./privateData", ctxt)) &&
         qemuStorageSourcePrivateDataParse(ctxt, migrSource) < 0)
-        goto cleanup;
+        return -1;

     VIR_STEAL_PTR(diskPriv->migrSource, migrSource);
-    ret =3D 0;
-
- cleanup:
-    return ret;
+    return 0;
 }


--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277707796178.48943087197256;
 Fri, 22 Mar 2019 11:01:47 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
 [10.5.11.22])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id CFAF030B254F;
	Fri, 22 Mar 2019 18:01:45 +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 A2CCF1001E6F;
	Fri, 22 Mar 2019 18:01:45 +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 49C69181A00D;
	Fri, 22 Mar 2019 18:01:45 +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 x2MI1W7D009014 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:32 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 376385D9D5; Fri, 22 Mar 2019 18:01:32 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id B4D205D9D2
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:31 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:00:59 +0100
Message-Id: 
 <a152ed86ec04b8e90b370b52977b18cbbe38f8b2.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 23/29] qemu: Use
	virDomainStorageSourceParseBase in
	qemuDomainObjPrivateXMLParseJobNBDSource
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]);
 Fri, 22 Mar 2019 18:01:46 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

The slight possible regression in error message descriptivness doesn't
matter much as the function parses private data which should not be
touched by users in the first place.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/qemu/qemu_domain.c | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index c7454ce821..0c06e3b23a 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2725,32 +2725,15 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr=
 node,
     if (!(ctxt->node =3D virXPathNode("./migrationSource", ctxt)))
         return 0;

-    if (!(migrSource =3D virStorageSourceNew()))
-        return -1;
-
-    if (!(type =3D virXMLPropString(ctxt->node, "type"))) {
-        virReportError(VIR_ERR_XML_ERROR, "%s",
-                       _("missing storage source type"));
-        return -1;
-    }
-
-    if (!(format =3D virXMLPropString(ctxt->node, "format"))) {
+    if (!(type =3D virXMLPropString(ctxt->node, "type")) ||
+        !(format =3D virXMLPropString(ctxt->node, "format"))) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
-                       _("missing storage source format"));
+                       _("missing NBD migration storage source type or for=
mat"));
         return -1;
     }

-    if ((migrSource->type =3D virStorageTypeFromString(type)) <=3D 0) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("unknown storage source type '%s'"), type);
-        return -1;
-    }
-
-    if ((migrSource->format =3D virStorageFileFormatTypeFromString(format)=
) <=3D 0) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("unknown storage source format '%s'"), format);
+    if (!(migrSource =3D virDomainStorageSourceParseBase(type, format, NUL=
L)))
         return -1;
-    }

     if ((sourceNode =3D virXPathNode("./source", ctxt)))
         ctxt->node =3D sourceNode;
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277708018309.21266810103293;
 Fri, 22 Mar 2019 11:01:48 -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 4C4A43082E53;
	Fri, 22 Mar 2019 18:01:46 +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 1D4725C553;
	Fri, 22 Mar 2019 18:01:46 +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 BB3BF181A135;
	Fri, 22 Mar 2019 18:01:45 +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 x2MI1XS3009022 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:33 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 073DD5D9D5; 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 8518C5D9D2
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:32 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:01:00 +0100
Message-Id: 
 <54ba57c62b1447a4a344a820926057bba2a31862.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 24/29] qemu: Parse NBD storage source private
	data by virDomainStorageSourceParse
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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.46]);
 Fri, 22 Mar 2019 18:01:46 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Drop the local call in favor of passing in xmlopt.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/qemu/qemu_domain.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 0c06e3b23a..0be00f804e 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2711,7 +2711,8 @@ qemuDomainObjPrivateXMLParsePR(xmlXPathContextPtr ctx=
t,
 static int
 qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr node,
                                          xmlXPathContextPtr ctxt,
-                                         virDomainDiskDefPtr disk)
+                                         virDomainDiskDefPtr disk,
+                                         virDomainXMLOptionPtr xmlopt)
 {
     VIR_XPATH_NODE_AUTORESTORE(ctxt);
     qemuDomainDiskPrivatePtr diskPriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk);
@@ -2739,11 +2740,7 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr =
node,
         ctxt->node =3D sourceNode;

     if (virDomainStorageSourceParse(ctxt->node, ctxt, migrSource,
-                                    VIR_DOMAIN_DEF_PARSE_STATUS, NULL) < 0)
-        return -1;
-
-    if ((ctxt->node =3D virXPathNode("./privateData", ctxt)) &&
-        qemuStorageSourcePrivateDataParse(ctxt, migrSource) < 0)
+                                    VIR_DOMAIN_DEF_PARSE_STATUS, xmlopt) <=
 0)
         return -1;

     VIR_STEAL_PTR(diskPriv->migrSource, migrSource);
@@ -2779,7 +2776,8 @@ qemuDomainObjPrivateXMLParseJobNBD(virDomainObjPtr vm,
                 QEMU_DOMAIN_DISK_PRIVATE(disk)->migrating =3D true;

                 if (qemuDomainObjPrivateXMLParseJobNBDSource(nodes[i], ctx=
t,
-                                                             disk) < 0)
+                                                             disk,
+                                                             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
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
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 <libvir-list@listman.util.phx.redhat.com>;
	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 <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:33 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
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: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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 <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 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=3D'%s'",
+    virBufferAsprintf(&attrBuf, " type=3D'%s'",
                       virStorageTypeToString(disk->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, "<format type=3D'%s'/>\n", formatStr);
-    if (virDomainDiskSourceFormat(buf, disk->mirror, 0, false, 0, xmlopt) =
< 0)
+    virBufferEscapeString(&childBuf, "<format type=3D'%s'/>\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, "</mirror>\n");

     return 0;
 }
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277732886907.5449890477128;
 Fri, 22 Mar 2019 11:02:12 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id 334A77D7CD;
	Fri, 22 Mar 2019 18:02:11 +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 084A816E36;
	Fri, 22 Mar 2019 18:02:11 +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 ABDEC3D398;
	Fri, 22 Mar 2019 18:02:10 +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 x2MI1Yai009040 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:34 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 9E5485D9E1; Fri, 22 Mar 2019 18:01:34 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 2718F5D9D5
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:33 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:01:02 +0100
Message-Id: 
 <c105be02d0e431168249c282e65ec0d822c09d0d.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 26/29] conf: Pass 'flags' to
	virDomainDiskSourceFormat 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
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Transfer-Encoding: quoted-printable
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-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]);
 Fri, 22 Mar 2019 18:02:11 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

We have the proper flags available so we can pass them to the fomatter.
The added bonus is that private data may be formatted into the status
XML.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/conf/domain_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 5c82ac0a18..40924b1d29 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -24050,7 +24050,7 @@ virDomainDiskDefFormatMirror(virBufferPtr buf,
                               virDomainDiskMirrorStateTypeToString(disk->m=
irrorState));

     virBufferEscapeString(&childBuf, "<format type=3D'%s'/>\n", formatStr);
-    if (virDomainDiskSourceFormat(&childBuf, disk->mirror, 0, false, 0, xm=
lopt) < 0)
+    if (virDomainDiskSourceFormat(&childBuf, disk->mirror, 0, false, flags=
, xmlopt) < 0)
         return -1;

     if (virXMLFormatElement(buf, "mirror", &attrBuf, &childBuf) < 0)
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277717422132.1160170383872;
 Fri, 22 Mar 2019 11:01:57 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id 5894E2D7FD;
	Fri, 22 Mar 2019 18:01:55 +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 224A45D793;
	Fri, 22 Mar 2019 18:01:55 +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 BE59A181A86A;
	Fri, 22 Mar 2019 18:01:54 +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 x2MI1Z5c009048 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:35 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 7089C5D9D2; Fri, 22 Mar 2019 18:01:35 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id EBBF15D9D5
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:34 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:01:03 +0100
Message-Id: 
 <37bc5ac957d07a895a54c025589062909aa5f5fd.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 27/29] conf: Refactor
	virDomainDiskDefMirrorParse
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]);
 Fri, 22 Mar 2019 18:01:56 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Use virDomainStorageSourceParseBase and other tricks.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/conf/domain_conf.c | 52 +++++++++++++-----------------------------
 1 file changed, 16 insertions(+), 36 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 40924b1d29..2514c60744 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -9315,14 +9315,13 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def,
                             unsigned int flags,
                             virDomainXMLOptionPtr xmlopt)
 {
-    xmlNodePtr mirrorNode;
+    VIR_XPATH_NODE_AUTORESTORE(ctxt);
     VIR_AUTOFREE(char *) mirrorFormat =3D NULL;
     VIR_AUTOFREE(char *) mirrorType =3D NULL;
     VIR_AUTOFREE(char *) ready =3D NULL;
     VIR_AUTOFREE(char *) blockJob =3D NULL;

-    if (!(def->mirror =3D virStorageSourceNew()))
-        return -1;
+    ctxt->node =3D cur;

     if ((blockJob =3D virXMLPropString(cur, "job"))) {
         if ((def->mirrorJob =3D virDomainBlockJobTypeFromString(blockJob))=
 <=3D 0) {
@@ -9335,35 +9334,8 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def,
     }

     if ((mirrorType =3D virXMLPropString(cur, "type"))) {
-        if ((def->mirror->type =3D virStorageTypeFromString(mirrorType)) <=
=3D 0) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("unknown mirror backing store type '%s'"),
-                           mirrorType);
-            return -1;
-        }
-
-        mirrorFormat =3D virXPathString("string(./mirror/format/@type)", c=
txt);
-
-        if (!(mirrorNode =3D virXPathNode("./mirror/source", ctxt))) {
-            virReportError(VIR_ERR_XML_ERROR, "%s",
-                           _("mirror requires source element"));
-            return -1;
-        }
-
-        if (virDomainStorageSourceParse(mirrorNode, ctxt, def->mirror,
-                                        flags, xmlopt) < 0)
-            return -1;
+        mirrorFormat =3D virXPathString("string(./format/@type)", ctxt);
     } else {
-        /* For back-compat reasons, we handle a file name
-         * encoded as attributes, even though we prefer
-         * modern output in the style of backingStore */
-        def->mirror->type =3D VIR_STORAGE_TYPE_FILE;
-        def->mirror->path =3D virXMLPropString(cur, "file");
-        if (!def->mirror->path) {
-            virReportError(VIR_ERR_XML_ERROR, "%s",
-                           _("mirror requires file name"));
-            return -1;
-        }
         if (def->mirrorJob !=3D VIR_DOMAIN_BLOCK_JOB_TYPE_COPY) {
             virReportError(VIR_ERR_XML_ERROR, "%s",
                            _("mirror without type only supported "
@@ -9373,11 +9345,19 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def,
         mirrorFormat =3D virXMLPropString(cur, "format");
     }

-    if (mirrorFormat) {
-        def->mirror->format =3D virStorageFileFormatTypeFromString(mirrorF=
ormat);
-        if (def->mirror->format <=3D 0) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("unknown mirror format value '%s'"), mirrorFo=
rmat);
+    if (!(def->mirror =3D virDomainStorageSourceParseBase(mirrorType, mirr=
orFormat, NULL)))
+        return -1;
+
+    if (mirrorType) {
+        if (virDomainStorageSourceParse(NULL, ctxt, def->mirror, flags, xm=
lopt) < 0)
+            return -1;
+    } else {
+        /* For back-compat reasons, we handle a file name encoded as
+         * attributes, even though we prefer modern output in the style of
+         * backingStore */
+        if (!(def->mirror->path =3D virXMLPropString(cur, "file"))) {
+            virReportError(VIR_ERR_XML_ERROR, "%s",
+                           _("mirror requires file name"));
             return -1;
         }
     }
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277712166393.88673419272914;
 Fri, 22 Mar 2019 11:01:52 -0700 (PDT)
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 mx1.redhat.com (Postfix) with ESMTPS id 5F8CE88AA0;
	Fri, 22 Mar 2019 18:01:50 +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 2BE2616D34;
	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 D1B193F5CF;
	Fri, 22 Mar 2019 18:01:49 +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 x2MI1auV009056 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:36 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 40C5F5D9D6; Fri, 22 Mar 2019 18:01:36 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id BDAFD5D9D2
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:35 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:01:04 +0100
Message-Id: 
 <ebbcb311e7263befef5eb3dc46a06b596aa421ae.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 28/29] conf: Parse and format 'backingStore'
	for disk <mirror>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Transfer-Encoding: quoted-printable
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-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]);
 Fri, 22 Mar 2019 18:01:51 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

When the block copy operation is started with a reused external file in
incremental mode libvirt will need to open and insert the backing chain
for that file into qemu (in -blockdev mode). This means that we'll need
to track the backing chain and metadata such as node names for the full
chain of <mirror>.

This patch invokes the full backing chain formatter and parser for
<mirror> so that the chain can be kept with <mirror>.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 docs/schemas/domaincommon.rng                      |  1 +
 src/conf/domain_conf.c                             |  5 +++++
 tests/qemustatusxml2xmldata/blockjob-mirror-in.xml | 13 +++++++++++++
 tests/qemuxml2argvdata/disk-mirror.xml             |  6 ++++++
 tests/qemuxml2xmloutdata/disk-mirror-active.xml    |  6 ++++++
 5 files changed, 31 insertions(+)

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 1828e0795b..623ef28719 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -5676,6 +5676,7 @@
           </choice>
         </attribute>
       </optional>
+      <ref name=3D"diskBackingChain"/>
     </element>
   </define>
   <define name=3D"diskAuth">
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 2514c60744..0970d48045 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -9351,6 +9351,8 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def,
     if (mirrorType) {
         if (virDomainStorageSourceParse(NULL, ctxt, def->mirror, flags, xm=
lopt) < 0)
             return -1;
+        if (virDomainDiskBackingStoreParse(ctxt, def->mirror, flags, xmlop=
t) < 0)
+            return -1;
     } else {
         /* For back-compat reasons, we handle a file name encoded as
          * attributes, even though we prefer modern output in the style of
@@ -24033,6 +24035,9 @@ virDomainDiskDefFormatMirror(virBufferPtr buf,
     if (virDomainDiskSourceFormat(&childBuf, disk->mirror, 0, false, flags=
, xmlopt) < 0)
         return -1;

+    if (virDomainDiskBackingStoreFormat(&childBuf, disk->mirror, xmlopt, f=
lags) < 0)
+        return -1;
+
     if (virXMLFormatElement(buf, "mirror", &attrBuf, &childBuf) < 0)
         return -1;

diff --git a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml b/tests/qem=
ustatusxml2xmldata/blockjob-mirror-in.xml
index 32bde1ba66..df23ac00aa 100644
--- a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
+++ b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
@@ -65,6 +65,7 @@
         <mirror type=3D'file' file=3D'/tmp/copy.img' format=3D'qcow2' job=
=3D'copy'>
           <format type=3D'qcow2'/>
           <source file=3D'/tmp/copy.img'/>
+          <backingStore/>
         </mirror>
         <target dev=3D'vda' bus=3D'virtio'/>
         <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03'=
 function=3D'0x0'/>
@@ -76,6 +77,18 @@
         <mirror type=3D'file' file=3D'/tmp/logcopy.img' format=3D'qcow2' j=
ob=3D'copy' ready=3D'abort'>
           <format type=3D'qcow2'/>
           <source file=3D'/tmp/logcopy.img'/>
+          <backingStore type=3D'block' index=3D'1'>
+            <format type=3D'raw'/>
+            <source dev=3D'/dev/HostVG/backing'>
+              <privateData>
+                <nodenames>
+                  <nodename type=3D'storage' name=3D'test-backing-storage'=
/>
+                  <nodename type=3D'format' name=3D'test-backing-format'/>
+                </nodenames>
+              </privateData>
+            </source>
+            <backingStore/>
+          </backingStore>
         </mirror>
         <target dev=3D'vdb' bus=3D'virtio'/>
         <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04'=
 function=3D'0x0'/>
diff --git a/tests/qemuxml2argvdata/disk-mirror.xml b/tests/qemuxml2argvdat=
a/disk-mirror.xml
index e89eee47ed..c1e6e94e33 100644
--- a/tests/qemuxml2argvdata/disk-mirror.xml
+++ b/tests/qemuxml2argvdata/disk-mirror.xml
@@ -36,6 +36,7 @@
       <mirror type=3D'file' file=3D'/tmp/copy.img' format=3D'qcow2' job=3D=
'copy'>
         <format type=3D'qcow2'/>
         <source file=3D'/tmp/copy.img'/>
+        <backingStore/>
       </mirror>
       <target dev=3D'vda' bus=3D'virtio'/>
     </disk>
@@ -45,6 +46,11 @@
       <mirror type=3D'file' file=3D'/tmp/logcopy.img' format=3D'qcow2' job=
=3D'copy' ready=3D'abort'>
         <format type=3D'qcow2'/>
         <source file=3D'/tmp/logcopy.img'/>
+        <backingStore type=3D'block' index=3D'1'>
+          <format type=3D'raw'/>
+          <source dev=3D'/dev/HostVG/backing'/>
+          <backingStore/>
+        </backingStore>
       </mirror>
       <target dev=3D'vdb' bus=3D'virtio'/>
     </disk>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-active.xml b/tests/qemuxm=
l2xmloutdata/disk-mirror-active.xml
index d689eac6b8..32ffc647be 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-active.xml
@@ -40,6 +40,7 @@
       <mirror type=3D'file' file=3D'/tmp/copy.img' format=3D'qcow2' job=3D=
'copy'>
         <format type=3D'qcow2'/>
         <source file=3D'/tmp/copy.img'/>
+        <backingStore/>
       </mirror>
       <target dev=3D'vda' bus=3D'virtio'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
@@ -51,6 +52,11 @@
       <mirror type=3D'file' file=3D'/tmp/logcopy.img' format=3D'qcow2' job=
=3D'copy' ready=3D'abort'>
         <format type=3D'qcow2'/>
         <source file=3D'/tmp/logcopy.img'/>
+        <backingStore type=3D'block' index=3D'1'>
+          <format type=3D'raw'/>
+          <source dev=3D'/dev/HostVG/backing'/>
+          <backingStore/>
+        </backingStore>
       </mirror>
       <target dev=3D'vdb' bus=3D'virtio'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Sun Feb  8 00:55:49 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: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1553277721387447.6463492419655;
 Fri, 22 Mar 2019 11:02:01 -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 C84773087959;
	Fri, 22 Mar 2019 18:01:59 +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 A058C60BF2;
	Fri, 22 Mar 2019 18:01: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 4E252181A87B;
	Fri, 22 Mar 2019 18:01:59 +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 x2MI1bY9009068 for <libvir-list@listman.util.phx.redhat.com>;
	Fri, 22 Mar 2019 14:01:37 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 128235D9D5; Fri, 22 Mar 2019 18:01:37 +0000 (UTC)
Received: from angien.brq.redhat.com (unknown [10.43.2.229])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 8F2845D9D2
	for <libvir-list@redhat.com>; Fri, 22 Mar 2019 18:01:36 +0000 (UTC)
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Date: Fri, 22 Mar 2019 19:01:05 +0100
Message-Id: 
 <eae2bc47228c2b968733c871fe7d41ed5d7b7494.1553277561.git.pkrempa@redhat.com>
In-Reply-To: <cover.1553277561.git.pkrempa@redhat.com>
References: <cover.1553277561.git.pkrempa@redhat.com>
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 29/29] conf: Add 'index' attribute for
	<disk><mirror><source>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=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.45]);
 Fri, 22 Mar 2019 18:02:00 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"

Similarly to the disk source we need to keep the disk index (which is in
the qemu driver used for identification of the source for block jobs)
for the <mirror> element so that when it's replaced as a disk source
after pivoting all the allocated data is present.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: J=C3=A1n Tomko <jtomko@redhat.com>
---
 src/conf/domain_conf.c                          | 7 +++++--
 tests/qemuxml2argvdata/disk-mirror.xml          | 4 ++--
 tests/qemuxml2xmloutdata/disk-mirror-active.xml | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 0970d48045..72dd45feb8 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -9320,6 +9320,7 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def,
     VIR_AUTOFREE(char *) mirrorType =3D NULL;
     VIR_AUTOFREE(char *) ready =3D NULL;
     VIR_AUTOFREE(char *) blockJob =3D NULL;
+    VIR_AUTOFREE(char *) index =3D NULL;

     ctxt->node =3D cur;

@@ -9335,6 +9336,7 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def,

     if ((mirrorType =3D virXMLPropString(cur, "type"))) {
         mirrorFormat =3D virXPathString("string(./format/@type)", ctxt);
+        index =3D virXPathString("string(./source/@index)", ctxt);
     } else {
         if (def->mirrorJob !=3D VIR_DOMAIN_BLOCK_JOB_TYPE_COPY) {
             virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -9345,7 +9347,8 @@ virDomainDiskDefMirrorParse(virDomainDiskDefPtr def,
         mirrorFormat =3D virXMLPropString(cur, "format");
     }

-    if (!(def->mirror =3D virDomainStorageSourceParseBase(mirrorType, mirr=
orFormat, NULL)))
+    if (!(def->mirror =3D virDomainStorageSourceParseBase(mirrorType, mirr=
orFormat,
+                                                        index)))
         return -1;

     if (mirrorType) {
@@ -24032,7 +24035,7 @@ virDomainDiskDefFormatMirror(virBufferPtr buf,
                               virDomainDiskMirrorStateTypeToString(disk->m=
irrorState));

     virBufferEscapeString(&childBuf, "<format type=3D'%s'/>\n", formatStr);
-    if (virDomainDiskSourceFormat(&childBuf, disk->mirror, 0, false, flags=
, xmlopt) < 0)
+    if (virDomainDiskSourceFormat(&childBuf, disk->mirror, 0, true, flags,=
 xmlopt) < 0)
         return -1;

     if (virDomainDiskBackingStoreFormat(&childBuf, disk->mirror, xmlopt, f=
lags) < 0)
diff --git a/tests/qemuxml2argvdata/disk-mirror.xml b/tests/qemuxml2argvdat=
a/disk-mirror.xml
index c1e6e94e33..5a825c54ac 100644
--- a/tests/qemuxml2argvdata/disk-mirror.xml
+++ b/tests/qemuxml2argvdata/disk-mirror.xml
@@ -45,8 +45,8 @@
       <backingStore/>
       <mirror type=3D'file' file=3D'/tmp/logcopy.img' format=3D'qcow2' job=
=3D'copy' ready=3D'abort'>
         <format type=3D'qcow2'/>
-        <source file=3D'/tmp/logcopy.img'/>
-        <backingStore type=3D'block' index=3D'1'>
+        <source file=3D'/tmp/logcopy.img' index=3D'1'/>
+        <backingStore type=3D'block' index=3D'2'>
           <format type=3D'raw'/>
           <source dev=3D'/dev/HostVG/backing'/>
           <backingStore/>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-active.xml b/tests/qemuxm=
l2xmloutdata/disk-mirror-active.xml
index 32ffc647be..bebdb849c2 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-active.xml
@@ -51,8 +51,8 @@
       <backingStore/>
       <mirror type=3D'file' file=3D'/tmp/logcopy.img' format=3D'qcow2' job=
=3D'copy' ready=3D'abort'>
         <format type=3D'qcow2'/>
-        <source file=3D'/tmp/logcopy.img'/>
-        <backingStore type=3D'block' index=3D'1'>
+        <source file=3D'/tmp/logcopy.img' index=3D'1'/>
+        <backingStore type=3D'block' index=3D'2'>
           <format type=3D'raw'/>
           <source dev=3D'/dev/HostVG/backing'/>
           <backingStore/>
--=20
2.20.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list