[libvirt] [PATCH 2/2] qemu: use virXMLNodeSanitizeNamespaces()
Replace the virDomainDef-specific virDomainDefMetadataSanitize() with
virXMLNodeSanitizeNamespaces().
---
src/conf/domain_conf.c | 56 ++------------------------------------------------
1 file changed, 2 insertions(+), 54 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 75ad03f..efc95f7 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -3653,59 +3653,6 @@ virDomainDefRejectDuplicatePanics(virDomainDefPtr def)
return 0;
}
-/**
- * virDomainDefMetadataSanitize:
- * @def: Sanitize metadata for this def
- *
- * This function removes metadata elements in @def that share the namespace.
- * The first metadata entry of every duplicate namespace is kept. Additionally
- * elements with no namespace are deleted.
- */
-static void
-virDomainDefMetadataSanitize(virDomainDefPtr def)
-{
- xmlNodePtr child;
- xmlNodePtr next;
- xmlNodePtr dupl;
-
- if (!def || !def->metadata)
- return;
-
- child = def->metadata->children;
- while (child) {
- /* remove metadata entries that don't have any namespace at all */
- if (!child->ns || !child->ns->href) {
- dupl = child;
- child = child->next;
-
- xmlUnlinkNode(dupl);
- xmlFreeNode(dupl);
- continue;
- }
-
- /* check that every other child of @root doesn't share the namespace of
- * the current one and delete them possibly */
- next = child->next;
- while (next) {
- dupl = NULL;
-
- if (child->ns && next->ns &&
- STREQ_NULLABLE((const char *) child->ns->href,
- (const char *) next->ns->href))
- dupl = next;
-
- next = next->next;
-
- if (dupl) {
- xmlUnlinkNode(dupl);
- xmlFreeNode(dupl);
- }
- }
-
- child = child->next;
- }
-}
-
static int
virDomainDefPostParseMemory(virDomainDefPtr def,
@@ -4504,7 +4451,8 @@ virDomainDefPostParseInternal(virDomainDefPtr def,
}
/* clean up possibly duplicated metadata entries */
- virDomainDefMetadataSanitize(def);
+ if (def->metadata)
+ virXMLNodeSanitizeNamespaces(def->metadata);
virDomainDefPostParseGraphics(def);
--
2.5.5