Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
2bd4a172
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2bd4a172
编写于
3月 25, 2014
作者:
J
Ján Tomko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Indent top-level labels by one space in src/esx/
上级
dc7238f5
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
149 addition
and
149 deletion
+149
-149
src/esx/esx_driver.c
src/esx/esx_driver.c
+55
-55
src/esx/esx_interface_driver.c
src/esx/esx_interface_driver.c
+2
-2
src/esx/esx_network_driver.c
src/esx/esx_network_driver.c
+6
-6
src/esx/esx_storage_backend_iscsi.c
src/esx/esx_storage_backend_iscsi.c
+11
-11
src/esx/esx_storage_backend_vmfs.c
src/esx/esx_storage_backend_vmfs.c
+18
-18
src/esx/esx_storage_driver.c
src/esx/esx_storage_driver.c
+1
-1
src/esx/esx_util.c
src/esx/esx_util.c
+3
-3
src/esx/esx_vi.c
src/esx/esx_vi.c
+43
-43
src/esx/esx_vi_methods.c
src/esx/esx_vi_methods.c
+1
-1
src/esx/esx_vi_types.c
src/esx/esx_vi_types.c
+9
-9
未找到文件。
src/esx/esx_driver.c
浏览文件 @
2bd4a172
...
...
@@ -255,7 +255,7 @@ esxParseVMXFileName(const char *fileName, void *opaque)
}
}
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
datastoreList
);
esxVI_DatastoreHostMount_Free
(
&
hostMount
);
...
...
@@ -361,7 +361,7 @@ esxFormatVMXFileName(const char *fileName, void *opaque)
success
=
true
;
cleanup:
cleanup:
if
(
!
success
)
{
virBufferFreeAndReset
(
&
buffer
);
VIR_FREE
(
result
);
...
...
@@ -433,7 +433,7 @@ esxAutodetectSCSIControllerModel(virDomainDiskDefPtr def, int *model,
result
=
0
;
cleanup:
cleanup:
esxVI_FileInfo_Free
(
&
fileInfo
);
return
result
;
...
...
@@ -508,7 +508,7 @@ esxSupportsLongMode(esxPrivate *priv)
}
}
cleanup:
cleanup:
/*
* If we goto cleanup in case of an error then priv->supportsLongMode
* is still esxVI_Boolean_Undefined, therefore we don't need to set it.
...
...
@@ -557,7 +557,7 @@ esxLookupHostSystemBiosUuid(esxPrivate *priv, unsigned char *uuid)
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
hostSystem
);
...
...
@@ -624,7 +624,7 @@ esxCapsInit(esxPrivate *priv)
return
caps
;
failure:
failure:
virObjectUnref
(
caps
);
return
NULL
;
...
...
@@ -742,7 +742,7 @@ esxConnectToHost(esxPrivate *priv,
result
=
0
;
cleanup:
cleanup:
VIR_FREE
(
username
);
VIR_FREE
(
unescapedPassword
);
VIR_FREE
(
password
);
...
...
@@ -843,7 +843,7 @@ esxConnectToVCenter(esxPrivate *priv,
result
=
0
;
cleanup:
cleanup:
VIR_FREE
(
username
);
VIR_FREE
(
unescapedPassword
);
VIR_FREE
(
password
);
...
...
@@ -1070,7 +1070,7 @@ esxConnectOpen(virConnectPtr conn, virConnectAuthPtr auth,
priv
=
NULL
;
result
=
VIR_DRV_OPEN_SUCCESS
;
cleanup:
cleanup:
esxFreePrivate
(
&
priv
);
VIR_FREE
(
potentialVCenterIpAddress
);
...
...
@@ -1132,7 +1132,7 @@ esxSupportsVMotion(esxPrivate *priv)
goto
cleanup
;
}
cleanup:
cleanup:
/*
* If we goto cleanup in case of an error then priv->supportsVMotion is
* still esxVI_Boolean_Undefined, therefore we don't need to set it.
...
...
@@ -1258,7 +1258,7 @@ esxConnectGetHostname(virConnectPtr conn)
goto
cleanup
;
}
cleanup:
cleanup:
/*
* If we goto cleanup in case of an error then complete is still NULL,
* either VIR_STRDUP returned -1 or virAsprintf failed. When virAsprintf
...
...
@@ -1407,7 +1407,7 @@ esxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo)
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
hostSystem
);
...
...
@@ -1487,7 +1487,7 @@ esxConnectListDomains(virConnectPtr conn, int *ids, int maxids)
success
=
true
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
virtualMachineList
);
...
...
@@ -1577,7 +1577,7 @@ esxDomainLookupByID(virConnectPtr conn, int id)
virReportError
(
VIR_ERR_NO_DOMAIN
,
_
(
"No domain with ID %d"
),
id
);
}
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
virtualMachineList
);
VIR_FREE
(
name_candidate
);
...
...
@@ -1626,7 +1626,7 @@ esxDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
domain
->
id
=
-
1
;
}
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
virtualMachine
);
VIR_FREE
(
name
);
...
...
@@ -1684,7 +1684,7 @@ esxDomainLookupByName(virConnectPtr conn, const char *name)
domain
->
id
=
-
1
;
}
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
virtualMachine
);
...
...
@@ -1740,7 +1740,7 @@ esxDomainSuspend(virDomainPtr domain)
result
=
0
;
cleanup:
cleanup:
esxVI_ObjectContent_Free
(
&
virtualMachine
);
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ManagedObjectReference_Free
(
&
task
);
...
...
@@ -1798,7 +1798,7 @@ esxDomainResume(virDomainPtr domain)
result
=
0
;
cleanup:
cleanup:
esxVI_ObjectContent_Free
(
&
virtualMachine
);
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ManagedObjectReference_Free
(
&
task
);
...
...
@@ -1845,7 +1845,7 @@ esxDomainShutdownFlags(virDomainPtr domain, unsigned int flags)
result
=
0
;
cleanup:
cleanup:
esxVI_ObjectContent_Free
(
&
virtualMachine
);
esxVI_String_Free
(
&
propertyNameList
);
...
...
@@ -1896,7 +1896,7 @@ esxDomainReboot(virDomainPtr domain, unsigned int flags)
result
=
0
;
cleanup:
cleanup:
esxVI_ObjectContent_Free
(
&
virtualMachine
);
esxVI_String_Free
(
&
propertyNameList
);
...
...
@@ -1963,7 +1963,7 @@ esxDomainDestroyFlags(virDomainPtr domain,
domain
->
id
=
-
1
;
result
=
0
;
cleanup:
cleanup:
esxVI_ObjectContent_Free
(
&
virtualMachine
);
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ManagedObjectReference_Free
(
&
task
);
...
...
@@ -2034,7 +2034,7 @@ esxDomainGetMaxMemory(virDomainPtr domain)
}
}
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
virtualMachine
);
...
...
@@ -2102,7 +2102,7 @@ esxDomainSetMaxMemory(virDomainPtr domain, unsigned long memory)
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
virtualMachine
);
esxVI_VirtualMachineConfigSpec_Free
(
&
spec
);
...
...
@@ -2159,7 +2159,7 @@ esxDomainSetMemory(virDomainPtr domain, unsigned long memory)
result
=
0
;
cleanup:
cleanup:
esxVI_ObjectContent_Free
(
&
virtualMachine
);
esxVI_VirtualMachineConfigSpec_Free
(
&
spec
);
esxVI_ManagedObjectReference_Free
(
&
task
);
...
...
@@ -2427,7 +2427,7 @@ esxDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info)
result
=
0
;
cleanup:
cleanup:
#if ESX_QUERY_FOR_USED_CPU_TIME
/*
* Remove values owned by data structures to prevent them from being freed
...
...
@@ -2492,7 +2492,7 @@ esxDomainGetState(virDomainPtr domain,
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
virtualMachine
);
...
...
@@ -2571,7 +2571,7 @@ esxDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus,
result
=
0
;
cleanup:
cleanup:
esxVI_ObjectContent_Free
(
&
virtualMachine
);
esxVI_VirtualMachineConfigSpec_Free
(
&
spec
);
esxVI_ManagedObjectReference_Free
(
&
task
);
...
...
@@ -2635,7 +2635,7 @@ esxDomainGetVcpusFlags(virDomainPtr domain, unsigned int flags)
}
}
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
hostSystem
);
...
...
@@ -2745,7 +2745,7 @@ esxDomainGetXMLDesc(virDomainPtr domain, unsigned int flags)
xml
=
virDomainDefFormat
(
def
,
flags
);
}
cleanup:
cleanup:
if
(
!
url
)
{
virBufferFreeAndReset
(
&
buffer
);
}
...
...
@@ -2916,7 +2916,7 @@ esxConnectListDefinedDomains(virConnectPtr conn, char **const names, int maxname
success
=
true
;
cleanup:
cleanup:
if
(
!
success
)
{
for
(
i
=
0
;
i
<
count
;
++
i
)
{
VIR_FREE
(
names
[
i
]);
...
...
@@ -3001,7 +3001,7 @@ esxDomainCreateWithFlags(virDomainPtr domain, unsigned int flags)
domain
->
id
=
id
;
result
=
0
;
cleanup:
cleanup:
esxVI_ObjectContent_Free
(
&
virtualMachine
);
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ManagedObjectReference_Free
(
&
task
);
...
...
@@ -3229,7 +3229,7 @@ esxDomainDefineXML(virConnectPtr conn, const char *xml)
/* FIXME: Add proper rollback in case of an error */
cleanup:
cleanup:
if
(
!
url
)
{
virBufferFreeAndReset
(
&
buffer
);
}
...
...
@@ -3301,7 +3301,7 @@ esxDomainUndefineFlags(virDomainPtr domain,
result
=
0
;
cleanup:
cleanup:
esxVI_ObjectContent_Free
(
&
virtualMachine
);
esxVI_String_Free
(
&
propertyNameList
);
...
...
@@ -3373,7 +3373,7 @@ esxDomainGetAutostart(virDomainPtr domain, int *autostart)
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_AutoStartDefaults_Free
(
&
defaults
);
esxVI_AutoStartPowerInfo_Free
(
&
powerInfoList
);
...
...
@@ -3480,7 +3480,7 @@ esxDomainSetAutostart(virDomainPtr domain, int autostart)
result
=
0
;
cleanup:
cleanup:
if
(
newPowerInfo
)
{
newPowerInfo
->
key
=
NULL
;
newPowerInfo
->
startAction
=
NULL
;
...
...
@@ -3655,7 +3655,7 @@ esxDomainGetSchedulerParametersFlags(virDomainPtr domain,
*
nparams
=
i
;
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
virtualMachine
);
...
...
@@ -3796,7 +3796,7 @@ esxDomainSetSchedulerParametersFlags(virDomainPtr domain,
result
=
0
;
cleanup:
cleanup:
esxVI_SharesInfo_Free
(
&
sharesInfo
);
esxVI_ObjectContent_Free
(
&
virtualMachine
);
esxVI_VirtualMachineConfigSpec_Free
(
&
spec
);
...
...
@@ -3979,7 +3979,7 @@ esxDomainMigratePerform(virDomainPtr domain,
result
=
0
;
cleanup:
cleanup:
virURIFree
(
parsedUri
);
esxVI_ObjectContent_Free
(
&
virtualMachine
);
esxVI_Event_Free
(
&
eventList
);
...
...
@@ -4052,7 +4052,7 @@ esxNodeGetFreeMemory(virConnectPtr conn)
result
=
resourcePoolResourceUsage
->
unreservedForVm
->
value
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
resourcePool
);
esxVI_ResourcePoolResourceUsage_Free
(
&
resourcePoolResourceUsage
);
...
...
@@ -4135,7 +4135,7 @@ esxDomainIsActive(virDomainPtr domain)
result
=
0
;
}
cleanup:
cleanup:
esxVI_ObjectContent_Free
(
&
virtualMachine
);
esxVI_String_Free
(
&
propertyNameList
);
...
...
@@ -4163,7 +4163,7 @@ esxDomainIsPersistent(virDomainPtr domain)
result
=
1
;
cleanup:
cleanup:
esxVI_ObjectContent_Free
(
&
virtualMachine
);
return
result
;
...
...
@@ -4190,7 +4190,7 @@ esxDomainIsUpdated(virDomainPtr domain ATTRIBUTE_UNUSED)
result
=
0
;
cleanup:
cleanup:
esxVI_ObjectContent_Free
(
&
virtualMachine
);
return
result
;
...
...
@@ -4274,7 +4274,7 @@ esxDomainSnapshotCreateXML(virDomainPtr domain, const char *xmlDesc,
snapshot
=
virGetDomainSnapshot
(
domain
,
def
->
name
);
cleanup:
cleanup:
virDomainSnapshotDefFree
(
def
);
esxVI_ObjectContent_Free
(
&
virtualMachine
);
esxVI_VirtualMachineSnapshotTree_Free
(
&
rootSnapshotList
);
...
...
@@ -4330,7 +4330,7 @@ esxDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot,
xml
=
virDomainSnapshotDefFormat
(
uuid_string
,
&
def
,
flags
,
0
);
cleanup:
cleanup:
esxVI_VirtualMachineSnapshotTree_Free
(
&
rootSnapshotList
);
return
xml
;
...
...
@@ -4460,7 +4460,7 @@ esxDomainSnapshotNumChildren(virDomainSnapshotPtr snapshot, unsigned int flags)
count
=
esxVI_GetNumberOfSnapshotTrees
(
snapshotTree
->
childSnapshotList
,
recurse
,
leaves
);
cleanup:
cleanup:
esxVI_VirtualMachineSnapshotTree_Free
(
&
rootSnapshotTreeList
);
return
count
;
...
...
@@ -4517,7 +4517,7 @@ esxDomainSnapshotListChildrenNames(virDomainSnapshotPtr snapshot,
result
=
esxVI_GetSnapshotTreeNames
(
snapshotTree
->
childSnapshotList
,
names
,
nameslen
,
recurse
,
leaves
);
cleanup:
cleanup:
esxVI_VirtualMachineSnapshotTree_Free
(
&
rootSnapshotTreeList
);
return
result
;
...
...
@@ -4550,7 +4550,7 @@ esxDomainSnapshotLookupByName(virDomainPtr domain, const char *name,
snapshot
=
virGetDomainSnapshot
(
domain
,
name
);
cleanup:
cleanup:
esxVI_VirtualMachineSnapshotTree_Free
(
&
rootSnapshotTreeList
);
return
snapshot
;
...
...
@@ -4618,7 +4618,7 @@ esxDomainSnapshotGetParent(virDomainSnapshotPtr snapshot, unsigned int flags)
parent
=
virGetDomainSnapshot
(
snapshot
->
domain
,
snapshotTreeParent
->
name
);
cleanup:
cleanup:
esxVI_VirtualMachineSnapshotTree_Free
(
&
rootSnapshotList
);
return
parent
;
...
...
@@ -4685,7 +4685,7 @@ esxDomainSnapshotIsCurrent(virDomainSnapshotPtr snapshot, unsigned int flags)
ret
=
STREQ
(
snapshot
->
name
,
currentSnapshotTree
->
name
);
cleanup:
cleanup:
esxVI_VirtualMachineSnapshotTree_Free
(
&
currentSnapshotTree
);
esxVI_VirtualMachineSnapshotTree_Free
(
&
rootSnapshotList
);
return
ret
;
...
...
@@ -4717,7 +4717,7 @@ esxDomainSnapshotHasMetadata(virDomainSnapshotPtr snapshot, unsigned int flags)
ret
=
0
;
cleanup:
cleanup:
esxVI_VirtualMachineSnapshotTree_Free
(
&
rootSnapshotList
);
return
ret
;
}
...
...
@@ -4766,7 +4766,7 @@ esxDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, unsigned int flags)
result
=
0
;
cleanup:
cleanup:
esxVI_VirtualMachineSnapshotTree_Free
(
&
rootSnapshotList
);
esxVI_ManagedObjectReference_Free
(
&
task
);
VIR_FREE
(
taskInfoErrorMessage
);
...
...
@@ -4832,7 +4832,7 @@ esxDomainSnapshotDelete(virDomainSnapshotPtr snapshot, unsigned int flags)
result
=
0
;
cleanup:
cleanup:
esxVI_VirtualMachineSnapshotTree_Free
(
&
rootSnapshotList
);
esxVI_ManagedObjectReference_Free
(
&
task
);
VIR_FREE
(
taskInfoErrorMessage
);
...
...
@@ -4903,7 +4903,7 @@ esxDomainSetMemoryParameters(virDomainPtr domain, virTypedParameterPtr params,
result
=
0
;
cleanup:
cleanup:
esxVI_ObjectContent_Free
(
&
virtualMachine
);
esxVI_VirtualMachineConfigSpec_Free
(
&
spec
);
esxVI_ManagedObjectReference_Free
(
&
task
);
...
...
@@ -4954,7 +4954,7 @@ esxDomainGetMemoryParameters(virDomainPtr domain, virTypedParameterPtr params,
*
nparams
=
1
;
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
virtualMachine
);
esxVI_Long_Free
(
&
reservation
);
...
...
@@ -5168,7 +5168,7 @@ esxConnectListAllDomains(virConnectPtr conn,
doms
=
NULL
;
ret
=
count
;
cleanup:
cleanup:
if
(
doms
)
{
for
(
id
=
0
;
id
<
count
;
id
++
)
{
virDomainFree
(
doms
[
id
]);
...
...
src/esx/esx_interface_driver.c
浏览文件 @
2bd4a172
...
...
@@ -121,7 +121,7 @@ esxConnectListInterfaces(virConnectPtr conn, char **const names, int maxnames)
success
=
true
;
cleanup:
cleanup:
if
(
!
success
)
{
for
(
i
=
0
;
i
<
count
;
++
i
)
{
VIR_FREE
(
names
[
i
]);
...
...
@@ -273,7 +273,7 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags)
xml
=
virInterfaceDefFormat
(
&
def
);
cleanup:
cleanup:
esxVI_PhysicalNic_Free
(
&
physicalNic
);
return
xml
;
...
...
src/esx/esx_network_driver.c
浏览文件 @
2bd4a172
...
...
@@ -129,7 +129,7 @@ esxConnectListNetworks(virConnectPtr conn, char **const names, int maxnames)
success
=
true
;
cleanup:
cleanup:
if
(
!
success
)
{
for
(
i
=
0
;
i
<
count
;
++
i
)
{
VIR_FREE
(
names
[
i
]);
...
...
@@ -202,7 +202,7 @@ esxNetworkLookupByUUID(virConnectPtr conn, const unsigned char *uuid)
network
=
virGetNetwork
(
conn
,
hostVirtualSwitch
->
name
,
uuid
);
cleanup:
cleanup:
esxVI_HostVirtualSwitch_Free
(
&
hostVirtualSwitchList
);
return
network
;
...
...
@@ -304,7 +304,7 @@ esxBandwidthToShapingPolicy(virNetDevBandwidthPtr bandwidth,
result
=
0
;
cleanup:
cleanup:
if
(
result
<
0
)
{
esxVI_HostNetworkTrafficShapingPolicy_Free
(
shapingPolicy
);
}
...
...
@@ -510,7 +510,7 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml)
network
=
virGetNetwork
(
conn
,
hostVirtualSwitch
->
name
,
md5
);
cleanup:
cleanup:
virNetworkDefFree
(
def
);
esxVI_HostVirtualSwitch_Free
(
&
hostVirtualSwitch
);
esxVI_HostPortGroup_Free
(
&
hostPortGroupList
);
...
...
@@ -616,7 +616,7 @@ esxNetworkUndefine(virNetworkPtr network)
result
=
0
;
cleanup:
cleanup:
esxVI_HostVirtualSwitch_Free
(
&
hostVirtualSwitch
);
esxVI_HostPortGroup_Free
(
&
hostPortGroupList
);
...
...
@@ -842,7 +842,7 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags)
xml
=
virNetworkDefFormat
(
def
,
flags
);
cleanup:
cleanup:
esxVI_HostVirtualSwitch_Free
(
&
hostVirtualSwitch
);
esxVI_PhysicalNic_Free
(
&
physicalNicList
);
esxVI_HostPortGroup_Free
(
&
hostPortGroupList
);
...
...
src/esx/esx_storage_backend_iscsi.c
浏览文件 @
2bd4a172
...
...
@@ -84,7 +84,7 @@ esxConnectNumOfStoragePools(virConnectPtr conn)
success
=
true
;
cleanup:
cleanup:
esxVI_HostInternetScsiHba_Free
(
&
hostInternetScsiHba
);
return
success
?
count
:
-
1
;
...
...
@@ -137,7 +137,7 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names,
success
=
true
;
cleanup:
cleanup:
if
(
!
success
)
{
for
(
i
=
0
;
i
<
count
;
++
i
)
{
VIR_FREE
(
names
[
i
]);
...
...
@@ -185,7 +185,7 @@ esxStoragePoolLookupByName(virConnectPtr conn,
pool
=
virGetStoragePool
(
conn
,
name
,
md5
,
&
esxStorageBackendISCSI
,
NULL
);
cleanup:
cleanup:
esxVI_HostInternetScsiHbaStaticTarget_Free
(
&
target
);
return
pool
;
...
...
@@ -234,7 +234,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn,
pool
=
virGetStoragePool
(
conn
,
target
->
iScsiName
,
md5
,
&
esxStorageBackendISCSI
,
NULL
);
cleanup:
cleanup:
esxVI_HostInternetScsiHba_Free
(
&
hostInternetScsiHba
);
return
pool
;
...
...
@@ -269,7 +269,7 @@ esxStoragePoolRefresh(virStoragePoolPtr pool,
result
=
0
;
cleanup:
cleanup:
esxVI_HostInternetScsiHba_Free
(
&
hostInternetScsiHba
);
return
result
;
...
...
@@ -344,7 +344,7 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags)
/* TODO: add CHAP authentication params */
xml
=
virStoragePoolDefFormat
(
&
def
);
cleanup:
cleanup:
VIR_FREE
(
def
.
source
.
hosts
);
esxVI_HostInternetScsiHba_Free
(
&
hostInternetScsiHba
);
...
...
@@ -422,7 +422,7 @@ esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names,
success
=
true
;
cleanup:
cleanup:
if
(
!
success
)
{
for
(
i
=
0
;
i
<
count
;
++
i
)
{
VIR_FREE
(
names
[
i
]);
...
...
@@ -478,7 +478,7 @@ esxStorageVolLookupByName(virStoragePoolPtr pool,
}
}
cleanup:
cleanup:
esxVI_ScsiLun_Free
(
&
scsiLunList
);
return
volume
;
...
...
@@ -525,7 +525,7 @@ esxStorageVolLookupByPath(virConnectPtr conn, const char *path)
}
}
cleanup:
cleanup:
esxVI_ScsiLun_Free
(
&
scsiLunList
);
VIR_FREE
(
poolName
);
...
...
@@ -580,7 +580,7 @@ esxStorageVolLookupByKey(virConnectPtr conn, const char *key)
}
}
cleanup:
cleanup:
esxVI_ScsiLun_Free
(
&
scsiLunList
);
VIR_FREE
(
poolName
);
...
...
@@ -687,7 +687,7 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume,
xml
=
virStorageVolDefFormat
(
&
pool
,
&
def
);
cleanup:
cleanup:
esxVI_ScsiLun_Free
(
&
scsiLunList
);
VIR_FREE
(
def
.
key
);
...
...
src/esx/esx_storage_backend_vmfs.c
浏览文件 @
2bd4a172
...
...
@@ -102,7 +102,7 @@ esxLookupVMFSStoragePoolType(esxVI_Context *ctx, const char *poolName,
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
datastore
);
esxVI_DatastoreInfo_Free
(
&
datastoreInfo
);
...
...
@@ -183,7 +183,7 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names,
success
=
true
;
cleanup:
cleanup:
if
(
!
success
)
{
for
(
i
=
0
;
i
<
count
;
++
i
)
{
VIR_FREE
(
names
[
i
]);
...
...
@@ -244,7 +244,7 @@ esxStoragePoolLookupByName(virConnectPtr conn,
pool
=
virGetStoragePool
(
conn
,
name
,
md5
,
&
esxStorageBackendVMFS
,
NULL
);
cleanup:
cleanup:
esxVI_ObjectContent_Free
(
&
datastore
);
esxVI_DatastoreHostMount_Free
(
&
hostMount
);
...
...
@@ -312,7 +312,7 @@ esxStoragePoolLookupByUUID(virConnectPtr conn,
pool
=
virGetStoragePool
(
conn
,
name
,
uuid
,
&
esxStorageBackendVMFS
,
NULL
);
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
datastoreList
);
esxVI_DatastoreHostMount_Free
(
&
hostMount
);
...
...
@@ -339,7 +339,7 @@ esxStoragePoolRefresh(virStoragePoolPtr pool, unsigned int flags)
result
=
0
;
cleanup:
cleanup:
esxVI_ObjectContent_Free
(
&
datastore
);
return
result
;
...
...
@@ -399,7 +399,7 @@ esxStoragePoolGetInfo(virStoragePoolPtr pool,
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
datastore
);
...
...
@@ -515,7 +515,7 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsigned int flags)
xml
=
virStoragePoolDefFormat
(
&
def
);
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
datastore
);
esxVI_DatastoreHostMount_Free
(
&
hostMount
);
...
...
@@ -552,7 +552,7 @@ esxStoragePoolNumOfVolumes(virStoragePoolPtr pool)
success
=
true
;
cleanup:
cleanup:
esxVI_HostDatastoreBrowserSearchResults_Free
(
&
searchResultsList
);
return
success
?
count
:
-
1
;
...
...
@@ -623,7 +623,7 @@ esxStoragePoolListVolumes(virStoragePoolPtr pool, char **const names,
success
=
true
;
cleanup:
cleanup:
if
(
!
success
)
{
for
(
i
=
0
;
i
<
count
;
++
i
)
{
VIR_FREE
(
names
[
i
]);
...
...
@@ -660,7 +660,7 @@ esxStorageVolLookupByName(virStoragePoolPtr pool,
volume
=
virGetStorageVol
(
pool
->
conn
,
pool
->
name
,
name
,
key
,
&
esxStorageBackendVMFS
,
NULL
);
cleanup:
cleanup:
VIR_FREE
(
datastorePath
);
VIR_FREE
(
key
);
...
...
@@ -691,7 +691,7 @@ esxStorageVolLookupByPath(virConnectPtr conn, const char *path)
volume
=
virGetStorageVol
(
conn
,
datastoreName
,
directoryAndFileName
,
key
,
&
esxStorageBackendVMFS
,
NULL
);
cleanup:
cleanup:
VIR_FREE
(
datastoreName
);
VIR_FREE
(
directoryAndFileName
);
VIR_FREE
(
key
);
...
...
@@ -821,7 +821,7 @@ esxStorageVolLookupByKey(virConnectPtr conn, const char *key)
}
}
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
datastoreList
);
esxVI_HostDatastoreBrowserSearchResults_Free
(
&
searchResultsList
);
...
...
@@ -1030,7 +1030,7 @@ esxStorageVolCreateXML(virStoragePoolPtr pool,
volume
=
virGetStorageVol
(
pool
->
conn
,
pool
->
name
,
def
->
name
,
key
,
&
esxStorageBackendVMFS
,
NULL
);
cleanup:
cleanup:
if
(
virtualDiskSpec
)
{
virtualDiskSpec
->
diskType
=
NULL
;
virtualDiskSpec
->
adapterType
=
NULL
;
...
...
@@ -1222,7 +1222,7 @@ esxStorageVolCreateXMLFrom(virStoragePoolPtr pool,
volume
=
virGetStorageVol
(
pool
->
conn
,
pool
->
name
,
def
->
name
,
key
,
&
esxStorageBackendVMFS
,
NULL
);
cleanup:
cleanup:
VIR_FREE
(
sourceDatastorePath
);
virStorageVolDefFree
(
def
);
VIR_FREE
(
unescapedDatastorePath
);
...
...
@@ -1276,7 +1276,7 @@ esxStorageVolDelete(virStorageVolPtr volume, unsigned int flags)
result
=
0
;
cleanup:
cleanup:
VIR_FREE
(
datastorePath
);
esxVI_ManagedObjectReference_Free
(
&
task
);
VIR_FREE
(
taskInfoErrorMessage
);
...
...
@@ -1319,7 +1319,7 @@ esxStorageVolWipe(virStorageVolPtr volume, unsigned int flags)
result
=
0
;
cleanup:
cleanup:
VIR_FREE
(
datastorePath
);
esxVI_ManagedObjectReference_Free
(
&
task
);
VIR_FREE
(
taskInfoErrorMessage
);
...
...
@@ -1365,7 +1365,7 @@ esxStorageVolGetInfo(virStorageVolPtr volume,
result
=
0
;
cleanup:
cleanup:
VIR_FREE
(
datastorePath
);
esxVI_FileInfo_Free
(
&
fileInfo
);
...
...
@@ -1446,7 +1446,7 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume,
xml
=
virStorageVolDefFormat
(
&
pool
,
&
def
);
cleanup:
cleanup:
VIR_FREE
(
datastorePath
);
esxVI_FileInfo_Free
(
&
fileInfo
);
VIR_FREE
(
def
.
key
);
...
...
src/esx/esx_storage_driver.c
浏览文件 @
2bd4a172
...
...
@@ -137,7 +137,7 @@ esxConnectListStoragePools(virConnectPtr conn, char **const names, int maxnames)
success
=
true
;
cleanup:
cleanup:
if
(
!
success
)
{
for
(
i
=
0
;
i
<
count
;
++
i
)
{
VIR_FREE
(
names
[
i
]);
...
...
src/esx/esx_util.c
浏览文件 @
2bd4a172
...
...
@@ -165,7 +165,7 @@ esxUtil_ParseUri(esxUtil_ParsedUri **parsedUri, virURIPtr uri)
result
=
0
;
cleanup:
cleanup:
if
(
result
<
0
)
{
esxUtil_FreeParsedUri
(
parsedUri
);
}
...
...
@@ -281,7 +281,7 @@ esxUtil_ParseDatastorePath(const char *datastorePath, char **datastoreName,
result
=
0
;
cleanup:
cleanup:
if
(
result
<
0
)
{
if
(
datastoreName
)
{
VIR_FREE
(
*
datastoreName
);
...
...
@@ -482,7 +482,7 @@ esxUtil_EscapeDatastoreItem(const char *string)
escaped2
=
esxUtil_EscapeBase64
(
escaped1
);
cleanup:
cleanup:
VIR_FREE
(
replaced
);
VIR_FREE
(
escaped1
);
...
...
src/esx/esx_vi.c
浏览文件 @
2bd4a172
...
...
@@ -437,7 +437,7 @@ esxVI_CURL_Download(esxVI_CURL *curl, const char *url, char **content,
*
content
=
virBufferContentAndReset
(
&
buffer
);
cleanup:
cleanup:
VIR_FREE
(
range
);
if
(
!
(
*
content
))
{
...
...
@@ -1161,7 +1161,7 @@ esxVI_Context_LookupManagedObjectsByPath(esxVI_Context *ctx, const char *path)
result
=
0
;
cleanup:
cleanup:
if
(
result
<
0
)
{
virBufferFreeAndReset
(
&
buffer
);
}
...
...
@@ -1215,7 +1215,7 @@ esxVI_Context_LookupManagedObjectsByHostSystemIp(esxVI_Context *ctx,
result
=
0
;
cleanup:
cleanup:
esxVI_ManagedObjectReference_Free
(
&
managedObjectReference
);
return
result
;
...
...
@@ -1395,7 +1395,7 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName,
result
=
0
;
cleanup:
cleanup:
if
(
result
<
0
)
{
virBufferFreeAndReset
(
&
buffer
);
esxVI_Response_Free
(
response
);
...
...
@@ -1597,7 +1597,7 @@ esxVI_List_DeepCopy(esxVI_List **destList, esxVI_List *srcList,
return
0
;
failure:
failure:
freeFunc
(
&
dest
);
freeFunc
(
destList
);
...
...
@@ -1651,7 +1651,7 @@ esxVI_List_CastFromAnyType(esxVI_AnyType *anyType, esxVI_List **list,
result
=
0
;
cleanup:
cleanup:
if
(
result
<
0
)
{
freeFunc
(
&
item
);
freeFunc
(
list
);
...
...
@@ -1720,7 +1720,7 @@ esxVI_List_Deserialize(xmlNodePtr node, esxVI_List **list,
return
0
;
failure:
failure:
freeFunc
(
&
item
);
freeFunc
(
list
);
...
...
@@ -1788,7 +1788,7 @@ esxVI_BuildSelectSet(esxVI_SelectionSpec **selectSet,
return
0
;
failure:
failure:
esxVI_TraversalSpec_Free
(
&
traversalSpec
);
esxVI_SelectionSpec_Free
(
&
selectionSpec
);
...
...
@@ -1970,7 +1970,7 @@ esxVI_EnsureSession(esxVI_Context *ctx)
result
=
0
;
cleanup:
cleanup:
virMutexUnlock
(
ctx
->
sessionLock
);
esxVI_String_Free
(
&
propertyNameList
);
...
...
@@ -2120,7 +2120,7 @@ esxVI_LookupObjectContentByType(esxVI_Context *ctx,
result
=
0
;
cleanup:
cleanup:
/*
* Remove values given by the caller from the data structures to prevent
* them from being freed by the call to esxVI_PropertyFilterSpec_Free().
...
...
@@ -2406,7 +2406,7 @@ esxVI_LookupNumberOfDomainsByPowerState(esxVI_Context *ctx,
success
=
true
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
virtualMachineList
);
...
...
@@ -2517,7 +2517,7 @@ esxVI_GetVirtualMachineIdentity(esxVI_ObjectContent *virtualMachine,
return
0
;
failure:
failure:
if
(
name
)
{
VIR_FREE
(
*
name
);
}
...
...
@@ -2589,7 +2589,7 @@ esxVI_GetSnapshotTreeNames(esxVI_VirtualMachineSnapshotTree *snapshotTreeList,
return
count
;
failure:
failure:
for
(
i
=
0
;
i
<
count
;
++
i
)
{
VIR_FREE
(
names
[
i
]);
}
...
...
@@ -2754,7 +2754,7 @@ esxVI_LookupVirtualMachineByUuid(esxVI_Context *ctx, const unsigned char *uuid,
result
=
0
;
cleanup:
cleanup:
esxVI_ManagedObjectReference_Free
(
&
managedObjectReference
);
return
result
;
...
...
@@ -2821,7 +2821,7 @@ esxVI_LookupVirtualMachineByName(esxVI_Context *ctx, const char *name,
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
completePropertyNameList
);
esxVI_ObjectContent_Free
(
&
virtualMachineList
);
VIR_FREE
(
name_candidate
);
...
...
@@ -2873,7 +2873,7 @@ esxVI_LookupVirtualMachineByUuidAndPrepareForTask
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
completePropertyNameList
);
esxVI_VirtualMachineQuestionInfo_Free
(
&
questionInfo
);
esxVI_TaskInfo_Free
(
&
pendingTaskInfoList
);
...
...
@@ -2954,7 +2954,7 @@ esxVI_LookupDatastoreByName(esxVI_Context *ctx, const char *name,
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
completePropertyNameList
);
esxVI_ObjectContent_Free
(
&
datastoreList
);
...
...
@@ -3042,7 +3042,7 @@ esxVI_LookupDatastoreByAbsolutePath(esxVI_Context *ctx,
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
completePropertyNameList
);
esxVI_ObjectContent_Free
(
&
datastoreList
);
esxVI_DatastoreHostMount_Free
(
&
datastoreHostMountList
);
...
...
@@ -3112,7 +3112,7 @@ esxVI_LookupDatastoreHostMount(esxVI_Context *ctx,
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
objectContent
);
esxVI_DatastoreHostMount_Free
(
&
hostMountList
);
...
...
@@ -3159,7 +3159,7 @@ esxVI_LookupTaskInfoByTask(esxVI_Context *ctx,
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
objectContent
);
...
...
@@ -3220,7 +3220,7 @@ esxVI_LookupPendingTaskInfoListByVirtualMachine
result
=
0
;
cleanup:
cleanup:
if
(
result
<
0
)
{
esxVI_TaskInfo_Free
(
pendingTaskInfoList
);
}
...
...
@@ -3268,7 +3268,7 @@ esxVI_LookupAndHandleVirtualMachineQuestion(esxVI_Context *ctx,
result
=
0
;
cleanup:
cleanup:
esxVI_ObjectContent_Free
(
&
virtualMachine
);
esxVI_String_Free
(
&
propertyNameList
);
esxVI_VirtualMachineQuestionInfo_Free
(
&
questionInfo
);
...
...
@@ -3317,7 +3317,7 @@ esxVI_LookupRootSnapshotTreeList
result
=
0
;
cleanup:
cleanup:
if
(
result
<
0
)
{
esxVI_VirtualMachineSnapshotTree_Free
(
rootSnapshotTreeList
);
}
...
...
@@ -3402,7 +3402,7 @@ esxVI_LookupCurrentSnapshotTree
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
virtualMachine
);
esxVI_ManagedObjectReference_Free
(
&
currentSnapshot
);
...
...
@@ -3593,7 +3593,7 @@ esxVI_LookupFileInfoByDatastorePath(esxVI_Context *ctx,
result
=
0
;
cleanup:
cleanup:
/* Don't double free fileName */
if
(
searchSpec
&&
searchSpec
->
matchPattern
)
{
searchSpec
->
matchPattern
->
value
=
NULL
;
...
...
@@ -3726,7 +3726,7 @@ esxVI_LookupDatastoreContentByDatastoreName
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
datastore
);
esxVI_ManagedObjectReference_Free
(
&
hostDatastoreBrowser
);
...
...
@@ -3791,7 +3791,7 @@ esxVI_LookupStorageVolumeKeyByDatastorePath(esxVI_Context *ctx,
result
=
0
;
cleanup:
cleanup:
esxVI_FileInfo_Free
(
&
fileInfo
);
VIR_FREE
(
uuid_string
);
...
...
@@ -3848,7 +3848,7 @@ esxVI_LookupAutoStartDefaults(esxVI_Context *ctx,
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
hostAutoStartManager
);
...
...
@@ -3899,7 +3899,7 @@ esxVI_LookupAutoStartPowerInfoList(esxVI_Context *ctx,
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
hostAutoStartManager
);
...
...
@@ -3943,7 +3943,7 @@ esxVI_LookupPhysicalNicList(esxVI_Context *ctx,
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
hostSystem
);
...
...
@@ -3993,7 +3993,7 @@ esxVI_LookupPhysicalNicByName(esxVI_Context *ctx, const char *name,
result
=
0
;
cleanup:
cleanup:
esxVI_PhysicalNic_Free
(
&
physicalNicList
);
return
result
;
...
...
@@ -4042,7 +4042,7 @@ esxVI_LookupPhysicalNicByMACAddress(esxVI_Context *ctx, const char *mac,
result
=
0
;
cleanup:
cleanup:
esxVI_PhysicalNic_Free
(
&
physicalNicList
);
return
result
;
...
...
@@ -4085,7 +4085,7 @@ esxVI_LookupHostVirtualSwitchList(esxVI_Context *ctx,
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
hostSystem
);
...
...
@@ -4138,7 +4138,7 @@ esxVI_LookupHostVirtualSwitchByName(esxVI_Context *ctx, const char *name,
result
=
0
;
cleanup:
cleanup:
esxVI_HostVirtualSwitch_Free
(
&
hostVirtualSwitchList
);
return
result
;
...
...
@@ -4183,7 +4183,7 @@ esxVI_LookupHostPortGroupList(esxVI_Context *ctx,
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
hostSystem
);
...
...
@@ -4299,7 +4299,7 @@ esxVI_HandleVirtualMachineQuestion
result
=
0
;
cleanup:
cleanup:
if
(
result
<
0
)
{
virBufferFreeAndReset
(
&
buffer
);
}
...
...
@@ -4483,7 +4483,7 @@ esxVI_WaitForTaskCompletion(esxVI_Context *ctx,
result
=
0
;
cleanup:
cleanup:
/*
* Remove values given by the caller from the data structures to prevent
* them from being freed by the call to esxVI_PropertyFilterSpec_Free().
...
...
@@ -4650,7 +4650,7 @@ esxVI_LookupHostInternetScsiHbaStaticTargetByName
result
=
0
;
cleanup:
cleanup:
esxVI_HostInternetScsiHba_Free
(
&
hostInternetScsiHba
);
return
result
;
...
...
@@ -4708,7 +4708,7 @@ esxVI_LookupHostInternetScsiHba(esxVI_Context *ctx,
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
hostSystem
);
esxVI_HostHostBusAdapter_Free
(
&
hostHostBusAdapterList
);
...
...
@@ -4749,7 +4749,7 @@ esxVI_LookupScsiLunList(esxVI_Context *ctx, esxVI_ScsiLun **scsiLunList)
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
hostSystem
);
...
...
@@ -4842,7 +4842,7 @@ esxVI_LookupHostScsiTopologyLunListByTargetName
result
=
0
;
cleanup:
cleanup:
esxVI_String_Free
(
&
propertyNameList
);
esxVI_ObjectContent_Free
(
&
hostSystem
);
esxVI_HostScsiTopologyInterface_Free
(
&
hostScsiInterfaceList
);
...
...
@@ -4931,7 +4931,7 @@ esxVI_LookupStoragePoolNameByScsiLunKey(esxVI_Context *ctx,
result
=
0
;
cleanup:
cleanup:
esxVI_ObjectContent_Free
(
&
hostSystem
);
esxVI_String_Free
(
&
propertyNameList
);
esxVI_HostScsiTopologyInterface_Free
(
&
hostScsiInterfaceList
);
...
...
@@ -5137,7 +5137,7 @@ esxVI_LookupManagedObjectHelper(esxVI_Context *ctx,
result
=
0
;
cleanup:
cleanup:
if
(
result
<
0
)
{
esxVI_ObjectContent_Free
(
objectContentList
);
}
else
{
...
...
src/esx/esx_vi_methods.c
浏览文件 @
2bd4a172
...
...
@@ -247,7 +247,7 @@ esxVI_RetrieveServiceContent(esxVI_Context *ctx,
result
=
0
;
cleanup:
cleanup:
esxVI_Response_Free
(
&
response
);
return
result
;
...
...
src/esx/esx_vi_types.c
浏览文件 @
2bd4a172
...
...
@@ -739,7 +739,7 @@ esxVI_GetActualObjectType(xmlNodePtr node, esxVI_Type baseType,
result
=
0
;
cleanup:
cleanup:
VIR_FREE
(
type
);
return
result
;
...
...
@@ -1001,7 +1001,7 @@ esxVI_AnyType_DeepCopy(esxVI_AnyType **dest, esxVI_AnyType *src)
return
0
;
failure:
failure:
esxVI_AnyType_Free
(
dest
);
return
-
1
;
...
...
@@ -1118,7 +1118,7 @@ esxVI_AnyType_Deserialize(xmlNodePtr node, esxVI_AnyType **anyType)
return
0
;
failure:
failure:
esxVI_AnyType_Free
(
anyType
);
return
-
1
;
...
...
@@ -1182,7 +1182,7 @@ esxVI_String_AppendValueToList(esxVI_String **stringList, const char *value)
return
0
;
failure:
failure:
esxVI_String_Free
(
&
string
);
return
-
1
;
...
...
@@ -1209,7 +1209,7 @@ esxVI_String_AppendValueListToList(esxVI_String **stringList,
return
0
;
failure:
failure:
esxVI_String_Free
(
&
stringListToAppend
);
return
-
1
;
...
...
@@ -1293,7 +1293,7 @@ esxVI_String_Deserialize(xmlNodePtr node, esxVI_String **string)
return
0
;
failure:
failure:
esxVI_String_Free
(
string
);
return
-
1
;
...
...
@@ -1501,7 +1501,7 @@ esxVI_DateTime_Deserialize(xmlNodePtr node, esxVI_DateTime **dateTime)
return
0
;
failure:
failure:
esxVI_DateTime_Free
(
dateTime
);
return
-
1
;
...
...
@@ -1675,7 +1675,7 @@ esxVI_MethodFault_Deserialize(xmlNodePtr node, esxVI_MethodFault **methodFault)
return
0
;
failure:
failure:
esxVI_MethodFault_Free
(
methodFault
);
return
-
1
;
...
...
@@ -1775,7 +1775,7 @@ esxVI_ManagedObjectReference_Deserialize
return
0
;
failure:
failure:
esxVI_ManagedObjectReference_Free
(
managedObjectReference
);
return
-
1
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录