[libvirt] [PATCH v2 24/29] qemu: Parse NBD storage source private data by virDomainStorageSourceParse
Drop the local call in favor of passing in xmlopt.
Signed-off-by: Peter Krempa <pkrempa(a)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 ctxt,
static int
qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr node,
xmlXPathContextPtr ctxt,
- virDomainDiskDefPtr disk)
+ virDomainDiskDefPtr disk,
+ virDomainXMLOptionPtr xmlopt)
{
VIR_XPATH_NODE_AUTORESTORE(ctxt);
qemuDomainDiskPrivatePtr diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
@@ -2739,11 +2740,7 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr node,
ctxt->node = sourceNode;
if (virDomainStorageSourceParse(ctxt->node, ctxt, migrSource,
- VIR_DOMAIN_DEF_PARSE_STATUS, NULL) < 0)
- return -1;
-
- if ((ctxt->node = 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 = true;
if (qemuDomainObjPrivateXMLParseJobNBDSource(nodes[i], ctxt,
- disk) < 0)
+ disk,
+ priv->driver->xmlopt)
< 0)
goto cleanup;
}
--
2.20.1