From nobody Sun Feb 8 20:00:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.39 as permitted sender) client-ip=209.132.183.39; envelope-from=libvir-list-bounces@redhat.com; helo=mx6-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.39 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx6-phx2.redhat.com (mx6-phx2.redhat.com [209.132.183.39]) by mx.zohomail.com with SMTPS id 1489180463648469.4484589572463; Fri, 10 Mar 2017 13:14:23 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v2ALBQHv051924; Fri, 10 Mar 2017 16:11:26 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v2ALAvQk023921 for ; Fri, 10 Mar 2017 16:10:57 -0500 Received: from localhost.localdomain.com (ovpn-117-9.phx2.redhat.com [10.3.117.9]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v2ALArRm011410 for ; Fri, 10 Mar 2017 16:10:57 -0500 From: John Ferlan To: libvir-list@redhat.com Date: Fri, 10 Mar 2017 16:10:38 -0500 Message-Id: <20170310211050.27784-7-jferlan@redhat.com> In-Reply-To: <20170310211050.27784-1-jferlan@redhat.com> References: <20170310211050.27784-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 06/18] conf: Rename API's in storage_adapter_conf X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Rename the API's to remove the storage pool source pieces Signed-off-by: John Ferlan --- 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_con= f.c index 3a16bcc..4f5b665 100644 --- a/src/conf/storage_adapter_conf.c +++ b/src/conf/storage_adapter_conf.c @@ -38,7 +38,7 @@ VIR_ENUM_IMPL(virStoragePoolSourceAdapter, =20 =20 void -virStoragePoolSourceAdapterClear(virStoragePoolSourceAdapterPtr adapter) +virStorageAdapterClear(virStoragePoolSourceAdapterPtr adapter) { if (adapter->type =3D=3D VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_FC_HOST)= { VIR_FREE(adapter->data.fchost.wwnn); @@ -55,9 +55,9 @@ virStoragePoolSourceAdapterClear(virStoragePoolSourceAdap= terPtr adapter) =20 =20 int -virStoragePoolDefParseSourceAdapter(virStoragePoolSourcePtr source, - xmlNodePtr node, - xmlXPathContextPtr ctxt) +virStorageAdapterParseXML(virStoragePoolSourcePtr source, + xmlNodePtr node, + xmlXPathContextPtr ctxt) { int ret =3D -1; xmlNodePtr relnode =3D ctxt->node; @@ -177,7 +177,7 @@ virStoragePoolDefParseSourceAdapter(virStoragePoolSourc= ePtr source, =20 =20 int -virStoragePoolSourceAdapterParseValidate(virStoragePoolDefPtr ret) +virStorageAdapterParseValidate(virStoragePoolDefPtr ret) { if (!ret->source.adapter.type) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -245,8 +245,8 @@ virStoragePoolSourceAdapterParseValidate(virStoragePool= DefPtr ret) =20 =20 void -virStoragePoolSourceAdapterFormat(virBufferPtr buf, - virStoragePoolSourcePtr src) +virStorageAdapterFormat(virBufferPtr buf, + virStoragePoolSourcePtr src) { virBufferAsprintf(buf, "adapter= .type)); diff --git a/src/conf/storage_adapter_conf.h b/src/conf/storage_adapter_con= f.h index dec2f18..ec812a1 100644 --- a/src/conf/storage_adapter_conf.h +++ b/src/conf/storage_adapter_conf.h @@ -26,18 +26,18 @@ # include "storage_conf.h" =20 void -virStoragePoolSourceAdapterClear(virStoragePoolSourceAdapterPtr adapter); +virStorageAdapterClear(virStoragePoolSourceAdapterPtr adapter); =20 int -virStoragePoolDefParseSourceAdapter(virStoragePoolSourcePtr source, - xmlNodePtr node, - xmlXPathContextPtr ctxt); +virStorageAdapterParseXML(virStoragePoolSourcePtr source, + xmlNodePtr node, + xmlXPathContextPtr ctxt); =20 int -virStoragePoolSourceAdapterParseValidate(virStoragePoolDefPtr ret); +virStorageAdapterParseValidate(virStoragePoolDefPtr ret); =20 void -virStoragePoolSourceAdapterFormat(virBufferPtr buf, - virStoragePoolSourcePtr src); +virStorageAdapterFormat(virBufferPtr buf, + virStoragePoolSourcePtr src); =20 #endif /* __VIR_STORAGE_ADAPTER_CONF_H__ */ diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 9314504..8709101 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -363,7 +363,7 @@ virStoragePoolSourceClear(virStoragePoolSourcePtr sourc= e) 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; =20 if ((adapternode =3D virXPathNode("./adapter", ctxt))) { - if (virStoragePoolDefParseSourceAdapter(source, adapternode, ctxt)= < 0) + if (virStorageAdapterParseXML(source, adapternode, ctxt) < 0) goto cleanup; } =20 @@ -802,7 +802,7 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt) } =20 if ((options->flags & VIR_STORAGE_POOL_SOURCE_ADAPTER) && - (virStoragePoolSourceAdapterParseValidate(ret)) < 0) + (virStorageAdapterParseValidate(ret)) < 0) goto error; =20 /* 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 =3D=3D VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_FC_= HOST || src->adapter.type =3D=3D VIR_STORAGE_POOL_SOURCE_ADAPTER_TYPE_SCS= I_HOST)) - virStoragePoolSourceAdapterFormat(buf, src); + virStorageAdapterFormat(buf, src); =20 if (options->flags & VIR_STORAGE_POOL_SOURCE_NAME) virBufferEscapeString(buf, "%s\n", src->name); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 76cf2ae..6a2bdf2 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -848,10 +848,10 @@ virDomainSnapshotUpdateRelations; =20 =20 # conf/storage_adapter_conf.h -virStoragePoolDefParseSourceAdapter; -virStoragePoolSourceAdapterClear; -virStoragePoolSourceAdapterFormat; -virStoragePoolSourceAdapterParseValidate; +virStorageAdapterClear; +virStorageAdapterFormat; +virStorageAdapterParseValidate; +virStorageAdapterParseXML; =20 =20 # conf/storage_conf.h --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list