Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt
提交 b9c1315f 编写于 作者: D Daniel P. Berrange
浏览文件
操作

Fix naming of methods in ESX storage backends to follow public APIs 

The previous update of method naming missed the ESX storage
backend files. Update them is that the driver impl methods
follow the naming of the public API but with s/vir/esx/
Signed-off-by: NDaniel P. Berrange <berrange@redhat.com>
上级 4e6b73d2
隐藏空白更改
内联 并排
Showing with 104 addition and 104 deletion
src/esx/esx_storage_backend_iscsi.c
浏览文件 @ b9c1315f
...@@ -51,7 +51,7 @@ verify(MD5_DIGEST_SIZE == VIR_UUID_BUFLEN); ...@@ -51,7 +51,7 @@ verify(MD5_DIGEST_SIZE == VIR_UUID_BUFLEN);
static int static int
esxStorageBackendISCSINumberOfPools(virConnectPtr conn) esxConnectNumOfStoragePools(virConnectPtr conn)
{ {
bool success = false; bool success = false;
int count = 0; int count = 0;
...@@ -95,8 +95,8 @@ esxStorageBackendISCSINumberOfPools(virConnectPtr conn) ...@@ -95,8 +95,8 @@ esxStorageBackendISCSINumberOfPools(virConnectPtr conn)
static int static int
esxStorageBackendISCSIListPools(virConnectPtr conn, char **const names, esxConnectListStoragePools(virConnectPtr conn, char **const names,
const int maxnames) const int maxnames)
{ {
bool success = false; bool success = false;
int count = 0; int count = 0;
...@@ -154,8 +154,8 @@ esxStorageBackendISCSIListPools(virConnectPtr conn, char **const names, ...@@ -154,8 +154,8 @@ esxStorageBackendISCSIListPools(virConnectPtr conn, char **const names,
static virStoragePoolPtr static virStoragePoolPtr
esxStorageBackendISCSIPoolLookupByName(virConnectPtr conn, esxStoragePoolLookupByName(virConnectPtr conn,
const char *name) const char *name)
{ {
esxPrivate *priv = conn->storagePrivateData; esxPrivate *priv = conn->storagePrivateData;
esxVI_HostInternetScsiHbaStaticTarget *target = NULL; esxVI_HostInternetScsiHbaStaticTarget *target = NULL;
...@@ -196,8 +196,8 @@ esxStorageBackendISCSIPoolLookupByName(virConnectPtr conn, ...@@ -196,8 +196,8 @@ esxStorageBackendISCSIPoolLookupByName(virConnectPtr conn,
static virStoragePoolPtr static virStoragePoolPtr
esxStorageBackendISCSIPoolLookupByUUID(virConnectPtr conn, esxStoragePoolLookupByUUID(virConnectPtr conn,
const unsigned char *uuid) const unsigned char *uuid)
{ {
virStoragePoolPtr pool = NULL; virStoragePoolPtr pool = NULL;
esxPrivate *priv = conn->storagePrivateData; esxPrivate *priv = conn->storagePrivateData;
...@@ -245,8 +245,8 @@ esxStorageBackendISCSIPoolLookupByUUID(virConnectPtr conn, ...@@ -245,8 +245,8 @@ esxStorageBackendISCSIPoolLookupByUUID(virConnectPtr conn,
static int static int
esxStorageBackendISCSIPoolRefresh(virStoragePoolPtr pool, esxStoragePoolRefresh(virStoragePoolPtr pool,
unsigned int flags) unsigned int flags)
{ {
int result = -1; int result = -1;
esxPrivate *priv = pool->conn->storagePrivateData; esxPrivate *priv = pool->conn->storagePrivateData;
...@@ -280,8 +280,8 @@ esxStorageBackendISCSIPoolRefresh(virStoragePoolPtr pool, ...@@ -280,8 +280,8 @@ esxStorageBackendISCSIPoolRefresh(virStoragePoolPtr pool,
static int static int
esxStorageBackendISCSIPoolGetInfo(virStoragePoolPtr pool ATTRIBUTE_UNUSED, esxStoragePoolGetInfo(virStoragePoolPtr pool ATTRIBUTE_UNUSED,
virStoragePoolInfoPtr info) virStoragePoolInfoPtr info)
{ {
/* These fields are not valid for iSCSI pool */ /* These fields are not valid for iSCSI pool */
info->allocation = info->capacity = info->available = 0; info->allocation = info->capacity = info->available = 0;
...@@ -293,7 +293,7 @@ esxStorageBackendISCSIPoolGetInfo(virStoragePoolPtr pool ATTRIBUTE_UNUSED, ...@@ -293,7 +293,7 @@ esxStorageBackendISCSIPoolGetInfo(virStoragePoolPtr pool ATTRIBUTE_UNUSED,
static char * static char *
esxStorageBackendISCSIPoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags)
{ {
char *xml = NULL; char *xml = NULL;
esxPrivate *priv = pool->conn->storagePrivateData; esxPrivate *priv = pool->conn->storagePrivateData;
...@@ -358,7 +358,7 @@ esxStorageBackendISCSIPoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) ...@@ -358,7 +358,7 @@ esxStorageBackendISCSIPoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags)
static int static int
esxStorageBackendISCSIPoolNumberOfVolumes(virStoragePoolPtr pool) esxStoragePoolNumOfVolumes(virStoragePoolPtr pool)
{ {
int count = 0; int count = 0;
esxPrivate *priv = pool->conn->storagePrivateData; esxPrivate *priv = pool->conn->storagePrivateData;
...@@ -384,8 +384,8 @@ esxStorageBackendISCSIPoolNumberOfVolumes(virStoragePoolPtr pool) ...@@ -384,8 +384,8 @@ esxStorageBackendISCSIPoolNumberOfVolumes(virStoragePoolPtr pool)
static int static int
esxStorageBackendISCSIPoolListVolumes(virStoragePoolPtr pool, char **const names, esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names,
int maxnames) int maxnames)
{ {
bool success = false; bool success = false;
int count = 0; int count = 0;
...@@ -444,8 +444,8 @@ esxStorageBackendISCSIPoolListVolumes(virStoragePoolPtr pool, char **const names ...@@ -444,8 +444,8 @@ esxStorageBackendISCSIPoolListVolumes(virStoragePoolPtr pool, char **const names
static virStorageVolPtr static virStorageVolPtr
esxStorageBackendISCSIVolumeLookupByName(virStoragePoolPtr pool, esxStorageVolLookupByName(virStoragePoolPtr pool,
const char *name) const char *name)
{ {
virStorageVolPtr volume = NULL; virStorageVolPtr volume = NULL;
esxPrivate *priv = pool->conn->storagePrivateData; esxPrivate *priv = pool->conn->storagePrivateData;
...@@ -491,7 +491,7 @@ esxStorageBackendISCSIVolumeLookupByName(virStoragePoolPtr pool, ...@@ -491,7 +491,7 @@ esxStorageBackendISCSIVolumeLookupByName(virStoragePoolPtr pool,
static virStorageVolPtr static virStorageVolPtr
esxStorageBackendISCSIVolumeLookupByPath(virConnectPtr conn, const char *path) esxStorageVolLookupByPath(virConnectPtr conn, const char *path)
{ {
virStorageVolPtr volume = NULL; virStorageVolPtr volume = NULL;
esxPrivate *priv = conn->storagePrivateData; esxPrivate *priv = conn->storagePrivateData;
...@@ -539,7 +539,7 @@ esxStorageBackendISCSIVolumeLookupByPath(virConnectPtr conn, const char *path) ...@@ -539,7 +539,7 @@ esxStorageBackendISCSIVolumeLookupByPath(virConnectPtr conn, const char *path)
static virStorageVolPtr static virStorageVolPtr
esxStorageBackendISCSIVolumeLookupByKey(virConnectPtr conn, const char *key) esxStorageVolLookupByKey(virConnectPtr conn, const char *key)
{ {
virStorageVolPtr volume = NULL; virStorageVolPtr volume = NULL;
esxPrivate *priv = conn->storagePrivateData; esxPrivate *priv = conn->storagePrivateData;
...@@ -552,7 +552,7 @@ esxStorageBackendISCSIVolumeLookupByKey(virConnectPtr conn, const char *key) ...@@ -552,7 +552,7 @@ esxStorageBackendISCSIVolumeLookupByKey(virConnectPtr conn, const char *key)
/* key may be LUN device path */ /* key may be LUN device path */
if (STRPREFIX(key, "/")) { if (STRPREFIX(key, "/")) {
return esxStorageBackendISCSIVolumeLookupByPath(conn, key); return esxStorageVolLookupByPath(conn, key);
} }
if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) { if (esxVI_LookupScsiLunList(priv->primary, &scsiLunList) < 0) {
...@@ -594,9 +594,9 @@ esxStorageBackendISCSIVolumeLookupByKey(virConnectPtr conn, const char *key) ...@@ -594,9 +594,9 @@ esxStorageBackendISCSIVolumeLookupByKey(virConnectPtr conn, const char *key)
static virStorageVolPtr static virStorageVolPtr
esxStorageBackendISCSIVolumeCreateXML(virStoragePoolPtr pool ATTRIBUTE_UNUSED, esxStorageVolCreateXML(virStoragePoolPtr pool ATTRIBUTE_UNUSED,
const char *xmldesc ATTRIBUTE_UNUSED, const char *xmldesc ATTRIBUTE_UNUSED,
unsigned int flags) unsigned int flags)
{ {
virCheckFlags(0, NULL); virCheckFlags(0, NULL);
...@@ -609,10 +609,10 @@ esxStorageBackendISCSIVolumeCreateXML(virStoragePoolPtr pool ATTRIBUTE_UNUSED, ...@@ -609,10 +609,10 @@ esxStorageBackendISCSIVolumeCreateXML(virStoragePoolPtr pool ATTRIBUTE_UNUSED,
static virStorageVolPtr static virStorageVolPtr
esxStorageBackendISCSIVolumeCreateXMLFrom(virStoragePoolPtr pool ATTRIBUTE_UNUSED, esxStorageVolCreateXMLFrom(virStoragePoolPtr pool ATTRIBUTE_UNUSED,
const char *xmldesc ATTRIBUTE_UNUSED, const char *xmldesc ATTRIBUTE_UNUSED,
virStorageVolPtr sourceVolume ATTRIBUTE_UNUSED, virStorageVolPtr sourceVolume ATTRIBUTE_UNUSED,
unsigned int flags) unsigned int flags)
{ {
virCheckFlags(0, NULL); virCheckFlags(0, NULL);
...@@ -625,8 +625,8 @@ esxStorageBackendISCSIVolumeCreateXMLFrom(virStoragePoolPtr pool ATTRIBUTE_UNUSE ...@@ -625,8 +625,8 @@ esxStorageBackendISCSIVolumeCreateXMLFrom(virStoragePoolPtr pool ATTRIBUTE_UNUSE
static char * static char *
esxStorageBackendISCSIVolumeGetXMLDesc(virStorageVolPtr volume, esxStorageVolGetXMLDesc(virStorageVolPtr volume,
unsigned int flags) unsigned int flags)
{ {
char *xml = NULL; char *xml = NULL;
esxPrivate *priv = volume->conn->storagePrivateData; esxPrivate *priv = volume->conn->storagePrivateData;
...@@ -701,8 +701,8 @@ esxStorageBackendISCSIVolumeGetXMLDesc(virStorageVolPtr volume, ...@@ -701,8 +701,8 @@ esxStorageBackendISCSIVolumeGetXMLDesc(virStorageVolPtr volume,
static int static int
esxStorageBackendISCSIVolumeDelete(virStorageVolPtr volume ATTRIBUTE_UNUSED, esxStorageVolDelete(virStorageVolPtr volume ATTRIBUTE_UNUSED,
unsigned int flags) unsigned int flags)
{ {
virCheckFlags(0, -1); virCheckFlags(0, -1);
...@@ -715,8 +715,8 @@ esxStorageBackendISCSIVolumeDelete(virStorageVolPtr volume ATTRIBUTE_UNUSED, ...@@ -715,8 +715,8 @@ esxStorageBackendISCSIVolumeDelete(virStorageVolPtr volume ATTRIBUTE_UNUSED,
static int static int
esxStorageBackendISCSIVolumeWipe(virStorageVolPtr volume ATTRIBUTE_UNUSED, esxStorageVolWipe(virStorageVolPtr volume ATTRIBUTE_UNUSED,
unsigned int flags) unsigned int flags)
{ {
virCheckFlags(0, -1); virCheckFlags(0, -1);
...@@ -730,7 +730,7 @@ esxStorageBackendISCSIVolumeWipe(virStorageVolPtr volume ATTRIBUTE_UNUSED, ...@@ -730,7 +730,7 @@ esxStorageBackendISCSIVolumeWipe(virStorageVolPtr volume ATTRIBUTE_UNUSED,
static char * static char *
esxStorageBackendISCSIVolumeGetPath(virStorageVolPtr volume) esxStorageVolGetPath(virStorageVolPtr volume)
{ {
char *path; char *path;
...@@ -741,22 +741,22 @@ esxStorageBackendISCSIVolumeGetPath(virStorageVolPtr volume) ...@@ -741,22 +741,22 @@ esxStorageBackendISCSIVolumeGetPath(virStorageVolPtr volume)
virStorageDriver esxStorageBackendISCSI = { virStorageDriver esxStorageBackendISCSI = {
.connectNumOfStoragePools = esxStorageBackendISCSINumberOfPools, /* 1.0.1 */ .connectNumOfStoragePools = esxConnectNumOfStoragePools, /* 1.0.1 */
.connectListStoragePools = esxStorageBackendISCSIListPools, /* 1.0.1 */ .connectListStoragePools = esxConnectListStoragePools, /* 1.0.1 */
.storagePoolLookupByName = esxStorageBackendISCSIPoolLookupByName, /* 1.0.1 */ .storagePoolLookupByName = esxStoragePoolLookupByName, /* 1.0.1 */
.storagePoolLookupByUUID = esxStorageBackendISCSIPoolLookupByUUID, /* 1.0.1 */ .storagePoolLookupByUUID = esxStoragePoolLookupByUUID, /* 1.0.1 */
.storagePoolRefresh = esxStorageBackendISCSIPoolRefresh, /* 1.0.1 */ .storagePoolRefresh = esxStoragePoolRefresh, /* 1.0.1 */
.storagePoolGetInfo = esxStorageBackendISCSIPoolGetInfo, /* 1.0.1 */ .storagePoolGetInfo = esxStoragePoolGetInfo, /* 1.0.1 */
.storagePoolGetXMLDesc = esxStorageBackendISCSIPoolGetXMLDesc, /* 1.0.1 */ .storagePoolGetXMLDesc = esxStoragePoolGetXMLDesc, /* 1.0.1 */
.storagePoolNumOfVolumes = esxStorageBackendISCSIPoolNumberOfVolumes, /* 1.0.1 */ .storagePoolNumOfVolumes = esxStoragePoolNumOfVolumes, /* 1.0.1 */
.storagePoolListVolumes = esxStorageBackendISCSIPoolListVolumes, /* 1.0.1 */ .storagePoolListVolumes = esxStoragePoolListVolumes, /* 1.0.1 */
.storageVolLookupByName = esxStorageBackendISCSIVolumeLookupByName, /* 1.0.1 */ .storageVolLookupByName = esxStorageVolLookupByName, /* 1.0.1 */
.storageVolLookupByPath = esxStorageBackendISCSIVolumeLookupByPath, /* 1.0.1 */ .storageVolLookupByPath = esxStorageVolLookupByPath, /* 1.0.1 */
.storageVolLookupByKey = esxStorageBackendISCSIVolumeLookupByKey, /* 1.0.1 */ .storageVolLookupByKey = esxStorageVolLookupByKey, /* 1.0.1 */
.storageVolCreateXML = esxStorageBackendISCSIVolumeCreateXML, /* 1.0.1 */ .storageVolCreateXML = esxStorageVolCreateXML, /* 1.0.1 */
.storageVolCreateXMLFrom = esxStorageBackendISCSIVolumeCreateXMLFrom, /* 1.0.1 */ .storageVolCreateXMLFrom = esxStorageVolCreateXMLFrom, /* 1.0.1 */
.storageVolGetXMLDesc = esxStorageBackendISCSIVolumeGetXMLDesc, /* 1.0.1 */ .storageVolGetXMLDesc = esxStorageVolGetXMLDesc, /* 1.0.1 */
.storageVolDelete = esxStorageBackendISCSIVolumeDelete, /* 1.0.1 */ .storageVolDelete = esxStorageVolDelete, /* 1.0.1 */
.storageVolWipe = esxStorageBackendISCSIVolumeWipe, /* 1.0.1 */ .storageVolWipe = esxStorageVolWipe, /* 1.0.1 */
.storageVolGetPath = esxStorageBackendISCSIVolumeGetPath, /* 1.0.1 */ .storageVolGetPath = esxStorageVolGetPath, /* 1.0.1 */
}; };
src/esx/esx_storage_backend_vmfs.c
浏览文件 @ b9c1315f
...@@ -111,7 +111,7 @@ esxLookupVMFSStoragePoolType(esxVI_Context *ctx, const char *poolName, ...@@ -111,7 +111,7 @@ esxLookupVMFSStoragePoolType(esxVI_Context *ctx, const char *poolName,
static int static int
esxStorageBackendVMFSNumberOfPools(virConnectPtr conn) esxConnectNumOfStoragePools(virConnectPtr conn)
{ {
int count = 0; int count = 0;
esxPrivate *priv = conn->storagePrivateData; esxPrivate *priv = conn->storagePrivateData;
...@@ -135,8 +135,8 @@ esxStorageBackendVMFSNumberOfPools(virConnectPtr conn) ...@@ -135,8 +135,8 @@ esxStorageBackendVMFSNumberOfPools(virConnectPtr conn)
static int static int
esxStorageBackendVMFSListPools(virConnectPtr conn, char **const names, esxConnectListStoragePools(virConnectPtr conn, char **const names,
const int maxnames) const int maxnames)
{ {
bool success = false; bool success = false;
esxPrivate *priv = conn->storagePrivateData; esxPrivate *priv = conn->storagePrivateData;
...@@ -199,8 +199,8 @@ esxStorageBackendVMFSListPools(virConnectPtr conn, char **const names, ...@@ -199,8 +199,8 @@ esxStorageBackendVMFSListPools(virConnectPtr conn, char **const names,
static virStoragePoolPtr static virStoragePoolPtr
esxStorageBackendVMFSPoolLookupByName(virConnectPtr conn, esxStoragePoolLookupByName(virConnectPtr conn,
const char *name) const char *name)
{ {
esxPrivate *priv = conn->storagePrivateData; esxPrivate *priv = conn->storagePrivateData;
esxVI_ObjectContent *datastore = NULL; esxVI_ObjectContent *datastore = NULL;
...@@ -252,8 +252,8 @@ esxStorageBackendVMFSPoolLookupByName(virConnectPtr conn, ...@@ -252,8 +252,8 @@ esxStorageBackendVMFSPoolLookupByName(virConnectPtr conn,
static virStoragePoolPtr static virStoragePoolPtr
esxStorageBackendVMFSPoolLookupByUUID(virConnectPtr conn, esxStoragePoolLookupByUUID(virConnectPtr conn,
const unsigned char *uuid) const unsigned char *uuid)
{ {
esxPrivate *priv = conn->storagePrivateData; esxPrivate *priv = conn->storagePrivateData;
esxVI_String *propertyNameList = NULL; esxVI_String *propertyNameList = NULL;
...@@ -321,7 +321,7 @@ esxStorageBackendVMFSPoolLookupByUUID(virConnectPtr conn, ...@@ -321,7 +321,7 @@ esxStorageBackendVMFSPoolLookupByUUID(virConnectPtr conn,
static int static int
esxStorageBackendVMFSPoolRefresh(virStoragePoolPtr pool, unsigned int flags) esxStoragePoolRefresh(virStoragePoolPtr pool, unsigned int flags)
{ {
int result = -1; int result = -1;
esxPrivate *priv = pool->conn->storagePrivateData; esxPrivate *priv = pool->conn->storagePrivateData;
...@@ -346,8 +346,8 @@ esxStorageBackendVMFSPoolRefresh(virStoragePoolPtr pool, unsigned int flags) ...@@ -346,8 +346,8 @@ esxStorageBackendVMFSPoolRefresh(virStoragePoolPtr pool, unsigned int flags)
static int static int
esxStorageBackendVMFSPoolGetInfo(virStoragePoolPtr pool, esxStoragePoolGetInfo(virStoragePoolPtr pool,
virStoragePoolInfoPtr info) virStoragePoolInfoPtr info)
{ {
int result = -1; int result = -1;
esxPrivate *priv = pool->conn->storagePrivateData; esxPrivate *priv = pool->conn->storagePrivateData;
...@@ -407,7 +407,7 @@ esxStorageBackendVMFSPoolGetInfo(virStoragePoolPtr pool, ...@@ -407,7 +407,7 @@ esxStorageBackendVMFSPoolGetInfo(virStoragePoolPtr pool,
static char * static char *
esxStorageBackendVMFSPoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags)
{ {
esxPrivate *priv = pool->conn->storagePrivateData; esxPrivate *priv = pool->conn->storagePrivateData;
esxVI_String *propertyNameList = NULL; esxVI_String *propertyNameList = NULL;
...@@ -527,7 +527,7 @@ esxStorageBackendVMFSPoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags) ...@@ -527,7 +527,7 @@ esxStorageBackendVMFSPoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags)
static int static int
esxStorageBackendVMFSPoolNumberOfVolumes(virStoragePoolPtr pool) esxStoragePoolNumOfVolumes(virStoragePoolPtr pool)
{ {
bool success = false; bool success = false;
esxPrivate *priv = pool->conn->storagePrivateData; esxPrivate *priv = pool->conn->storagePrivateData;
...@@ -561,8 +561,8 @@ esxStorageBackendVMFSPoolNumberOfVolumes(virStoragePoolPtr pool) ...@@ -561,8 +561,8 @@ esxStorageBackendVMFSPoolNumberOfVolumes(virStoragePoolPtr pool)
static int static int
esxStorageBackendVMFSPoolListVolumes(virStoragePoolPtr pool, char **const names, esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names,
int maxnames) int maxnames)
{ {
bool success = false; bool success = false;
esxPrivate *priv = pool->conn->storagePrivateData; esxPrivate *priv = pool->conn->storagePrivateData;
...@@ -642,8 +642,8 @@ esxStorageBackendVMFSPoolListVolumes(virStoragePoolPtr pool, char **const names, ...@@ -642,8 +642,8 @@ esxStorageBackendVMFSPoolListVolumes(virStoragePoolPtr pool, char **const names,
static virStorageVolPtr static virStorageVolPtr
esxStorageBackendVMFSVolumeLookupByName(virStoragePoolPtr pool, esxStorageVolLookupByName(virStoragePoolPtr pool,
const char *name) const char *name)
{ {
virStorageVolPtr volume = NULL; virStorageVolPtr volume = NULL;
esxPrivate *priv = pool->conn->storagePrivateData; esxPrivate *priv = pool->conn->storagePrivateData;
...@@ -673,7 +673,7 @@ esxStorageBackendVMFSVolumeLookupByName(virStoragePoolPtr pool, ...@@ -673,7 +673,7 @@ esxStorageBackendVMFSVolumeLookupByName(virStoragePoolPtr pool,
static virStorageVolPtr static virStorageVolPtr
esxStorageBackendVMFSVolumeLookupByPath(virConnectPtr conn, const char *path) esxStorageVolLookupByPath(virConnectPtr conn, const char *path)
{ {
virStorageVolPtr volume = NULL; virStorageVolPtr volume = NULL;
esxPrivate *priv = conn->storagePrivateData; esxPrivate *priv = conn->storagePrivateData;
...@@ -705,7 +705,7 @@ esxStorageBackendVMFSVolumeLookupByPath(virConnectPtr conn, const char *path) ...@@ -705,7 +705,7 @@ esxStorageBackendVMFSVolumeLookupByPath(virConnectPtr conn, const char *path)
static virStorageVolPtr static virStorageVolPtr
esxStorageBackendVMFSVolumeLookupByKey(virConnectPtr conn, const char *key) esxStorageVolLookupByKey(virConnectPtr conn, const char *key)
{ {
virStorageVolPtr volume = NULL; virStorageVolPtr volume = NULL;
esxPrivate *priv = conn->storagePrivateData; esxPrivate *priv = conn->storagePrivateData;
...@@ -725,7 +725,7 @@ esxStorageBackendVMFSVolumeLookupByKey(virConnectPtr conn, const char *key) ...@@ -725,7 +725,7 @@ esxStorageBackendVMFSVolumeLookupByKey(virConnectPtr conn, const char *key)
if (STRPREFIX(key, "[")) { if (STRPREFIX(key, "[")) {
/* Key is probably a datastore path */ /* Key is probably a datastore path */
return esxStorageBackendVMFSVolumeLookupByPath(conn, key); return esxStorageVolLookupByPath(conn, key);
} }
if (!priv->primary->hasQueryVirtualDiskUuid) { if (!priv->primary->hasQueryVirtualDiskUuid) {
...@@ -842,9 +842,9 @@ esxStorageBackendVMFSVolumeLookupByKey(virConnectPtr conn, const char *key) ...@@ -842,9 +842,9 @@ esxStorageBackendVMFSVolumeLookupByKey(virConnectPtr conn, const char *key)
static virStorageVolPtr static virStorageVolPtr
esxStorageBackendVMFSVolumeCreateXML(virStoragePoolPtr pool, esxStorageVolCreateXML(virStoragePoolPtr pool,
const char *xmldesc, const char *xmldesc,
unsigned int flags) unsigned int flags)
{ {
virStorageVolPtr volume = NULL; virStorageVolPtr volume = NULL;
esxPrivate *priv = pool->conn->storagePrivateData; esxPrivate *priv = pool->conn->storagePrivateData;
...@@ -1071,10 +1071,10 @@ esxStorageBackendVMFSVolumeCreateXML(virStoragePoolPtr pool, ...@@ -1071,10 +1071,10 @@ esxStorageBackendVMFSVolumeCreateXML(virStoragePoolPtr pool,
static virStorageVolPtr static virStorageVolPtr
esxStorageBackendVMFSVolumeCreateXMLFrom(virStoragePoolPtr pool, esxStorageVolCreateXMLFrom(virStoragePoolPtr pool,
const char *xmldesc, const char *xmldesc,
virStorageVolPtr sourceVolume, virStorageVolPtr sourceVolume,
unsigned int flags) unsigned int flags)
{ {
virStorageVolPtr volume = NULL; virStorageVolPtr volume = NULL;
esxPrivate *priv = pool->conn->storagePrivateData; esxPrivate *priv = pool->conn->storagePrivateData;
...@@ -1268,7 +1268,7 @@ esxStorageBackendVMFSVolumeCreateXMLFrom(virStoragePoolPtr pool, ...@@ -1268,7 +1268,7 @@ esxStorageBackendVMFSVolumeCreateXMLFrom(virStoragePoolPtr pool,
static int static int
esxStorageBackendVMFSVolumeDelete(virStorageVolPtr volume, unsigned int flags) esxStorageVolDelete(virStorageVolPtr volume, unsigned int flags)
{ {
int result = -1; int result = -1;
esxPrivate *priv = volume->conn->storagePrivateData; esxPrivate *priv = volume->conn->storagePrivateData;
...@@ -1313,7 +1313,7 @@ esxStorageBackendVMFSVolumeDelete(virStorageVolPtr volume, unsigned int flags) ...@@ -1313,7 +1313,7 @@ esxStorageBackendVMFSVolumeDelete(virStorageVolPtr volume, unsigned int flags)
static int static int
esxStorageBackendVMFSVolumeWipe(virStorageVolPtr volume, unsigned int flags) esxStorageVolWipe(virStorageVolPtr volume, unsigned int flags)
{ {
int result = -1; int result = -1;
esxPrivate *priv = volume->conn->storagePrivateData; esxPrivate *priv = volume->conn->storagePrivateData;
...@@ -1358,8 +1358,8 @@ esxStorageBackendVMFSVolumeWipe(virStorageVolPtr volume, unsigned int flags) ...@@ -1358,8 +1358,8 @@ esxStorageBackendVMFSVolumeWipe(virStorageVolPtr volume, unsigned int flags)
static int static int
esxStorageBackendVMFSVolumeGetInfo(virStorageVolPtr volume, esxStorageVolGetInfo(virStorageVolPtr volume,
virStorageVolInfoPtr info) virStorageVolInfoPtr info)
{ {
int result = -1; int result = -1;
esxPrivate *priv = volume->conn->storagePrivateData; esxPrivate *priv = volume->conn->storagePrivateData;
...@@ -1405,8 +1405,8 @@ esxStorageBackendVMFSVolumeGetInfo(virStorageVolPtr volume, ...@@ -1405,8 +1405,8 @@ esxStorageBackendVMFSVolumeGetInfo(virStorageVolPtr volume,
static char * static char *
esxStorageBackendVMFSVolumeGetXMLDesc(virStorageVolPtr volume, esxStorageVolGetXMLDesc(virStorageVolPtr volume,
unsigned int flags) unsigned int flags)
{ {
esxPrivate *priv = volume->conn->storagePrivateData; esxPrivate *priv = volume->conn->storagePrivateData;
virStoragePoolDef pool; virStoragePoolDef pool;
...@@ -1489,7 +1489,7 @@ esxStorageBackendVMFSVolumeGetXMLDesc(virStorageVolPtr volume, ...@@ -1489,7 +1489,7 @@ esxStorageBackendVMFSVolumeGetXMLDesc(virStorageVolPtr volume,
static char * static char *
esxStorageBackendVMFSVolumeGetPath(virStorageVolPtr volume) esxStorageVolGetPath(virStorageVolPtr volume)
{ {
char *path; char *path;
...@@ -1504,23 +1504,23 @@ esxStorageBackendVMFSVolumeGetPath(virStorageVolPtr volume) ...@@ -1504,23 +1504,23 @@ esxStorageBackendVMFSVolumeGetPath(virStorageVolPtr volume)
virStorageDriver esxStorageBackendVMFS = { virStorageDriver esxStorageBackendVMFS = {
.connectNumOfStoragePools = esxStorageBackendVMFSNumberOfPools, /* 0.8.2 */ .connectNumOfStoragePools = esxConnectNumOfStoragePools, /* 0.8.2 */
.connectListStoragePools = esxStorageBackendVMFSListPools, /* 0.8.2 */ .connectListStoragePools = esxConnectListStoragePools, /* 0.8.2 */
.storagePoolLookupByName = esxStorageBackendVMFSPoolLookupByName, /* 0.8.2 */ .storagePoolLookupByName = esxStoragePoolLookupByName, /* 0.8.2 */
.storagePoolLookupByUUID = esxStorageBackendVMFSPoolLookupByUUID, /* 0.8.2 */ .storagePoolLookupByUUID = esxStoragePoolLookupByUUID, /* 0.8.2 */
.storagePoolRefresh = esxStorageBackendVMFSPoolRefresh, /* 0.8.2 */ .storagePoolRefresh = esxStoragePoolRefresh, /* 0.8.2 */
.storagePoolGetInfo = esxStorageBackendVMFSPoolGetInfo, /* 0.8.2 */ .storagePoolGetInfo = esxStoragePoolGetInfo, /* 0.8.2 */
.storagePoolGetXMLDesc = esxStorageBackendVMFSPoolGetXMLDesc, /* 0.8.2 */ .storagePoolGetXMLDesc = esxStoragePoolGetXMLDesc, /* 0.8.2 */
.storagePoolNumOfVolumes = esxStorageBackendVMFSPoolNumberOfVolumes, /* 0.8.4 */ .storagePoolNumOfVolumes = esxStoragePoolNumOfVolumes, /* 0.8.4 */
.storagePoolListVolumes = esxStorageBackendVMFSPoolListVolumes, /* 0.8.4 */ .storagePoolListVolumes = esxStoragePoolListVolumes, /* 0.8.4 */
.storageVolLookupByName = esxStorageBackendVMFSVolumeLookupByName, /* 0.8.4 */ .storageVolLookupByName = esxStorageVolLookupByName, /* 0.8.4 */
.storageVolLookupByPath = esxStorageBackendVMFSVolumeLookupByPath, /* 0.8.4 */ .storageVolLookupByPath = esxStorageVolLookupByPath, /* 0.8.4 */
.storageVolLookupByKey = esxStorageBackendVMFSVolumeLookupByKey, /* 0.8.4 */ .storageVolLookupByKey = esxStorageVolLookupByKey, /* 0.8.4 */
.storageVolCreateXML = esxStorageBackendVMFSVolumeCreateXML, /* 0.8.4 */ .storageVolCreateXML = esxStorageVolCreateXML, /* 0.8.4 */
.storageVolCreateXMLFrom = esxStorageBackendVMFSVolumeCreateXMLFrom, /* 0.8.7 */ .storageVolCreateXMLFrom = esxStorageVolCreateXMLFrom, /* 0.8.7 */
.storageVolDelete = esxStorageBackendVMFSVolumeDelete, /* 0.8.7 */ .storageVolDelete = esxStorageVolDelete, /* 0.8.7 */
.storageVolWipe = esxStorageBackendVMFSVolumeWipe, /* 0.8.7 */ .storageVolWipe = esxStorageVolWipe, /* 0.8.7 */
.storageVolGetInfo = esxStorageBackendVMFSVolumeGetInfo, /* 0.8.4 */ .storageVolGetInfo = esxStorageVolGetInfo, /* 0.8.4 */
.storageVolGetXMLDesc = esxStorageBackendVMFSVolumeGetXMLDesc, /* 0.8.4 */ .storageVolGetXMLDesc = esxStorageVolGetXMLDesc, /* 0.8.4 */
.storageVolGetPath = esxStorageBackendVMFSVolumeGetPath, /* 0.8.4 */ .storageVolGetPath = esxStorageVolGetPath, /* 0.8.4 */
}; };
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或