External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-29 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small cleanups in test driver VolCreateXML

Browse Source
This commit is contained in:
Cole Robinson 2009-05-05 14:19:59 +00:00
parent 2a9ca74164
commit 03f3736511
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Tue May 5 10:19:14 EDT 2009 Cole Robinson <crobinso@redhat.com>
* src/test.c: Small cleanups in test driver VolCreateXML
Tue May 5 10:18:15 EDT 2009 Cole Robinson <crobinso@redhat.com> Tue May 5 10:18:15 EDT 2009 Cole Robinson <crobinso@redhat.com>
* src/storage_driver.c: Remove some debug code from storage_driver.c * src/storage_driver.c: Remove some debug code from storage_driver.c

6
src/test.c
View File

@ -3076,20 +3076,18 @@ testStorageVolumeCreateXML(virStoragePoolPtr pool,
goto cleanup; goto cleanup;
} }
if (!virStoragePoolObjIsActive(privpool)) { if (!virStoragePoolObjIsActive(privpool)) {
testError(pool->conn, VIR_ERR_INTERNAL_ERROR, testError(pool->conn, VIR_ERR_INTERNAL_ERROR,
_("storage pool '%s' is not active"), pool->name); _("storage pool '%s' is not active"), pool->name);
goto cleanup; goto cleanup;
} }
privvol = virStorageVolDefParse(pool->conn, privpool->def, xmldesc, NULL); privvol = virStorageVolDefParse(pool->conn, privpool->def, xmldesc, NULL);
if (privvol == NULL) if (privvol == NULL)
goto cleanup; goto cleanup;
if (virStorageVolDefFindByName(privpool, privvol->name)) { if (virStorageVolDefFindByName(privpool, privvol->name)) {
testError(pool->conn, VIR_ERR_INVALID_STORAGE_POOL, testError(pool->conn, VIR_ERR_INVALID_STORAGE_VOL,
"%s", _("storage vol already exists")); "%s", _("storage vol already exists"));
goto cleanup; goto cleanup;
} }
@ -3102,8 +3100,6 @@ testStorageVolumeCreateXML(virStoragePoolPtr pool,
privvol->name); privvol->name);
goto cleanup; goto cleanup;
} }
privpool->def->available = (privpool->def->capacity -
privpool->def->allocation);
if (VIR_REALLOC_N(privpool->volumes.objs, if (VIR_REALLOC_N(privpool->volumes.objs,
privpool->volumes.count+1) < 0) { privpool->volumes.count+1) < 0) {