Update ESX driver to always use privateData

Since the secondary drivers are only active when the primary
driver is also the ESX driver, there is no need to use the
different type specific privateData fields.

8 files changed, 68 insertions, 92 deletions

diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c
index c02b00f9e2..613cef682a 100644
--- a/src/esx/esx_device_monitor.c
+++ b/src/esx/esx_device_monitor.c
@@ -47,18 +47,14 @@ esxNodeDeviceOpen(virConnectPtr conn,
         return VIR_DRV_OPEN_DECLINED;
     }
 
-    conn->nodeDevicePrivateData = conn->privateData;
-
     return VIR_DRV_OPEN_SUCCESS;
 }
 
 
 
 static int
-esxNodeDeviceClose(virConnectPtr conn)
+esxNodeDeviceClose(virConnectPtr conn ATTRIBUTE_UNUSED)
 {
-    conn->nodeDevicePrivateData = NULL;
-
     return 0;
 }
 
diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c
index ecc5313e82..5fb9b1af8e 100644
--- a/src/esx/esx_interface_driver.c
+++ b/src/esx/esx_interface_driver.c
@@ -50,18 +50,14 @@ esxInterfaceOpen(virConnectPtr conn,
         return VIR_DRV_OPEN_DECLINED;
     }
 
-    conn->interfacePrivateData = conn->privateData;
-
     return VIR_DRV_OPEN_SUCCESS;
 }
 
 
 
 static int
-esxInterfaceClose(virConnectPtr conn)
+esxInterfaceClose(virConnectPtr conn ATTRIBUTE_UNUSED)
 {
-    conn->interfacePrivateData = NULL;
-
     return 0;
 }
 
