External/libvirt
1
0
Fork 0
Code

storage: Use virStoragePoolObj{Is|Set}Autostart

Browse Source 
Use the new accessor APIs for storage_driver and test_driver.
This commit is contained in:
John Ferlan 2017-07-26 12:23:11 -04:00
parent 0147f72741
commit bb15e65af2
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/storage/storage_driver.c
View File

@ -196,7 +196,7 @@ storageDriverAutostart(void)
continue; continue;
} }
if (obj->autostart && if (virStoragePoolObjIsAutostart(obj) &&
!virStoragePoolObjIsActive(obj)) { !virStoragePoolObjIsActive(obj)) {
if (backend->startPool && if (backend->startPool &&
backend->startPool(conn, obj) < 0) { backend->startPool(conn, obj) < 0) {
@ -1249,11 +1249,7 @@ storagePoolGetAutostart(virStoragePoolPtr pool,
if (virStoragePoolGetAutostartEnsureACL(pool->conn, obj->def) < 0) if (virStoragePoolGetAutostartEnsureACL(pool->conn, obj->def) < 0)
goto cleanup; goto cleanup;
if (!virStoragePoolObjGetConfigFile(obj)) { *autostart = virStoragePoolObjIsAutostart(obj) ? 1 : 0;
*autostart = 0;
} else {
*autostart = obj->autostart;
}
ret = 0; ret = 0;
@ -1269,6 +1265,8 @@ storagePoolSetAutostart(virStoragePoolPtr pool,
virStoragePoolObjPtr obj; virStoragePoolObjPtr obj;
const char *configFile; const char *configFile;
const char *autostartLink; const char *autostartLink;
bool new_autostart;
bool cur_autostart;
int ret = -1; int ret = -1;
storageDriverLock(); storageDriverLock();
@ -1286,10 +1284,10 @@ storagePoolSetAutostart(virStoragePoolPtr pool,
autostartLink = virStoragePoolObjGetAutostartLink(obj); autostartLink = virStoragePoolObjGetAutostartLink(obj);
autostart = (autostart != 0); new_autostart = (autostart != 0);
cur_autostart = virStoragePoolObjIsAutostart(obj);
if (obj->autostart != autostart) { if (cur_autostart != new_autostart) {
if (autostart) { if (new_autostart) {
if (virFileMakePath(driver->autostartDir) < 0) { if (virFileMakePath(driver->autostartDir) < 0) {
virReportSystemError(errno, virReportSystemError(errno,
_("cannot create autostart directory %s"), _("cannot create autostart directory %s"),
@ -1312,7 +1310,7 @@ storagePoolSetAutostart(virStoragePoolPtr pool,
goto cleanup; goto cleanup;
} }
} }
obj->autostart = autostart; virStoragePoolObjSetAutostart(obj, autostart);
} }
ret = 0; ret = 0;

4
src/test/test_driver.c
View File

@ -4764,7 +4764,7 @@ testStoragePoolGetAutostart(virStoragePoolPtr pool,
if (!virStoragePoolObjGetConfigFile(obj)) if (!virStoragePoolObjGetConfigFile(obj))
*autostart = 0; *autostart = 0;
else else
*autostart = obj->autostart; *autostart = virStoragePoolObjIsAutostart(obj) ? 1 : 0;
virStoragePoolObjUnlock(obj); virStoragePoolObjUnlock(obj);
return 0; return 0;
@ -4789,7 +4789,7 @@ testStoragePoolSetAutostart(virStoragePoolPtr pool,
} }
autostart = (autostart != 0); autostart = (autostart != 0);
obj->autostart = autostart; virStoragePoolObjSetAutostart(obj, autostart);
ret = 0; ret = 0;
cleanup: cleanup: