External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

storage: Remove unused attribute conn from 'checkPool' callback

Browse Source 
In order to be able to use 'checkPool' inside functions which do not
have any connection reference, 'conn' attribute needs to be discarded
from the checkPool's signature, since it's not used by any storage backend
anyway.
This commit is contained in:
Erik Skultety 2015-03-09 15:34:35 +01:00
parent 20aca080f3
commit cf7392a0d2
8 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/storage/storage_backend.h
View File

@ -34,8 +34,7 @@
typedef char * (*virStorageBackendFindPoolSources)(virConnectPtr conn, typedef char * (*virStorageBackendFindPoolSources)(virConnectPtr conn,
const char *srcSpec, const char *srcSpec,
unsigned int flags); unsigned int flags);
typedef int (*virStorageBackendCheckPool)(virConnectPtr conn, typedef int (*virStorageBackendCheckPool)(virStoragePoolObjPtr pool,
virStoragePoolObjPtr pool,
bool *active); bool *active);
typedef int (*virStorageBackendStartPool)(virConnectPtr conn, typedef int (*virStorageBackendStartPool)(virConnectPtr conn,
virStoragePoolObjPtr pool); virStoragePoolObjPtr pool);

3
src/storage/storage_backend_fs.c
View File

@ -533,8 +533,7 @@ virStorageBackendFileSystemUnmount(virStoragePoolObjPtr pool)
static int static int
virStorageBackendFileSystemCheck(virConnectPtr conn ATTRIBUTE_UNUSED, virStorageBackendFileSystemCheck(virStoragePoolObjPtr pool,
virStoragePoolObjPtr pool,
bool *isActive) bool *isActive)
{ {
if (pool->def->type == VIR_STORAGE_POOL_DIR) { if (pool->def->type == VIR_STORAGE_POOL_DIR) {

3
src/storage/storage_backend_iscsi.c
View File

@ -236,8 +236,7 @@ virStorageBackendISCSIFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED,
} }
static int static int
virStorageBackendISCSICheckPool(virConnectPtr conn ATTRIBUTE_UNUSED, virStorageBackendISCSICheckPool(virStoragePoolObjPtr pool,
virStoragePoolObjPtr pool,
bool *isActive) bool *isActive)
{ {
char *session = NULL; char *session = NULL;

3
src/storage/storage_backend_logical.c
View File

@ -479,8 +479,7 @@ virStorageBackendLogicalFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED,
static int static int
virStorageBackendLogicalCheckPool(virConnectPtr conn ATTRIBUTE_UNUSED, virStorageBackendLogicalCheckPool(virStoragePoolObjPtr pool,
virStoragePoolObjPtr pool,
bool *isActive) bool *isActive)
{ {
*isActive = virFileExists(pool->def->target.path); *isActive = virFileExists(pool->def->target.path);

3
src/storage/storage_backend_mpath.c
View File

@ -245,8 +245,7 @@ virStorageBackendGetMaps(virStoragePoolObjPtr pool)
} }
static int static int
virStorageBackendMpathCheckPool(virConnectPtr conn ATTRIBUTE_UNUSED, virStorageBackendMpathCheckPool(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED,
virStoragePoolObjPtr pool ATTRIBUTE_UNUSED,
bool *isActive) bool *isActive)
{ {
*isActive = virFileExists("/dev/mpath"); *isActive = virFileExists("/dev/mpath");

3
src/storage/storage_backend_scsi.c
View File

@ -844,8 +844,7 @@ deleteVport(virConnectPtr conn,
static int static int
virStorageBackendSCSICheckPool(virConnectPtr conn ATTRIBUTE_UNUSED, virStorageBackendSCSICheckPool(virStoragePoolObjPtr pool,
virStoragePoolObjPtr pool,
bool *isActive) bool *isActive)
{ {
char *path = NULL; char *path = NULL;

3
src/storage/storage_backend_zfs.c
View File

@ -41,8 +41,7 @@ VIR_LOG_INIT("storage.storage_backend_zfs");
static int static int
virStorageBackendZFSCheckPool(virConnectPtr conn ATTRIBUTE_UNUSED, virStorageBackendZFSCheckPool(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED,
virStoragePoolObjPtr pool ATTRIBUTE_UNUSED,
bool *isActive) bool *isActive)
{ {
char *devpath; char *devpath;

2
src/storage/storage_driver.c
View File

@ -100,7 +100,7 @@ storageDriverAutostart(void)
} }
if (backend->checkPool && if (backend->checkPool &&
backend->checkPool(conn, pool, &started) < 0) { backend->checkPool(pool, &started) < 0) {
virErrorPtr err = virGetLastError(); virErrorPtr err = virGetLastError();
VIR_ERROR(_("Failed to initialize storage pool '%s': %s"), VIR_ERROR(_("Failed to initialize storage pool '%s': %s"),
pool->def->name, err ? err->message : pool->def->name, err ? err->message :