diff --git a/ChangeLog b/ChangeLog index c1b3fe7eab..0195a108ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue May 5 10:19:14 EDT 2009 Cole Robinson + + * src/test.c: Small cleanups in test driver VolCreateXML + Tue May 5 10:18:15 EDT 2009 Cole Robinson * src/storage_driver.c: Remove some debug code from storage_driver.c diff --git a/src/test.c b/src/test.c index a518737d65..1915b573bc 100644 --- a/src/test.c +++ b/src/test.c @@ -3076,20 +3076,18 @@ testStorageVolumeCreateXML(virStoragePoolPtr pool, goto cleanup; } - if (!virStoragePoolObjIsActive(privpool)) { testError(pool->conn, VIR_ERR_INTERNAL_ERROR, _("storage pool '%s' is not active"), pool->name); goto cleanup; } - privvol = virStorageVolDefParse(pool->conn, privpool->def, xmldesc, NULL); if (privvol == NULL) goto cleanup; 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")); goto cleanup; } @@ -3102,8 +3100,6 @@ testStorageVolumeCreateXML(virStoragePoolPtr pool, privvol->name); goto cleanup; } - privpool->def->available = (privpool->def->capacity - - privpool->def->allocation); if (VIR_REALLOC_N(privpool->volumes.objs, privpool->volumes.count+1) < 0) {