From 1e21c040540478f5e348ff3924d89d4d04cf606c Mon Sep 17 00:00:00 2001
From: John Ferlan <jferlan@redhat.com>
Date: Fri, 10 Mar 2017 13:24:56 -0500
Subject: [PATCH] conf: Rename API's in storage_adapter_conf

Rename the API's to remove the storage pool source pieces

Signed-off-by: John Ferlan <jferlan@redhat.com>
---
 src/conf/storage_adapter_conf.c | 14 +++++++-------
 src/conf/storage_adapter_conf.h | 14 +++++++-------
 src/conf/storage_conf.c         |  8 ++++----
 src/libvirt_private.syms        |  8 ++++----
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/conf/storage_adapter_conf.c b/src/conf/storage_adapter_conf.c
index fd57125a39..8c8ee2f22a 100644
--- a/src/conf/storage_adapter_conf.c
+++ b/src/conf/storage_adapter_conf.c
@@ -38,7 +38,7 @@ VIR_ENUM_IMPL(virStoragePoolSourceAdapter,
 
 
 void
-virStoragePoolSourceAdapterClear(virStoragePoolSourceAdapterPtr adapter)
+virStorageAdapterClear(virStoragePoolSourceAdapterPtr adapter)
 {
     if (adapter->type == VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_FC_HOST) {
         VIR_FREE(adapter->data.fchost.wwnn);
@@ -55,9 +55,9 @@ virStoragePoolSourceAdapterClear(virStoragePoolSourceAdapterPtr adapter)
 
 
 int
-virStoragePoolDefParseSourceAdapter(virStoragePoolSourcePtr source,
-                                    xmlNodePtr node,
-                                    xmlXPathContextPtr ctxt)
+virStorageAdapterParseXML(virStoragePoolSourcePtr source,
+                          xmlNodePtr node,
+                          xmlXPathContextPtr ctxt)
 {
     int ret = -1;
     xmlNodePtr relnode = ctxt->node;
@@ -177,7 +177,7 @@ virStoragePoolDefParseSourceAdapter(virStoragePoolSourcePtr source,
 
 
 int
-virStoragePoolSourceAdapterValidate(virStoragePoolDefPtr ret)
+virStorageAdapterValidate(virStoragePoolDefPtr ret)
 {
     if (!ret->source.adapter.type) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
@@ -253,8 +253,8 @@ virStoragePoolSourceAdapterValidate(virStoragePoolDefPtr ret)
 
 
 void
-virStoragePoolSourceAdapterFormat(virBufferPtr buf,
-                                  virStoragePoolSourcePtr src)
+virStorageAdapterFormat(virBufferPtr buf,
+                        virStoragePoolSourcePtr src)
 {
     virBufferAsprintf(buf, "<adapter type='%s'",
                       virStoragePoolSourceAdapterTypeToString(src->adapter.type));
diff --git a/src/conf/storage_adapter_conf.h b/src/conf/storage_adapter_conf.h
index e5dbbc01f9..517d879f70 100644
--- a/src/conf/storage_adapter_conf.h
+++ b/src/conf/storage_adapter_conf.h
@@ -26,18 +26,18 @@
 # include "storage_conf.h"
 
 void
-virStoragePoolSourceAdapterClear(virStoragePoolSourceAdapterPtr adapter);
+virStorageAdapterClear(virStoragePoolSourceAdapterPtr adapter);
 
 int
-virStoragePoolDefParseSourceAdapter(virStoragePoolSourcePtr source,
-                                    xmlNodePtr node,
-                                    xmlXPathContextPtr ctxt);
+virStorageAdapterParseXML(virStoragePoolSourcePtr source,
+                          xmlNodePtr node,
+                          xmlXPathContextPtr ctxt);
 
 int
-virStoragePoolSourceAdapterValidate(virStoragePoolDefPtr ret);
+virStorageAdapterValidate(virStoragePoolDefPtr ret);
 
 void
-virStoragePoolSourceAdapterFormat(virBufferPtr buf,
-                                  virStoragePoolSourcePtr src);
+virStorageAdapterFormat(virBufferPtr buf,
+                        virStoragePoolSourcePtr src);
 
 #endif /* __VIR_STORAGE_ADAPTER_CONF_H__ */
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index c5bc936904..e5b0c7b84d 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -363,7 +363,7 @@ virStoragePoolSourceClear(virStoragePoolSourcePtr source)
     VIR_FREE(source->devices);
     VIR_FREE(source->dir);
     VIR_FREE(source->name);
-    virStoragePoolSourceAdapterClear(&source->adapter);
+    virStorageAdapterClear(&source->adapter);
     VIR_FREE(source->initiator.iqn);
     virStorageAuthDefFree(source->auth);
     VIR_FREE(source->vendor);
@@ -565,7 +565,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt,
         goto cleanup;
 
     if ((adapternode = virXPathNode("./adapter", ctxt))) {
-        if (virStoragePoolDefParseSourceAdapter(source, adapternode, ctxt) < 0)
+        if (virStorageAdapterParseXML(source, adapternode, ctxt) < 0)
             goto cleanup;
     }
 
@@ -802,7 +802,7 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt)
     }
 
     if ((options->flags & VIR_STORAGE_POOL_SOURCE_ADAPTER) &&
-        (virStoragePoolSourceAdapterValidate(ret)) < 0)
+        (virStorageAdapterValidate(ret)) < 0)
             goto error;
 
     /* If DEVICE is the only source type, then its required */
@@ -960,7 +960,7 @@ virStoragePoolSourceFormat(virBufferPtr buf,
     if ((options->flags & VIR_STORAGE_POOL_SOURCE_ADAPTER) &&
         (src->adapter.type == VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_FC_HOST ||
          src->adapter.type == VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_SCSI_HOST))
-        virStoragePoolSourceAdapterFormat(buf, src);
+        virStorageAdapterFormat(buf, src);
 
     if (options->flags & VIR_STORAGE_POOL_SOURCE_NAME)
         virBufferEscapeString(buf, "<name>%s</name>\n", src->name);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 75e0f36c8f..c416678286 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -848,10 +848,10 @@ virDomainSnapshotUpdateRelations;
 
 
 # conf/storage_adapter_conf.h
-virStoragePoolDefParseSourceAdapter;
-virStoragePoolSourceAdapterClear;
-virStoragePoolSourceAdapterFormat;
-virStoragePoolSourceAdapterValidate;
+virStorageAdapterClear;
+virStorageAdapterFormat;
+virStorageAdapterParseXML;
+virStorageAdapterValidate;
 
 
 # conf/storage_conf.h