NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "storage: Introduce internal pool support"

Browse Source 
The internal pools were an idea in one of the first iterations of the
gluster series, which we decided not to use. Somehow the patch still
got pushed. Remove it as the internal flag isn't needed.

This reverts commit 362da8209d.
This commit is contained in:
Peter Krempa 2014-02-14 16:03:22 +01:00
parent 665344da01
commit 98bbc8d59a
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/conf/storage_conf.c
View File

@ -2172,9 +2172,6 @@ static bool
virStoragePoolMatch(virStoragePoolObjPtr poolobj, virStoragePoolMatch(virStoragePoolObjPtr poolobj,
unsigned int flags) unsigned int flags)
{ {
if (poolobj->internal)
return false;
/* filter by active state */ /* filter by active state */
if (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE) && if (MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_FILTERS_ACTIVE) &&
!((MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE) && !((MATCH(VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE) &&

1
src/conf/storage_conf.h
View File

@ -332,7 +332,6 @@ struct _virStoragePoolObj {
int active; int active;
int autostart; int autostart;
unsigned int asyncjobs; unsigned int asyncjobs;
bool internal;
virStoragePoolDefPtr def; virStoragePoolDefPtr def;
virStoragePoolDefPtr newDef; virStoragePoolDefPtr newDef;

12
src/storage/storage_driver.c
View File

@ -376,8 +376,7 @@ storageConnectNumOfStoragePools(virConnectPtr conn) {
virStoragePoolObjPtr obj = driver->pools.objs[i]; virStoragePoolObjPtr obj = driver->pools.objs[i];
virStoragePoolObjLock(obj); virStoragePoolObjLock(obj);
if (virConnectNumOfStoragePoolsCheckACL(conn, obj->def) && if (virConnectNumOfStoragePoolsCheckACL(conn, obj->def) &&
virStoragePoolObjIsActive(obj) && virStoragePoolObjIsActive(obj))
!obj->internal)
nactive++; nactive++;
virStoragePoolObjUnlock(obj); virStoragePoolObjUnlock(obj);
} }
@ -402,8 +401,7 @@ storageConnectListStoragePools(virConnectPtr conn,
virStoragePoolObjPtr obj = driver->pools.objs[i]; virStoragePoolObjPtr obj = driver->pools.objs[i];
virStoragePoolObjLock(obj); virStoragePoolObjLock(obj);
if (virConnectListStoragePoolsCheckACL(conn, obj->def) && if (virConnectListStoragePoolsCheckACL(conn, obj->def) &&
virStoragePoolObjIsActive(obj) && virStoragePoolObjIsActive(obj)) {
!obj->internal) {
if (VIR_STRDUP(names[got], obj->def->name) < 0) { if (VIR_STRDUP(names[got], obj->def->name) < 0) {
virStoragePoolObjUnlock(obj); virStoragePoolObjUnlock(obj);
goto cleanup; goto cleanup;
@ -437,8 +435,7 @@ storageConnectNumOfDefinedStoragePools(virConnectPtr conn) {
virStoragePoolObjPtr obj = driver->pools.objs[i]; virStoragePoolObjPtr obj = driver->pools.objs[i];
virStoragePoolObjLock(obj); virStoragePoolObjLock(obj);
if (virConnectNumOfDefinedStoragePoolsCheckACL(conn, obj->def) && if (virConnectNumOfDefinedStoragePoolsCheckACL(conn, obj->def) &&
!virStoragePoolObjIsActive(obj) && !virStoragePoolObjIsActive(obj))
!obj->internal)
nactive++; nactive++;
virStoragePoolObjUnlock(obj); virStoragePoolObjUnlock(obj);
} }
@ -463,8 +460,7 @@ storageConnectListDefinedStoragePools(virConnectPtr conn,
virStoragePoolObjPtr obj = driver->pools.objs[i]; virStoragePoolObjPtr obj = driver->pools.objs[i];
virStoragePoolObjLock(obj); virStoragePoolObjLock(obj);
if (virConnectListDefinedStoragePoolsCheckACL(conn, obj->def) && if (virConnectListDefinedStoragePoolsCheckACL(conn, obj->def) &&
!virStoragePoolObjIsActive(obj) && !virStoragePoolObjIsActive(obj)) {
!obj->internal) {
if (VIR_STRDUP(names[got], obj->def->name) < 0) { if (VIR_STRDUP(names[got], obj->def->name) < 0) {
virStoragePoolObjUnlock(obj); virStoragePoolObjUnlock(obj);
goto cleanup; goto cleanup;