[libvirt] [PATCH 25/34] conf: Replace virDomainDiskSourceParse by virDomainStorageSourceParse
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(a)redhat.com>
---
src/conf/domain_conf.c | 22 ++++------------------
src/conf/domain_conf.h | 5 -----
2 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e7f3bcf114..3de72fd807 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -9205,20 +9205,6 @@ virDomainStorageSourceParseFull(const char *typeXPath,
}
-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,
@@ -9280,7 +9266,7 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctxt,
return -1;
}
- if (virDomainDiskSourceParse(source, ctxt, backingStore, flags, xmlopt) < 0 ||
+ if (virDomainStorageSourceParse(source, ctxt, backingStore, flags, xmlopt) < 0 ||
virDomainDiskBackingStoreParse(ctxt, backingStore, flags, xmlopt) < 0)
return -1;
@@ -9414,8 +9400,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
@@ -9865,7 +9851,7 @@ virDomainDiskDefParseXML(virDomainXMLOptionPtr xmlopt,
continue;
if (!source && virXMLNodeNameEqual(cur, "source")) {
- if (virDomainDiskSourceParse(cur, ctxt, def->src, flags, xmlopt) < 0)
+ if (virDomainStorageSourceParse(cur, ctxt, def->src, flags, xmlopt) <
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 ad288d702b..72272965ae 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3070,11 +3070,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 *device);
--
2.20.1