VIR_LOG_INIT("conf.virstorageobj");
+virStoragePoolObjPtr
+virStoragePoolObjNew(void)
+{
+ virStoragePoolObjPtr obj;
+
+ if (VIR_ALLOC(obj) < 0)
+ return NULL;
+
+ if (virMutexInit(&obj->lock) < 0) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ _("cannot initialize mutex"));
+ VIR_FREE(obj);
+ return NULL;
+ }
+ virStoragePoolObjLock(obj);
+ obj->active = 0;
+ return obj;
+}
+
+
virStoragePoolDefPtr
virStoragePoolObjGetDef(virStoragePoolObjPtr obj)
{
return obj;
}
- if (VIR_ALLOC(obj) < 0)
- return NULL;
-
- if (virMutexInit(&obj->lock) < 0) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("cannot initialize mutex"));
- VIR_FREE(obj);
+ if (!(obj = virStoragePoolObjNew()))
return NULL;
- }
- virStoragePoolObjLock(obj);
- obj->active = 0;
if (VIR_APPEND_ELEMENT_COPY(pools->objs, pools->count, obj) < 0) {
virStoragePoolObjUnlock(obj);
virConnectPtr conn;
virStorageVolDefPtr vol = NULL, inputvol = NULL;
- virStoragePoolDefPtr pool = NULL;
+ virStoragePoolDefPtr def = NULL;
virStoragePoolDefPtr inputpool = NULL;
- virStoragePoolObj poolobj = {.def = NULL };
-
+ virStoragePoolObjPtr obj = NULL;
if (!(conn = virGetConnect()))
goto cleanup;
- if (!(pool = virStoragePoolDefParseFile(poolxml)))
+ if (!(def = virStoragePoolDefParseFile(poolxml)))
goto cleanup;
- poolobj.def = pool;
+ if (!(obj = virStoragePoolObjNew())) {
+ virStoragePoolDefFree(def);
+ goto cleanup;
+ }
+ virStoragePoolObjSetDef(obj, def);
if (inputpoolxml) {
if (!(inputpool = virStoragePoolDefParseFile(inputpoolxml)))
if (inputvolxml)
parse_flags |= VIR_VOL_XML_PARSE_NO_CAPACITY;
- if (!(vol = virStorageVolDefParseFile(pool, volxml, parse_flags)))
+ if (!(vol = virStorageVolDefParseFile(def, volxml, parse_flags)))
goto cleanup;
if (inputvolxml &&
!(inputvol = virStorageVolDefParseFile(inputpool, inputvolxml, 0)))
goto cleanup;
- testSetVolumeType(vol, pool);
+ testSetVolumeType(vol, def);
testSetVolumeType(inputvol, inputpool);
- cmd = virStorageBackendCreateQemuImgCmdFromVol(conn, &poolobj, vol,
+ cmd = virStorageBackendCreateQemuImgCmdFromVol(conn, obj, vol,
inputvol, flags,
create_tool, imgformat,
NULL);
ret = 0;
cleanup:
- virStoragePoolDefFree(pool);
virStoragePoolDefFree(inputpool);
virStorageVolDefFree(vol);
virStorageVolDefFree(inputvol);
virCommandFree(cmd);
VIR_FREE(actualCmdline);
+ virStoragePoolObjUnlock(obj);
+ virStoragePoolObjFree(obj);
virObjectUnref(conn);
return ret;
}