conf: networkport: Remove virNetworkPortDefParseNode

The function is exported but used only intenally, additionally
everything it did for the only caller can be replaced by properly using
virXMLParse.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/conf/virnetworkportdef.c b/src/conf/virnetworkportdef.c
index 40cadc4ae81d8a3c1e7de6e8df37fedaa55182ba..651e4c33295e65911e3f2307078db6930f549a53 100644 (file)
--- a/src/conf/virnetworkportdef.c
+++ b/src/conf/virnetworkportdef.c
@@ -251,42 +251,20 @@ virNetworkPortDefParseXML(xmlXPathContextPtr ctxt)
 }
 
 
-virNetworkPortDef *
-virNetworkPortDefParseNode(xmlDocPtr xml,
-                           xmlNodePtr root)
-{
-    g_autoptr(xmlXPathContext) ctxt = NULL;
-
-    if (STRNEQ((const char *)root->name, "networkport")) {
-        virReportError(VIR_ERR_XML_ERROR,
-                       "%s",
-                       _("unknown root element for network port"));
-        return NULL;
-    }
-
-    if (!(ctxt = virXMLXPathContextNew(xml)))
-        return NULL;
-
-    ctxt->node = root;
-    return virNetworkPortDefParseXML(ctxt);
-}
-
-
 static virNetworkPortDef *
 virNetworkPortDefParse(const char *xmlStr,
                        const char *filename,
                        unsigned int flags)
 {
-    virNetworkPortDef *def = NULL;
     g_autoptr(xmlDoc) xml = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
     bool validate = flags & VIR_NETWORK_PORT_CREATE_VALIDATE;
 
-    if ((xml = virXMLParse(filename, xmlStr, _("(networkport_definition)"),
-                           NULL, NULL, "networkport.rng", validate))) {
-        def = virNetworkPortDefParseNode(xml, xmlDocGetRootElement(xml));
-    }
+    if (!(xml = virXMLParse(filename, xmlStr, _("(networkport_definition)"),
+                            "networkport", &ctxt, "networkport.rng", validate)))
+        return NULL;
 
-    return def;
+    return virNetworkPortDefParseXML(ctxt);
 }
 
 

diff --git a/src/conf/virnetworkportdef.h b/src/conf/virnetworkportdef.h
index c661534046acb5a65ea17b19103c0f7f05827cb6..908a7c87950f52c08401b2ba3a19e6ab576706d3 100644 (file)
--- a/src/conf/virnetworkportdef.h
+++ b/src/conf/virnetworkportdef.h
@@ -80,10 +80,6 @@ void
 virNetworkPortDefFree(virNetworkPortDef *port);
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virNetworkPortDef, virNetworkPortDefFree);
 
-virNetworkPortDef *
-virNetworkPortDefParseNode(xmlDocPtr xml,
-                           xmlNodePtr root);
-
 virNetworkPortDef *
 virNetworkPortDefParseString(const char *xml,
                              unsigned int flags);

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index b8165c07d9c9d3bdafb26dbb39cdc4400721a6a4..903c4196df89bc008282468e566133aa0fc8c3db 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1327,7 +1327,6 @@ virNetworkPortDefFormat;
 virNetworkPortDefFormatBuf;
 virNetworkPortDefFree;
 virNetworkPortDefParseFile;
-virNetworkPortDefParseNode;
 virNetworkPortDefParseString;
 virNetworkPortDefSaveStatus;