static int
-esxStorageBackendISCSINumberOfPools(virConnectPtr conn)
+esxConnectNumOfStoragePools(virConnectPtr conn)
{
bool success = false;
int count = 0;
static int
-esxStorageBackendISCSIListPools(virConnectPtr conn, char **const names,
- const int maxnames)
+esxConnectListStoragePools(virConnectPtr conn, char **const names,
+ const int maxnames)
{
bool success = false;
int count = 0;
static virStoragePoolPtr
-esxStorageBackendISCSIPoolLookupByName(virConnectPtr conn,
- const char *name)
+esxStoragePoolLookupByName(virConnectPtr conn,
+ const char *name)
{
esxPrivate *priv = conn->storagePrivateData;
esxVI_HostInternetScsiHbaStaticTarget *target = NULL;
static virStoragePoolPtr
-esxStorageBackendISCSIPoolLookupByUUID(virConnectPtr conn,
- const unsigned char *uuid)
+esxStoragePoolLookupByUUID(virConnectPtr conn,
+ const unsigned char *uuid)
{
virStoragePoolPtr pool = NULL;
esxPrivate *priv = conn->storagePrivateData;
static int
-esxStorageBackendISCSIPoolRefresh(virStoragePoolPtr pool,
- unsigned int flags)
+esxStoragePoolRefresh(virStoragePoolPtr pool,
+ unsigned int flags)
{
int result = -1;
esxPrivate *priv = pool->conn->storagePrivateData;
static int
-esxStorageBackendISCSIPoolGetInfo(virStoragePoolPtr pool ATTRIBUTE_UNUSED,
- virStoragePoolInfoPtr info)
+esxStoragePoolGetInfo(virStoragePoolPtr pool ATTRIBUTE_UNUSED,
+ virStoragePoolInfoPtr info)
{
/* These fields are not valid for iSCSI pool */
info->allocation = info->capacity = info->available = 0;
static char *
-esxStorageBackendISCSIPoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags)
+esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags)
{
char *xml = NULL;
esxPrivate *priv = pool->conn->storagePrivateData;
static int
-esxStorageBackendISCSIPoolNumberOfVolumes(virStoragePoolPtr pool)
+esxStoragePoolNumOfVolumes(virStoragePoolPtr pool)
{
int count = 0;
esxPrivate *priv = pool->conn->storagePrivateData;
static int
-esxStorageBackendISCSIPoolListVolumes(virStoragePoolPtr pool, char **const names,
- int maxnames)
+esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names,
+ int maxnames)
{
bool success = false;
int count = 0;
static virStorageVolPtr
-esxStorageBackendISCSIVolumeLookupByName(virStoragePoolPtr pool,
- const char *name)
+esxStorageVolLookupByName(virStoragePoolPtr pool,
+ const char *name)
{
virStorageVolPtr volume = NULL;
esxPrivate *priv = pool->conn->storagePrivateData;
static virStorageVolPtr
-esxStorageBackendISCSIVolumeLookupByPath(virConnectPtr conn, const char *path)
+esxStorageVolLookupByPath(virConnectPtr conn, const char *path)
{
virStorageVolPtr volume = NULL;
esxPrivate *priv = conn->storagePrivateData;
static virStorageVolPtr
-esxStorageBackendISCSIVolumeLookupByKey(virConnectPtr conn, const char *key)
+esxStorageVolLookupByKey(virConnectPtr conn, const char *key)
{
virStorageVolPtr volume = NULL;
esxPrivate *priv = conn->storagePrivateData;
/* key may be LUN device path */
if (STRPREFIX(key, "/")) {
- return esxStorageBackendISCSIVolumeLookupByPath(conn, key);
+ return esxStorageVolLookupByPath(conn, key);
}
if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) {
static virStorageVolPtr
-esxStorageBackendISCSIVolumeCreateXML(virStoragePoolPtr pool ATTRIBUTE_UNUSED,
- const char *xmldesc ATTRIBUTE_UNUSED,
- unsigned int flags)
+esxStorageVolCreateXML(virStoragePoolPtr pool ATTRIBUTE_UNUSED,
+ const char *xmldesc ATTRIBUTE_UNUSED,
+ unsigned int flags)
{
virCheckFlags(0, NULL);
static virStorageVolPtr
-esxStorageBackendISCSIVolumeCreateXMLFrom(virStoragePoolPtr pool ATTRIBUTE_UNUSED,
- const char *xmldesc ATTRIBUTE_UNUSED,
- virStorageVolPtr sourceVolume ATTRIBUTE_UNUSED,
- unsigned int flags)
+esxStorageVolCreateXMLFrom(virStoragePoolPtr pool ATTRIBUTE_UNUSED,
+ const char *xmldesc ATTRIBUTE_UNUSED,
+ virStorageVolPtr sourceVolume ATTRIBUTE_UNUSED,
+ unsigned int flags)
{
virCheckFlags(0, NULL);
static char *
-esxStorageBackendISCSIVolumeGetXMLDesc(virStorageVolPtr volume,
- unsigned int flags)
+esxStorageVolGetXMLDesc(virStorageVolPtr volume,
+ unsigned int flags)
{
char *xml = NULL;
esxPrivate *priv = volume->conn->storagePrivateData;
static int
-esxStorageBackendISCSIVolumeDelete(virStorageVolPtr volume ATTRIBUTE_UNUSED,
- unsigned int flags)
+esxStorageVolDelete(virStorageVolPtr volume ATTRIBUTE_UNUSED,
+ unsigned int flags)
{
virCheckFlags(0, -1);
static int
-esxStorageBackendISCSIVolumeWipe(virStorageVolPtr volume ATTRIBUTE_UNUSED,
- unsigned int flags)
+esxStorageVolWipe(virStorageVolPtr volume ATTRIBUTE_UNUSED,
+ unsigned int flags)
{
virCheckFlags(0, -1);
static char *
-esxStorageBackendISCSIVolumeGetPath(virStorageVolPtr volume)
+esxStorageVolGetPath(virStorageVolPtr volume)
{
char *path;
virStorageDriver esxStorageBackendISCSI = {
- .connectNumOfStoragePools = esxStorageBackendISCSINumberOfPools, /* 1.0.1 */
- .connectListStoragePools = esxStorageBackendISCSIListPools, /* 1.0.1 */
- .storagePoolLookupByName = esxStorageBackendISCSIPoolLookupByName, /* 1.0.1 */
- .storagePoolLookupByUUID = esxStorageBackendISCSIPoolLookupByUUID, /* 1.0.1 */
- .storagePoolRefresh = esxStorageBackendISCSIPoolRefresh, /* 1.0.1 */
- .storagePoolGetInfo = esxStorageBackendISCSIPoolGetInfo, /* 1.0.1 */
- .storagePoolGetXMLDesc = esxStorageBackendISCSIPoolGetXMLDesc, /* 1.0.1 */
- .storagePoolNumOfVolumes = esxStorageBackendISCSIPoolNumberOfVolumes, /* 1.0.1 */
- .storagePoolListVolumes = esxStorageBackendISCSIPoolListVolumes, /* 1.0.1 */
- .storageVolLookupByName = esxStorageBackendISCSIVolumeLookupByName, /* 1.0.1 */
- .storageVolLookupByPath = esxStorageBackendISCSIVolumeLookupByPath, /* 1.0.1 */
- .storageVolLookupByKey = esxStorageBackendISCSIVolumeLookupByKey, /* 1.0.1 */
- .storageVolCreateXML = esxStorageBackendISCSIVolumeCreateXML, /* 1.0.1 */
- .storageVolCreateXMLFrom = esxStorageBackendISCSIVolumeCreateXMLFrom, /* 1.0.1 */
- .storageVolGetXMLDesc = esxStorageBackendISCSIVolumeGetXMLDesc, /* 1.0.1 */
- .storageVolDelete = esxStorageBackendISCSIVolumeDelete, /* 1.0.1 */
- .storageVolWipe = esxStorageBackendISCSIVolumeWipe, /* 1.0.1 */
- .storageVolGetPath = esxStorageBackendISCSIVolumeGetPath, /* 1.0.1 */
+ .connectNumOfStoragePools = esxConnectNumOfStoragePools, /* 1.0.1 */
+ .connectListStoragePools = esxConnectListStoragePools, /* 1.0.1 */
+ .storagePoolLookupByName = esxStoragePoolLookupByName, /* 1.0.1 */
+ .storagePoolLookupByUUID = esxStoragePoolLookupByUUID, /* 1.0.1 */
+ .storagePoolRefresh = esxStoragePoolRefresh, /* 1.0.1 */
+ .storagePoolGetInfo = esxStoragePoolGetInfo, /* 1.0.1 */
+ .storagePoolGetXMLDesc = esxStoragePoolGetXMLDesc, /* 1.0.1 */
+ .storagePoolNumOfVolumes = esxStoragePoolNumOfVolumes, /* 1.0.1 */
+ .storagePoolListVolumes = esxStoragePoolListVolumes, /* 1.0.1 */
+ .storageVolLookupByName = esxStorageVolLookupByName, /* 1.0.1 */
+ .storageVolLookupByPath = esxStorageVolLookupByPath, /* 1.0.1 */
+ .storageVolLookupByKey = esxStorageVolLookupByKey, /* 1.0.1 */
+ .storageVolCreateXML = esxStorageVolCreateXML, /* 1.0.1 */
+ .storageVolCreateXMLFrom = esxStorageVolCreateXMLFrom, /* 1.0.1 */
+ .storageVolGetXMLDesc = esxStorageVolGetXMLDesc, /* 1.0.1 */
+ .storageVolDelete = esxStorageVolDelete, /* 1.0.1 */
+ .storageVolWipe = esxStorageVolWipe, /* 1.0.1 */
+ .storageVolGetPath = esxStorageVolGetPath, /* 1.0.1 */
};
static int
-esxStorageBackendVMFSNumberOfPools(virConnectPtr conn)
+esxConnectNumOfStoragePools(virConnectPtr conn)
{
int count = 0;
esxPrivate *priv = conn->storagePrivateData;
static int
-esxStorageBackendVMFSListPools(virConnectPtr conn, char **const names,
- const int maxnames)
+esxConnectListStoragePools(virConnectPtr conn, char **const names,
+ const int maxnames)
{
bool success = false;
esxPrivate *priv = conn->storagePrivateData;
static virStoragePoolPtr
-esxStorageBackendVMFSPoolLookupByName(virConnectPtr conn,
- const char *name)
+esxStoragePoolLookupByName(virConnectPtr conn,
+ const char *name)
{
esxPrivate *priv = conn->storagePrivateData;
esxVI_ObjectContent *datastore = NULL;
static virStoragePoolPtr
-esxStorageBackendVMFSPoolLookupByUUID(virConnectPtr conn,
- const unsigned char *uuid)
+esxStoragePoolLookupByUUID(virConnectPtr conn,
+ const unsigned char *uuid)
{
esxPrivate *priv = conn->storagePrivateData;
esxVI_String *propertyNameList = NULL;
static int
-esxStorageBackendVMFSPoolRefresh(virStoragePoolPtr pool, unsigned int flags)
+esxStoragePoolRefresh(virStoragePoolPtr pool, unsigned int flags)
{
int result = -1;
esxPrivate *priv = pool->conn->storagePrivateData;
static int
-esxStorageBackendVMFSPoolGetInfo(virStoragePoolPtr pool,
- virStoragePoolInfoPtr info)
+esxStoragePoolGetInfo(virStoragePoolPtr pool,
+ virStoragePoolInfoPtr info)
{
int result = -1;
esxPrivate *priv = pool->conn->storagePrivateData;
static char *
-esxStorageBackendVMFSPoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags)
+esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags)
{
esxPrivate *priv = pool->conn->storagePrivateData;
esxVI_String *propertyNameList = NULL;
static int
-esxStorageBackendVMFSPoolNumberOfVolumes(virStoragePoolPtr pool)
+esxStoragePoolNumOfVolumes(virStoragePoolPtr pool)
{
bool success = false;
esxPrivate *priv = pool->conn->storagePrivateData;
static int
-esxStorageBackendVMFSPoolListVolumes(virStoragePoolPtr pool, char **const names,
- int maxnames)
+esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names,
+ int maxnames)
{
bool success = false;
esxPrivate *priv = pool->conn->storagePrivateData;
static virStorageVolPtr
-esxStorageBackendVMFSVolumeLookupByName(virStoragePoolPtr pool,
- const char *name)
+esxStorageVolLookupByName(virStoragePoolPtr pool,
+ const char *name)
{
virStorageVolPtr volume = NULL;
esxPrivate *priv = pool->conn->storagePrivateData;
static virStorageVolPtr
-esxStorageBackendVMFSVolumeLookupByPath(virConnectPtr conn, const char *path)
+esxStorageVolLookupByPath(virConnectPtr conn, const char *path)
{
virStorageVolPtr volume = NULL;
esxPrivate *priv = conn->storagePrivateData;
static virStorageVolPtr
-esxStorageBackendVMFSVolumeLookupByKey(virConnectPtr conn, const char *key)
+esxStorageVolLookupByKey(virConnectPtr conn, const char *key)
{
virStorageVolPtr volume = NULL;
esxPrivate *priv = conn->storagePrivateData;
if (STRPREFIX(key, "[")) {
/* Key is probably a datastore path */
- return esxStorageBackendVMFSVolumeLookupByPath(conn, key);
+ return esxStorageVolLookupByPath(conn, key);
}
if (!priv->primary->hasQueryVirtualDiskUuid) {
static virStorageVolPtr
-esxStorageBackendVMFSVolumeCreateXML(virStoragePoolPtr pool,
- const char *xmldesc,
- unsigned int flags)
+esxStorageVolCreateXML(virStoragePoolPtr pool,
+ const char *xmldesc,
+ unsigned int flags)
{
virStorageVolPtr volume = NULL;
esxPrivate *priv = pool->conn->storagePrivateData;
static virStorageVolPtr
-esxStorageBackendVMFSVolumeCreateXMLFrom(virStoragePoolPtr pool,
- const char *xmldesc,
- virStorageVolPtr sourceVolume,
- unsigned int flags)
+esxStorageVolCreateXMLFrom(virStoragePoolPtr pool,
+ const char *xmldesc,
+ virStorageVolPtr sourceVolume,
+ unsigned int flags)
{
virStorageVolPtr volume = NULL;
esxPrivate *priv = pool->conn->storagePrivateData;
static int
-esxStorageBackendVMFSVolumeDelete(virStorageVolPtr volume, unsigned int flags)
+esxStorageVolDelete(virStorageVolPtr volume, unsigned int flags)
{
int result = -1;
esxPrivate *priv = volume->conn->storagePrivateData;
static int
-esxStorageBackendVMFSVolumeWipe(virStorageVolPtr volume, unsigned int flags)
+esxStorageVolWipe(virStorageVolPtr volume, unsigned int flags)
{
int result = -1;
esxPrivate *priv = volume->conn->storagePrivateData;
static int
-esxStorageBackendVMFSVolumeGetInfo(virStorageVolPtr volume,
- virStorageVolInfoPtr info)
+esxStorageVolGetInfo(virStorageVolPtr volume,
+ virStorageVolInfoPtr info)
{
int result = -1;
esxPrivate *priv = volume->conn->storagePrivateData;
static char *
-esxStorageBackendVMFSVolumeGetXMLDesc(virStorageVolPtr volume,
- unsigned int flags)
+esxStorageVolGetXMLDesc(virStorageVolPtr volume,
+ unsigned int flags)
{
esxPrivate *priv = volume->conn->storagePrivateData;
virStoragePoolDef pool;
static char *
-esxStorageBackendVMFSVolumeGetPath(virStorageVolPtr volume)
+esxStorageVolGetPath(virStorageVolPtr volume)
{
char *path;
virStorageDriver esxStorageBackendVMFS = {
- .connectNumOfStoragePools = esxStorageBackendVMFSNumberOfPools, /* 0.8.2 */
- .connectListStoragePools = esxStorageBackendVMFSListPools, /* 0.8.2 */
- .storagePoolLookupByName = esxStorageBackendVMFSPoolLookupByName, /* 0.8.2 */
- .storagePoolLookupByUUID = esxStorageBackendVMFSPoolLookupByUUID, /* 0.8.2 */
- .storagePoolRefresh = esxStorageBackendVMFSPoolRefresh, /* 0.8.2 */
- .storagePoolGetInfo = esxStorageBackendVMFSPoolGetInfo, /* 0.8.2 */
- .storagePoolGetXMLDesc = esxStorageBackendVMFSPoolGetXMLDesc, /* 0.8.2 */
- .storagePoolNumOfVolumes = esxStorageBackendVMFSPoolNumberOfVolumes, /* 0.8.4 */
- .storagePoolListVolumes = esxStorageBackendVMFSPoolListVolumes, /* 0.8.4 */
- .storageVolLookupByName = esxStorageBackendVMFSVolumeLookupByName, /* 0.8.4 */
- .storageVolLookupByPath = esxStorageBackendVMFSVolumeLookupByPath, /* 0.8.4 */
- .storageVolLookupByKey = esxStorageBackendVMFSVolumeLookupByKey, /* 0.8.4 */
- .storageVolCreateXML = esxStorageBackendVMFSVolumeCreateXML, /* 0.8.4 */
- .storageVolCreateXMLFrom = esxStorageBackendVMFSVolumeCreateXMLFrom, /* 0.8.7 */
- .storageVolDelete = esxStorageBackendVMFSVolumeDelete, /* 0.8.7 */
- .storageVolWipe = esxStorageBackendVMFSVolumeWipe, /* 0.8.7 */
- .storageVolGetInfo = esxStorageBackendVMFSVolumeGetInfo, /* 0.8.4 */
- .storageVolGetXMLDesc = esxStorageBackendVMFSVolumeGetXMLDesc, /* 0.8.4 */
- .storageVolGetPath = esxStorageBackendVMFSVolumeGetPath, /* 0.8.4 */
+ .connectNumOfStoragePools = esxConnectNumOfStoragePools, /* 0.8.2 */
+ .connectListStoragePools = esxConnectListStoragePools, /* 0.8.2 */
+ .storagePoolLookupByName = esxStoragePoolLookupByName, /* 0.8.2 */
+ .storagePoolLookupByUUID = esxStoragePoolLookupByUUID, /* 0.8.2 */
+ .storagePoolRefresh = esxStoragePoolRefresh, /* 0.8.2 */
+ .storagePoolGetInfo = esxStoragePoolGetInfo, /* 0.8.2 */
+ .storagePoolGetXMLDesc = esxStoragePoolGetXMLDesc, /* 0.8.2 */
+ .storagePoolNumOfVolumes = esxStoragePoolNumOfVolumes, /* 0.8.4 */
+ .storagePoolListVolumes = esxStoragePoolListVolumes, /* 0.8.4 */
+ .storageVolLookupByName = esxStorageVolLookupByName, /* 0.8.4 */
+ .storageVolLookupByPath = esxStorageVolLookupByPath, /* 0.8.4 */
+ .storageVolLookupByKey = esxStorageVolLookupByKey, /* 0.8.4 */
+ .storageVolCreateXML = esxStorageVolCreateXML, /* 0.8.4 */
+ .storageVolCreateXMLFrom = esxStorageVolCreateXMLFrom, /* 0.8.7 */
+ .storageVolDelete = esxStorageVolDelete, /* 0.8.7 */
+ .storageVolWipe = esxStorageVolWipe, /* 0.8.7 */
+ .storageVolGetInfo = esxStorageVolGetInfo, /* 0.8.4 */
+ .storageVolGetXMLDesc = esxStorageVolGetXMLDesc, /* 0.8.4 */
+ .storageVolGetPath = esxStorageVolGetPath, /* 0.8.4 */
};