From nobody Sun Feb 8 17:21:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.25 as permitted sender) client-ip=209.132.183.25; envelope-from=libvir-list-bounces@redhat.com; helo=mx4-phx2.redhat.com; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.25 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) by mx.zohomail.com with SMTPS id 1488922784420607.9593079473781; Tue, 7 Mar 2017 13:39:44 -0800 (PST) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v27LaUGF008083; Tue, 7 Mar 2017 16:36:31 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v27La2J1013309 for ; Tue, 7 Mar 2017 16:36:02 -0500 Received: from localhost.localdomain.com (ovpn-117-9.phx2.redhat.com [10.3.117.9]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v27La0IH001585 for ; Tue, 7 Mar 2017 16:36:02 -0500 From: John Ferlan To: libvir-list@redhat.com Date: Tue, 7 Mar 2017 16:35:57 -0500 Message-Id: <20170307213557.10424-5-jferlan@redhat.com> In-Reply-To: <20170307213557.10424-1-jferlan@redhat.com> References: <20170307213557.10424-1-jferlan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 4/4] conf: Use consistent function name prefixes for virstorageobj 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" Use "virStoragePoolObj" as a prefix for any external API in virstorageobj. Also a couple of functions were local to virstorageobj.c, so remove their external defs iin virstorageobj.h. NB: The virStorageVolDef* API's won't change. Signed-off-by: John Ferlan --- src/conf/virstorageobj.c | 29 +++++++++++++++-------------- src/conf/virstorageobj.h | 25 ++++++++----------------- src/libvirt_private.syms | 7 +++---- src/storage/storage_driver.c | 24 ++++++++++++------------ 4 files changed, 38 insertions(+), 47 deletions(-) diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 12108d8..01b263d 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -124,7 +124,7 @@ virStoragePoolObjFindByName(virStoragePoolObjListPtr po= ols, } =20 =20 -virStoragePoolObjPtr +static virStoragePoolObjPtr virStoragePoolSourceFindDuplicateDevices(virStoragePoolObjPtr pool, virStoragePoolDefPtr def) { @@ -279,10 +279,10 @@ virStoragePoolObjLoad(virStoragePoolObjListPtr pools, } =20 =20 -virStoragePoolObjPtr -virStoragePoolLoadState(virStoragePoolObjListPtr pools, - const char *stateDir, - const char *name) +static virStoragePoolObjPtr +virStoragePoolObjLoadState(virStoragePoolObjListPtr pools, + const char *stateDir, + const char *name) { char *stateFile =3D NULL; virStoragePoolDefPtr def =3D NULL; @@ -339,8 +339,8 @@ virStoragePoolLoadState(virStoragePoolObjListPtr pools, =20 =20 int -virStoragePoolLoadAllState(virStoragePoolObjListPtr pools, - const char *stateDir) +virStoragePoolObjLoadAllState(virStoragePoolObjListPtr pools, + const char *stateDir) { DIR *dir; struct dirent *entry; @@ -356,7 +356,8 @@ virStoragePoolLoadAllState(virStoragePoolObjListPtr poo= ls, if (!virFileStripSuffix(entry->d_name, ".xml")) continue; =20 - if (!(pool =3D virStoragePoolLoadState(pools, stateDir, entry->d_n= ame))) + if (!(pool =3D virStoragePoolObjLoadState(pools, stateDir, + entry->d_name))) continue; virStoragePoolObjUnlock(pool); } @@ -367,9 +368,9 @@ virStoragePoolLoadAllState(virStoragePoolObjListPtr poo= ls, =20 =20 int -virStoragePoolLoadAllConfigs(virStoragePoolObjListPtr pools, - const char *configDir, - const char *autostartDir) +virStoragePoolObjLoadAllConfigs(virStoragePoolObjListPtr pools, + const char *configDir, + const char *autostartDir) { DIR *dir; struct dirent *entry; @@ -703,9 +704,9 @@ virStoragePoolSourceISCSIMatch(virStoragePoolObjPtr mat= chpool, =20 =20 int -virStoragePoolSourceFindDuplicate(virConnectPtr conn, - virStoragePoolObjListPtr pools, - virStoragePoolDefPtr def) +virStoragePoolObjSourceFindDuplicate(virConnectPtr conn, + virStoragePoolObjListPtr pools, + virStoragePoolDefPtr def) { size_t i; int ret =3D 1; diff --git a/src/conf/virstorageobj.h b/src/conf/virstorageobj.h index 13cec72..ecba94e 100644 --- a/src/conf/virstorageobj.h +++ b/src/conf/virstorageobj.h @@ -77,18 +77,13 @@ virStoragePoolObjIsActive(virStoragePoolObjPtr pool) } =20 int -virStoragePoolLoadAllConfigs(virStoragePoolObjListPtr pools, - const char *configDir, - const char *autostartDir); +virStoragePoolObjLoadAllConfigs(virStoragePoolObjListPtr pools, + const char *configDir, + const char *autostartDir); =20 int -virStoragePoolLoadAllState(virStoragePoolObjListPtr pools, - const char *stateDir); - -virStoragePoolObjPtr -virStoragePoolLoadState(virStoragePoolObjListPtr pools, - const char *stateDir, - const char *name); +virStoragePoolObjLoadAllState(virStoragePoolObjListPtr pools, + const char *stateDir); =20 virStoragePoolObjPtr virStoragePoolObjFindByUUID(virStoragePoolObjListPtr pools, @@ -98,10 +93,6 @@ virStoragePoolObjPtr virStoragePoolObjFindByName(virStoragePoolObjListPtr pools, const char *name); =20 -virStoragePoolObjPtr -virStoragePoolSourceFindDuplicateDevices(virStoragePoolObjPtr pool, - virStoragePoolDefPtr def); - virStorageVolDefPtr virStorageVolDefFindByKey(virStoragePoolObjPtr pool, const char *key); @@ -145,9 +136,9 @@ virStoragePoolObjIsDuplicate(virStoragePoolObjListPtr p= ools, unsigned int check_active); =20 int -virStoragePoolSourceFindDuplicate(virConnectPtr conn, - virStoragePoolObjListPtr pools, - virStoragePoolDefPtr def); +virStoragePoolObjSourceFindDuplicate(virConnectPtr conn, + virStoragePoolObjListPtr pools, + virStoragePoolDefPtr def); =20 void virStoragePoolObjLock(virStoragePoolObjPtr obj); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 030f58a..21ffc8f8 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -976,8 +976,6 @@ virSecretObjSetValueSize; =20 =20 # conf/virstorageobj.h -virStoragePoolLoadAllConfigs; -virStoragePoolLoadAllState; virStoragePoolObjAssignDef; virStoragePoolObjClearVols; virStoragePoolObjDeleteDef; @@ -986,12 +984,13 @@ virStoragePoolObjFindByUUID; virStoragePoolObjIsDuplicate; virStoragePoolObjListExport; virStoragePoolObjListFree; +virStoragePoolObjLoadAllConfigs; +virStoragePoolObjLoadAllState; virStoragePoolObjLock; virStoragePoolObjRemove; virStoragePoolObjSaveDef; +virStoragePoolObjSourceFindDuplicate; virStoragePoolObjUnlock; -virStoragePoolSourceFindDuplicate; -virStoragePoolSourceFindDuplicateDevices; =20 =20 # cpu/cpu.h diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 0bc047f..287a862 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -267,13 +267,13 @@ storageStateInitialize(bool privileged, goto error; } =20 - if (virStoragePoolLoadAllState(&driver->pools, - driver->stateDir) < 0) + if (virStoragePoolObjLoadAllState(&driver->pools, + driver->stateDir) < 0) goto error; =20 - if (virStoragePoolLoadAllConfigs(&driver->pools, - driver->configDir, - driver->autostartDir) < 0) + if (virStoragePoolObjLoadAllConfigs(&driver->pools, + driver->configDir, + driver->autostartDir) < 0) goto error; =20 storagePoolUpdateAllState(); @@ -323,11 +323,11 @@ storageStateReload(void) return -1; =20 storageDriverLock(); - virStoragePoolLoadAllState(&driver->pools, - driver->stateDir); - virStoragePoolLoadAllConfigs(&driver->pools, - driver->configDir, - driver->autostartDir); + virStoragePoolObjLoadAllState(&driver->pools, + driver->stateDir); + virStoragePoolObjLoadAllConfigs(&driver->pools, + driver->configDir, + driver->autostartDir); storageDriverAutostart(); storageDriverUnlock(); =20 @@ -695,7 +695,7 @@ storagePoolCreateXML(virConnectPtr conn, if (virStoragePoolObjIsDuplicate(&driver->pools, def, 1) < 0) goto cleanup; =20 - if (virStoragePoolSourceFindDuplicate(conn, &driver->pools, def) < 0) + if (virStoragePoolObjSourceFindDuplicate(conn, &driver->pools, def) < = 0) goto cleanup; =20 if ((backend =3D virStorageBackendForType(def->type)) =3D=3D NULL) @@ -790,7 +790,7 @@ storagePoolDefineXML(virConnectPtr conn, if (virStoragePoolObjIsDuplicate(&driver->pools, def, 0) < 0) goto cleanup; =20 - if (virStoragePoolSourceFindDuplicate(conn, &driver->pools, def) < 0) + if (virStoragePoolObjSourceFindDuplicate(conn, &driver->pools, def) < = 0) goto cleanup; =20 if (virStorageBackendForType(def->type) =3D=3D NULL) --=20 2.9.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list