From 84961bd3f404328fa5a6b57dea27280f65553a1a Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Wed, 9 Dec 2009 09:38:11 +0000 Subject: [PATCH] Fix bug in storage driver accessing wrong private data * src/storage/storage_driver.c: Fix IsPersistent() and IsActivE() methods on storage pools to use 'storagePrivateData' instead of 'privateData'. Also fix naming convention of objects --- src/storage/storage_driver.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index e01d5ae4d5..c2f7850aa2 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -465,17 +465,17 @@ cleanup: } -static int storagePoolIsActive(virStoragePoolPtr net) +static int storagePoolIsActive(virStoragePoolPtr pool) { - virStorageDriverStatePtr driver = net->conn->privateData; + virStorageDriverStatePtr driver = pool->conn->storagePrivateData; virStoragePoolObjPtr obj; int ret = -1; storageDriverLock(driver); - obj = virStoragePoolObjFindByUUID(&driver->pools, net->uuid); + obj = virStoragePoolObjFindByUUID(&driver->pools, pool->uuid); storageDriverUnlock(driver); if (!obj) { - virStorageReportError(net->conn, VIR_ERR_NO_STORAGE_POOL, NULL); + virStorageReportError(pool->conn, VIR_ERR_NO_STORAGE_POOL, NULL); goto cleanup; } ret = virStoragePoolObjIsActive(obj); @@ -486,17 +486,17 @@ cleanup: return ret; } -static int storagePoolIsPersistent(virStoragePoolPtr net) +static int storagePoolIsPersistent(virStoragePoolPtr pool) { - virStorageDriverStatePtr driver = net->conn->privateData; + virStorageDriverStatePtr driver = pool->conn->storagePrivateData; virStoragePoolObjPtr obj; int ret = -1; storageDriverLock(driver); - obj = virStoragePoolObjFindByUUID(&driver->pools, net->uuid); + obj = virStoragePoolObjFindByUUID(&driver->pools, pool->uuid); storageDriverUnlock(driver); if (!obj) { - virStorageReportError(net->conn, VIR_ERR_NO_STORAGE_POOL, NULL); + virStorageReportError(pool->conn, VIR_ERR_NO_STORAGE_POOL, NULL); goto cleanup; } ret = obj->configFile ? 1 : 0;