@@ -70,7 +66,7 @@ esxInterfaceClose(virConnectPtr conn)
 static int
 esxConnectNumOfInterfaces(virConnectPtr conn)
 {
-    esxPrivate *priv = conn->interfacePrivateData;
+    esxPrivate *priv = conn->privateData;
     esxVI_PhysicalNic *physicalNicList = NULL;
     esxVI_PhysicalNic *physicalNic = NULL;
     int count = 0;
@@ -96,7 +92,7 @@ static int
 esxConnectListInterfaces(virConnectPtr conn, char **const names, int maxnames)
 {
     bool success = false;
-    esxPrivate *priv = conn->interfacePrivateData;
+    esxPrivate *priv = conn->privateData;
     esxVI_PhysicalNic *physicalNicList = NULL;
     esxVI_PhysicalNic *physicalNic = NULL;
     int count = 0;
@@ -161,7 +157,7 @@ static virInterfacePtr
 esxInterfaceLookupByName(virConnectPtr conn, const char *name)
 {
     virInterfacePtr iface = NULL;
-    esxPrivate *priv = conn->interfacePrivateData;
+    esxPrivate *priv = conn->privateData;
     esxVI_PhysicalNic *physicalNic = NULL;
 
     if (esxVI_EnsureSession(priv->primary) < 0 ||
@@ -183,7 +179,7 @@ static virInterfacePtr
 esxInterfaceLookupByMACString(virConnectPtr conn, const char *mac)
 {
     virInterfacePtr iface = NULL;
-    esxPrivate *priv = conn->interfacePrivateData;
+    esxPrivate *priv = conn->privateData;
     esxVI_PhysicalNic *physicalNic = NULL;
 
     if (esxVI_EnsureSession(priv->primary) < 0 ||
@@ -205,7 +201,7 @@ static char *
 esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags)
 {
     char *xml = NULL;
-    esxPrivate *priv = iface->conn->interfacePrivateData;
+    esxPrivate *priv = iface->conn->privateData;
     esxVI_PhysicalNic *physicalNic = NULL;
     virInterfaceDef def;
     bool hasAddress = false;
diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c
index c6f325c881..6fae4ffd09 100644
--- a/src/esx/esx_network_driver.c
+++ b/src/esx/esx_network_driver.c
@@ -56,18 +56,14 @@ esxNetworkOpen(virConnectPtr conn,
         return VIR_DRV_OPEN_DECLINED;
     }
 
-    conn->networkPrivateData = conn->privateData;
-
     return VIR_DRV_OPEN_SUCCESS;
 }
 
 
 
 static int
-esxNetworkClose(virConnectPtr conn)
+esxNetworkClose(virConnectPtr conn ATTRIBUTE_UNUSED)
 {
-    conn->networkPrivateData = NULL;
-
     return 0;
 }
 
@@ -76,7 +72,7 @@ esxNetworkClose(virConnectPtr conn)
 static int
 esxConnectNumOfNetworks(virConnectPtr conn)
 {
-    esxPrivate *priv = conn->networkPrivateData;
+    esxPrivate *priv = conn->privateData;
     esxVI_HostVirtualSwitch *hostVirtualSwitchList = NULL;
     esxVI_HostVirtualSwitch *hostVirtualSwitch = NULL;
     int count = 0;
@@ -103,7 +99,7 @@ static int
 esxConnectListNetworks(virConnectPtr conn, char **const names, int maxnames)
 {
     bool success = false;
-    esxPrivate *priv = conn->networkPrivateData;
+    esxPrivate *priv = conn->privateData;
     esxVI_HostVirtualSwitch *hostVirtualSwitchList = NULL;
     esxVI_HostVirtualSwitch *hostVirtualSwitch = NULL;
     int count = 0;
@@ -169,7 +165,7 @@ static virNetworkPtr
 esxNetworkLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
 {
     virNetworkPtr network = NULL;
-    esxPrivate *priv = conn->networkPrivateData;
+    esxPrivate *priv = conn->privateData;
     esxVI_HostVirtualSwitch *hostVirtualSwitchList = NULL;
     esxVI_HostVirtualSwitch *hostVirtualSwitch = NULL;
     unsigned char md5[MD5_DIGEST_SIZE]; /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */
@@ -214,7 +210,7 @@ static virNetworkPtr
 esxNetworkLookupByName(virConnectPtr conn, const char *name)
 {
     virNetworkPtr network = NULL;
-    esxPrivate *priv = conn->networkPrivateData;
+    esxPrivate *priv = conn->privateData;
     esxVI_HostVirtualSwitch *hostVirtualSwitch = NULL;
     unsigned char md5[MD5_DIGEST_SIZE]; /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */
 
@@ -318,7 +314,7 @@ static virNetworkPtr
 esxNetworkDefineXML(virConnectPtr conn, const char *xml)
 {
     virNetworkPtr network = NULL;
-    esxPrivate *priv = conn->networkPrivateData;
+    esxPrivate *priv = conn->privateData;
     virNetworkDefPtr def = NULL;
     esxVI_HostVirtualSwitch *hostVirtualSwitch = NULL;
     esxVI_HostPortGroup *hostPortGroupList = NULL;
@@ -527,7 +523,7 @@ static int
 esxNetworkUndefine(virNetworkPtr network)
 {
     int result = -1;
-    esxPrivate *priv = network->conn->networkPrivateData;
+    esxPrivate *priv = network->conn->privateData;
     esxVI_HostVirtualSwitch *hostVirtualSwitch = NULL;
     esxVI_HostPortGroup *hostPortGroupList = NULL;
     esxVI_String *hostPortGroupKey = NULL;
@@ -670,7 +666,7 @@ static char *
 esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags)
 {
     char *xml = NULL;
-    esxPrivate *priv = network_->conn->networkPrivateData;
+    esxPrivate *priv = network_->conn->privateData;
     esxVI_HostVirtualSwitch *hostVirtualSwitch = NULL;
     int count = 0;
     esxVI_PhysicalNic *physicalNicList = NULL;
diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c
index 3cf70d0807..d7ab60f9e3 100644
--- a/src/esx/esx_nwfilter_driver.c
+++ b/src/esx/esx_nwfilter_driver.c
@@ -47,18 +47,14 @@ esxNWFilterOpen(virConnectPtr conn,
         return VIR_DRV_OPEN_DECLINED;
     }
 
-    conn->nwfilterPrivateData = conn->privateData;
-
     return VIR_DRV_OPEN_SUCCESS;
 }
 
 
 
 static int
-esxNWFilterClose(virConnectPtr conn)
+esxNWFilterClose(virConnectPtr conn ATTRIBUTE_UNUSED)
 {
-    conn->nwfilterPrivateData = NULL;
-
     return 0;
 }
 
diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c
index 558cf07e32..4ce8ae4bbf 100644
--- a/src/esx/esx_secret_driver.c
+++ b/src/esx/esx_secret_driver.c
@@ -45,18 +45,14 @@ esxSecretOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED,
         return VIR_DRV_OPEN_DECLINED;
     }
 
-    conn->secretPrivateData = conn->privateData;
-
     return VIR_DRV_OPEN_SUCCESS;
 }
 
 
 
 static int
-esxSecretClose(virConnectPtr conn)
+esxSecretClose(virConnectPtr conn ATTRIBUTE_UNUSED)
 {
-    conn->secretPrivateData = NULL;
-
     return 0;
 }
 
diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_backend_iscsi.c
index 41f895d235..2e2a270f85 100644
--- a/src/esx/esx_storage_backend_iscsi.c
+++ b/src/esx/esx_storage_backend_iscsi.c
@@ -54,7 +54,7 @@ esxConnectNumOfStoragePools(virConnectPtr conn)
 {
     bool success = false;
     int count = 0;
-    esxPrivate *priv = conn->storagePrivateData;
+    esxPrivate *priv = conn->privateData;
     esxVI_HostInternetScsiHba *hostInternetScsiHba = NULL;
     esxVI_HostInternetScsiHbaStaticTarget *target;
 
@@ -99,7 +99,7 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names,
 {
     bool success = false;
     int count = 0;
-    esxPrivate *priv = conn->storagePrivateData;
+    esxPrivate *priv = conn->privateData;
     esxVI_HostInternetScsiHba *hostInternetScsiHba = NULL;
     esxVI_HostInternetScsiHbaStaticTarget *target;
     size_t i;
@@ -156,7 +156,7 @@ static virStoragePoolPtr
 esxStoragePoolLookupByName(virConnectPtr conn,
                            const char *name)
 {
-    esxPrivate *priv = conn->storagePrivateData;
+    esxPrivate *priv = conn->privateData;
     esxVI_HostInternetScsiHbaStaticTarget *target = NULL;
     /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */
     unsigned char md5[MD5_DIGEST_SIZE];
@@ -199,7 +199,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn,
                            const unsigned char *uuid)
 {
     virStoragePoolPtr pool = NULL;
-    esxPrivate *priv = conn->storagePrivateData;
+    esxPrivate *priv = conn->privateData;
     esxVI_HostInternetScsiHba *hostInternetScsiHba = NULL;
     esxVI_HostInternetScsiHbaStaticTarget *target;
     /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */
@@ -248,7 +248,7 @@ esxStoragePoolRefresh(virStoragePoolPtr pool,
                       unsigned int flags)
 {
     int result = -1;
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     esxVI_HostInternetScsiHba *hostInternetScsiHba = NULL;
 
     virCheckFlags(0, -1);
@@ -295,7 +295,7 @@ static char *
 esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags)
 {
     char *xml = NULL;
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     esxVI_HostInternetScsiHba *hostInternetScsiHba = NULL;
     esxVI_HostInternetScsiHbaStaticTarget *target;
     virStoragePoolDef def;
@@ -358,7 +358,7 @@ static int
 esxStoragePoolNumOfVolumes(virStoragePoolPtr pool)
 {
     int count = 0;
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     esxVI_HostScsiTopologyLun *hostScsiTopologyLunList = NULL;
     esxVI_HostScsiTopologyLun *hostScsiTopologyLun;
 
@@ -386,7 +386,7 @@ esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names,
 {
     bool success = false;
     int count = 0;
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     esxVI_HostScsiTopologyLun *hostScsiTopologyLunList = NULL;
     esxVI_HostScsiTopologyLun *hostScsiTopologyLun;
     esxVI_ScsiLun *scsiLunList = NULL;
@@ -445,7 +445,7 @@ esxStorageVolLookupByName(virStoragePoolPtr pool,
                           const char *name)
 {
     virStorageVolPtr volume = NULL;
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     esxVI_ScsiLun *scsiLunList = NULL;
     esxVI_ScsiLun *scsiLun;
     /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */
@@ -491,7 +491,7 @@ static virStorageVolPtr
 esxStorageVolLookupByPath(virConnectPtr conn, const char *path)
 {
     virStorageVolPtr volume = NULL;
-    esxPrivate *priv = conn->storagePrivateData;
+    esxPrivate *priv = conn->privateData;
     esxVI_ScsiLun *scsiLunList = NULL;
     esxVI_ScsiLun *scsiLun;
     esxVI_HostScsiDisk *hostScsiDisk = NULL;
@@ -539,7 +539,7 @@ static virStorageVolPtr
 esxStorageVolLookupByKey(virConnectPtr conn, const char *key)
 {
     virStorageVolPtr volume = NULL;
-    esxPrivate *priv = conn->storagePrivateData;
+    esxPrivate *priv = conn->privateData;
     char *poolName = NULL;
     esxVI_ScsiLun *scsiLunList = NULL;
     esxVI_ScsiLun *scsiLun;
@@ -626,7 +626,7 @@ esxStorageVolGetInfo(virStorageVolPtr volume,
                      virStorageVolInfoPtr info)
 {
     int result = -1;
-    esxPrivate *priv = volume->conn->storagePrivateData;
+    esxPrivate *priv = volume->conn->privateData;
     esxVI_ScsiLun *scsiLunList = NULL;
     esxVI_ScsiLun *scsiLun;
     esxVI_HostScsiDisk *hostScsiDisk = NULL;
@@ -672,7 +672,7 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume,
                         unsigned int flags)
 {
     char *xml = NULL;
-    esxPrivate *priv = volume->conn->storagePrivateData;
+    esxPrivate *priv = volume->conn->privateData;
     virStoragePoolDef pool;
     esxVI_ScsiLun *scsiLunList = NULL;
     esxVI_ScsiLun *scsiLun;
diff --git a/src/esx/esx_storage_backend_vmfs.c b/src/esx/esx_storage_backend_vmfs.c
index cf0da8445c..2e163c15d5 100644
--- a/src/esx/esx_storage_backend_vmfs.c
+++ b/src/esx/esx_storage_backend_vmfs.c
@@ -116,7 +116,7 @@ static int
 esxConnectNumOfStoragePools(virConnectPtr conn)
 {
     int count = 0;
-    esxPrivate *priv = conn->storagePrivateData;
+    esxPrivate *priv = conn->privateData;
     esxVI_ObjectContent *datastoreList = NULL;
     esxVI_ObjectContent *datastore = NULL;
 
@@ -141,7 +141,7 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names,
                            const int maxnames)
 {
     bool success = false;
-    esxPrivate *priv = conn->storagePrivateData;
+    esxPrivate *priv = conn->privateData;
     esxVI_String *propertyNameList = NULL;
     esxVI_DynamicProperty *dynamicProperty = NULL;
     esxVI_ObjectContent *datastoreList = NULL;
@@ -204,7 +204,7 @@ static virStoragePoolPtr
 esxStoragePoolLookupByName(virConnectPtr conn,
                            const char *name)
 {
-    esxPrivate *priv = conn->storagePrivateData;
+    esxPrivate *priv = conn->privateData;
     esxVI_ObjectContent *datastore = NULL;
     esxVI_DatastoreHostMount *hostMount = NULL;
     /* MD5_DIGEST_SIZE = VIR_UUID_BUFLEN = 16 */
@@ -257,7 +257,7 @@ static virStoragePoolPtr
 esxStoragePoolLookupByUUID(virConnectPtr conn,
                            const unsigned char *uuid)
 {
-    esxPrivate *priv = conn->storagePrivateData;
+    esxPrivate *priv = conn->privateData;
     esxVI_String *propertyNameList = NULL;
     esxVI_ObjectContent *datastoreList = NULL;
     esxVI_ObjectContent *datastore = NULL;
@@ -326,7 +326,7 @@ static int
 esxStoragePoolRefresh(virStoragePoolPtr pool, unsigned int flags)
 {
     int result = -1;
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     esxVI_ObjectContent *datastore = NULL;
 
     virCheckFlags(0, -1);
@@ -352,7 +352,7 @@ esxStoragePoolGetInfo(virStoragePoolPtr pool,
                       virStoragePoolInfoPtr info)
 {
     int result = -1;
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     esxVI_String *propertyNameList = NULL;
     esxVI_ObjectContent *datastore = NULL;
     esxVI_DynamicProperty *dynamicProperty = NULL;
@@ -411,7 +411,7 @@ esxStoragePoolGetInfo(virStoragePoolPtr pool,
 static char *
 esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags)
 {
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     esxVI_String *propertyNameList = NULL;
     esxVI_ObjectContent *datastore = NULL;
     esxVI_DatastoreHostMount *hostMount = NULL;
@@ -531,7 +531,7 @@ static int
 esxStoragePoolNumOfVolumes(virStoragePoolPtr pool)
 {
     bool success = false;
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     esxVI_HostDatastoreBrowserSearchResults *searchResultsList = NULL;
     esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL;
     esxVI_FileInfo *fileInfo = NULL;
@@ -566,7 +566,7 @@ esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names,
                           int maxnames)
 {
     bool success = false;
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     esxVI_HostDatastoreBrowserSearchResults *searchResultsList = NULL;
     esxVI_HostDatastoreBrowserSearchResults *searchResults = NULL;
     esxVI_FileInfo *fileInfo = NULL;
@@ -646,7 +646,7 @@ esxStorageVolLookupByName(virStoragePoolPtr pool,
                           const char *name)
 {
     virStorageVolPtr volume = NULL;
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     char *datastorePath = NULL;
     char *key = NULL;
 
@@ -674,7 +674,7 @@ static virStorageVolPtr
 esxStorageVolLookupByPath(virConnectPtr conn, const char *path)
 {
     virStorageVolPtr volume = NULL;
-    esxPrivate *priv = conn->storagePrivateData;
+    esxPrivate *priv = conn->privateData;
     char *datastoreName = NULL;
     char *directoryAndFileName = NULL;
     char *key = NULL;
@@ -706,7 +706,7 @@ static virStorageVolPtr
 esxStorageVolLookupByKey(virConnectPtr conn, const char *key)
 {
     virStorageVolPtr volume = NULL;
-    esxPrivate *priv = conn->storagePrivateData;
+    esxPrivate *priv = conn->privateData;
     esxVI_String *propertyNameList = NULL;
     esxVI_ObjectContent *datastoreList = NULL;
     esxVI_ObjectContent *datastore = NULL;
@@ -842,7 +842,7 @@ esxStorageVolCreateXML(virStoragePoolPtr pool,
                        unsigned int flags)
 {
     virStorageVolPtr volume = NULL;
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     virStoragePoolDef poolDef;
     virStorageVolDefPtr def = NULL;
     char *tmp;
@@ -1064,7 +1064,7 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool,
                            unsigned int flags)
 {
     virStorageVolPtr volume = NULL;
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     virStoragePoolDef poolDef;
     char *sourceDatastorePath = NULL;
     virStorageVolDefPtr def = NULL;
@@ -1248,7 +1248,7 @@ static int
 esxStorageVolDelete(virStorageVolPtr volume, unsigned int flags)
 {
     int result = -1;
-    esxPrivate *priv = volume->conn->storagePrivateData;
+    esxPrivate *priv = volume->conn->privateData;
     char *datastorePath = NULL;
     esxVI_ManagedObjectReference *task = NULL;
     esxVI_TaskInfoState taskInfoState;
@@ -1291,7 +1291,7 @@ static int
 esxStorageVolWipe(virStorageVolPtr volume, unsigned int flags)
 {
     int result = -1;
-    esxPrivate *priv = volume->conn->storagePrivateData;
+    esxPrivate *priv = volume->conn->privateData;
     char *datastorePath = NULL;
     esxVI_ManagedObjectReference *task = NULL;
     esxVI_TaskInfoState taskInfoState;
@@ -1335,7 +1335,7 @@ esxStorageVolGetInfo(virStorageVolPtr volume,
                      virStorageVolInfoPtr info)
 {
     int result = -1;
-    esxPrivate *priv = volume->conn->storagePrivateData;
+    esxPrivate *priv = volume->conn->privateData;
     char *datastorePath = NULL;
     esxVI_FileInfo *fileInfo = NULL;
     esxVI_VmDiskFileInfo *vmDiskFileInfo = NULL;
@@ -1379,7 +1379,7 @@ static char *
 esxStorageVolGetXMLDesc(virStorageVolPtr volume,
                         unsigned int flags)
 {
-    esxPrivate *priv = volume->conn->storagePrivateData;
+    esxPrivate *priv = volume->conn->privateData;
     virStoragePoolDef pool;
     char *datastorePath = NULL;
     esxVI_FileInfo *fileInfo = NULL;
diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c
index cae53ed883..ff3f167ca0 100644
--- a/src/esx/esx_storage_driver.c
+++ b/src/esx/esx_storage_driver.c
@@ -64,18 +64,14 @@ esxStorageOpen(virConnectPtr conn,
         return VIR_DRV_OPEN_DECLINED;
     }
 
-    conn->storagePrivateData = conn->privateData;
-
     return VIR_DRV_OPEN_SUCCESS;
 }
 
 
 
 static int
-esxStorageClose(virConnectPtr conn)
+esxStorageClose(virConnectPtr conn ATTRIBUTE_UNUSED)
 {
-    conn->storagePrivateData = NULL;
-
     return 0;
 }
 
@@ -85,7 +81,7 @@ static int
 esxConnectNumOfStoragePools(virConnectPtr conn)
 {
     int count = 0;
-    esxPrivate *priv = conn->storagePrivateData;
+    esxPrivate *priv = conn->privateData;
     size_t i;
     int tmp;
 
@@ -112,7 +108,7 @@ static int
 esxConnectListStoragePools(virConnectPtr conn, char **const names, int maxnames)
 {
     bool success = false;
-    esxPrivate *priv = conn->storagePrivateData;
+    esxPrivate *priv = conn->privateData;
     int count = 0;
     size_t i;
     int tmp;
@@ -174,7 +170,7 @@ esxConnectListDefinedStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED,
 static virStoragePoolPtr
 esxStoragePoolLookupByName(virConnectPtr conn, const char *name)
 {
-    esxPrivate *priv = conn->storagePrivateData;
+    esxPrivate *priv = conn->privateData;
     size_t i;
     virStoragePoolPtr pool;
 
@@ -203,7 +199,7 @@ esxStoragePoolLookupByName(virConnectPtr conn, const char *name)
 static virStoragePoolPtr
 esxStoragePoolLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
 {
-    esxPrivate *priv = conn->storagePrivateData;
+    esxPrivate *priv = conn->privateData;
     size_t i;
     virStoragePoolPtr pool;
     char uuid_string[VIR_UUID_STRING_BUFLEN] = "";
@@ -242,7 +238,7 @@ esxStoragePoolLookupByVolume(virStorageVolPtr volume)
 static int
 esxStoragePoolRefresh(virStoragePoolPtr pool, unsigned int flags)
 {
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     virStorageDriverPtr backend = pool->privateData;
 
     virCheckNonNullArgReturn(pool->privateData, -1);
@@ -259,7 +255,7 @@ esxStoragePoolRefresh(virStoragePoolPtr pool, unsigned int flags)
 static int
 esxStoragePoolGetInfo(virStoragePoolPtr pool, virStoragePoolInfoPtr info)
 {
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     virStorageDriverPtr backend = pool->privateData;
 
     virCheckNonNullArgReturn(pool->privateData, -1);
@@ -278,7 +274,7 @@ esxStoragePoolGetInfo(virStoragePoolPtr pool, virStoragePoolInfoPtr info)
 static char *
 esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags)
 {
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     virStorageDriverPtr backend = pool->privateData;
 
     virCheckNonNullArgReturn(pool->privateData, NULL);
@@ -325,7 +321,7 @@ esxStoragePoolSetAutostart(virStoragePoolPtr pool ATTRIBUTE_UNUSED,
 static int
 esxStoragePoolNumOfVolumes(virStoragePoolPtr pool)
 {
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     virStorageDriverPtr backend = pool->privateData;
 
     virCheckNonNullArgReturn(pool->privateData, -1);
@@ -343,7 +339,7 @@ static int
 esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names,
                           int maxnames)
 {
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     virStorageDriverPtr backend = pool->privateData;
 
     virCheckNonNullArgReturn(pool->privateData, -1);
@@ -360,7 +356,7 @@ esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names,
 static virStorageVolPtr
 esxStorageVolLookupByName(virStoragePoolPtr pool, const char *name)
 {
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     virStorageDriverPtr backend = pool->privateData;
 
     virCheckNonNullArgReturn(pool->privateData, NULL);
@@ -377,7 +373,7 @@ esxStorageVolLookupByName(virStoragePoolPtr pool, const char *name)
 static virStorageVolPtr
 esxStorageVolLookupByPath(virConnectPtr conn, const char *path)
 {
-    esxPrivate *priv = conn->storagePrivateData;
+    esxPrivate *priv = conn->privateData;
 
     if (esxVI_EnsureSession(priv->primary) < 0) {
         return NULL;
@@ -409,7 +405,7 @@ static virStorageVolPtr
 esxStorageVolLookupByKey(virConnectPtr conn, const char *key)
 {
     virStorageVolPtr volume;
-    esxPrivate *priv = conn->storagePrivateData;
+    esxPrivate *priv = conn->privateData;
     size_t i;
 
     if (esxVI_EnsureSession(priv->primary) < 0) {
@@ -437,7 +433,7 @@ static virStorageVolPtr
 esxStorageVolCreateXML(virStoragePoolPtr pool, const char *xmldesc,
                        unsigned int flags)
 {
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     virStorageDriverPtr backend = pool->privateData;
 
     virCheckNonNullArgReturn(pool->privateData, NULL);
@@ -455,7 +451,7 @@ static virStorageVolPtr
 esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, const char *xmldesc,
                            virStorageVolPtr sourceVolume, unsigned int flags)
 {
-    esxPrivate *priv = pool->conn->storagePrivateData;
+    esxPrivate *priv = pool->conn->privateData;
     virStorageDriverPtr backend = pool->privateData;
 
     virCheckNonNullArgReturn(pool->privateData, NULL);
@@ -472,7 +468,7 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool, const char *xmldesc,
 static int
 esxStorageVolDelete(virStorageVolPtr volume, unsigned int flags)
 {
-    esxPrivate *priv = volume->conn->storagePrivateData;
+    esxPrivate *priv = volume->conn->privateData;
     virStorageDriverPtr backend = volume->privateData;
 
     virCheckNonNullArgReturn(volume->privateData, -1);
@@ -489,7 +485,7 @@ esxStorageVolDelete(virStorageVolPtr volume, unsigned int flags)
 static int
 esxStorageVolWipe(virStorageVolPtr volume, unsigned int flags)
 {
-    esxPrivate *priv = volume->conn->storagePrivateData;
+    esxPrivate *priv = volume->conn->privateData;
     virStorageDriverPtr backend = volume->privateData;
 
     virCheckNonNullArgReturn(volume->privateData, -1);
@@ -506,7 +502,7 @@ esxStorageVolWipe(virStorageVolPtr volume, unsigned int flags)
 static int
 esxStorageVolGetInfo(virStorageVolPtr volume, virStorageVolInfoPtr info)
 {
-    esxPrivate *priv = volume->conn->storagePrivateData;
+    esxPrivate *priv = volume->conn->privateData;
     virStorageDriverPtr backend = volume->privateData;
 
     virCheckNonNullArgReturn(volume->privateData, -1);
@@ -523,7 +519,7 @@ esxStorageVolGetInfo(virStorageVolPtr volume, virStorageVolInfoPtr info)
 static char *
 esxStorageVolGetXMLDesc(virStorageVolPtr volume, unsigned int flags)
 {
-    esxPrivate *priv = volume->conn->storagePrivateData;
+    esxPrivate *priv = volume->conn->privateData;
     virStorageDriverPtr backend = volume->privateData;
 
     virCheckNonNullArgReturn(volume->privateData, NULL);
@@ -540,7 +536,7 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume, unsigned int flags)
 static char *
 esxStorageVolGetPath(virStorageVolPtr volume)
 {
-    esxPrivate *priv = volume->conn->storagePrivateData;
+    esxPrivate *priv = volume->conn->privateData;
     virStorageDriverPtr backend = volume->privateData;
 
     virCheckNonNullArgReturn(volume->privateData, NULL);