Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
3eda88e9
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,发现更多精彩内容 >>
提交
3eda88e9
编写于
3月 25, 2014
作者:
J
Ján Tomko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Indent top-level labels by one space in src/storage/
上级
b69f9922
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
109 addition
and
109 deletion
+109
-109
src/storage/storage_backend.c
src/storage/storage_backend.c
+10
-10
src/storage/storage_backend_disk.c
src/storage/storage_backend_disk.c
+3
-3
src/storage/storage_backend_fs.c
src/storage/storage_backend_fs.c
+8
-8
src/storage/storage_backend_gluster.c
src/storage/storage_backend_gluster.c
+6
-6
src/storage/storage_backend_iscsi.c
src/storage/storage_backend_iscsi.c
+6
-6
src/storage/storage_backend_logical.c
src/storage/storage_backend_logical.c
+7
-7
src/storage/storage_backend_mpath.c
src/storage/storage_backend_mpath.c
+6
-6
src/storage/storage_backend_rbd.c
src/storage/storage_backend_rbd.c
+7
-7
src/storage/storage_backend_scsi.c
src/storage/storage_backend_scsi.c
+14
-14
src/storage/storage_backend_sheepdog.c
src/storage/storage_backend_sheepdog.c
+5
-5
src/storage/storage_driver.c
src/storage/storage_driver.c
+37
-37
未找到文件。
src/storage/storage_backend.c
浏览文件 @
3eda88e9
...
@@ -248,7 +248,7 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol,
...
@@ -248,7 +248,7 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol,
}
}
inputfd
=
-
1
;
inputfd
=
-
1
;
cleanup:
cleanup:
VIR_FORCE_CLOSE
(
inputfd
);
VIR_FORCE_CLOSE
(
inputfd
);
VIR_FREE
(
zerobuf
);
VIR_FREE
(
zerobuf
);
...
@@ -326,7 +326,7 @@ virStorageBackendCreateBlockFrom(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -326,7 +326,7 @@ virStorageBackendCreateBlockFrom(virConnectPtr conn ATTRIBUTE_UNUSED,
fd
=
-
1
;
fd
=
-
1
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
VIR_FORCE_CLOSE
(
fd
);
VIR_FORCE_CLOSE
(
fd
);
return
ret
;
return
ret
;
...
@@ -403,7 +403,7 @@ createRawFile(int fd, virStorageVolDefPtr vol,
...
@@ -403,7 +403,7 @@ createRawFile(int fd, virStorageVolDefPtr vol,
goto
cleanup
;
goto
cleanup
;
}
}
cleanup:
cleanup:
return
ret
;
return
ret
;
}
}
...
@@ -453,7 +453,7 @@ virStorageBackendCreateRaw(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -453,7 +453,7 @@ virStorageBackendCreateRaw(virConnectPtr conn ATTRIBUTE_UNUSED,
/* createRawFile already reported the exact error. */
/* createRawFile already reported the exact error. */
ret
=
-
1
;
ret
=
-
1
;
cleanup:
cleanup:
VIR_FORCE_CLOSE
(
fd
);
VIR_FORCE_CLOSE
(
fd
);
return
ret
;
return
ret
;
}
}
...
@@ -553,7 +553,7 @@ virStorageGenerateQcowEncryption(virConnectPtr conn,
...
@@ -553,7 +553,7 @@ virStorageGenerateQcowEncryption(virConnectPtr conn,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
secret
!=
NULL
)
{
if
(
secret
!=
NULL
)
{
if
(
ret
!=
0
&&
if
(
ret
!=
0
&&
conn
->
secretDriver
->
secretUndefine
!=
NULL
)
conn
->
secretDriver
->
secretUndefine
!=
NULL
)
...
@@ -653,7 +653,7 @@ virStorageBackendQemuImgSupportsCompat(const char *qemuimg)
...
@@ -653,7 +653,7 @@ virStorageBackendQemuImgSupportsCompat(const char *qemuimg)
if
(
strstr
(
output
,
"
\n
compat "
))
if
(
strstr
(
output
,
"
\n
compat "
))
ret
=
true
;
ret
=
true
;
cleanup:
cleanup:
virCommandFree
(
cmd
);
virCommandFree
(
cmd
);
VIR_FREE
(
output
);
VIR_FREE
(
output
);
return
ret
;
return
ret
;
...
@@ -699,7 +699,7 @@ virStorageBackendQEMUImgBackingFormat(const char *qemuimg)
...
@@ -699,7 +699,7 @@ virStorageBackendQEMUImgBackingFormat(const char *qemuimg)
ret
=
QEMU_IMG_BACKING_FORMAT_NONE
;
ret
=
QEMU_IMG_BACKING_FORMAT_NONE
;
}
}
cleanup:
cleanup:
virCommandFree
(
cmd
);
virCommandFree
(
cmd
);
VIR_FREE
(
help
);
VIR_FREE
(
help
);
return
ret
;
return
ret
;
...
@@ -761,9 +761,9 @@ virStorageBackendCreateQemuImgOpts(char **opts,
...
@@ -761,9 +761,9 @@ virStorageBackendCreateQemuImgOpts(char **opts,
*
opts
=
virBufferContentAndReset
(
&
buf
);
*
opts
=
virBufferContentAndReset
(
&
buf
);
return
0
;
return
0
;
no_memory:
no_memory:
virReportOOMError
();
virReportOOMError
();
error:
error:
virBufferFreeAndReset
(
&
buf
);
virBufferFreeAndReset
(
&
buf
);
return
-
1
;
return
-
1
;
}
}
...
@@ -1010,7 +1010,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn,
...
@@ -1010,7 +1010,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn,
ret
=
virStorageBackendCreateExecCommand
(
pool
,
vol
,
cmd
);
ret
=
virStorageBackendCreateExecCommand
(
pool
,
vol
,
cmd
);
virCommandFree
(
cmd
);
virCommandFree
(
cmd
);
cleanup:
cleanup:
VIR_FREE
(
create_tool
);
VIR_FREE
(
create_tool
);
return
ret
;
return
ret
;
}
}
...
...
src/storage/storage_backend_disk.c
浏览文件 @
3eda88e9
...
@@ -426,7 +426,7 @@ virStorageBackendDiskBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -426,7 +426,7 @@ virStorageBackendDiskBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED,
ret
=
virCommandRun
(
cmd
,
NULL
);
ret
=
virCommandRun
(
cmd
,
NULL
);
}
}
error:
error:
virCommandFree
(
cmd
);
virCommandFree
(
cmd
);
return
ret
;
return
ret
;
}
}
...
@@ -674,7 +674,7 @@ virStorageBackendDiskCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -674,7 +674,7 @@ virStorageBackendDiskCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED,
res
=
0
;
res
=
0
;
cleanup:
cleanup:
VIR_FREE
(
partFormat
);
VIR_FREE
(
partFormat
);
virCommandFree
(
cmd
);
virCommandFree
(
cmd
);
return
res
;
return
res
;
...
@@ -758,7 +758,7 @@ virStorageBackendDiskDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -758,7 +758,7 @@ virStorageBackendDiskDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED,
}
}
rc
=
0
;
rc
=
0
;
cleanup:
cleanup:
VIR_FREE
(
devpath
);
VIR_FREE
(
devpath
);
virCommandFree
(
cmd
);
virCommandFree
(
cmd
);
return
rc
;
return
rc
;
...
...
src/storage/storage_backend_fs.c
浏览文件 @
3eda88e9
...
@@ -180,10 +180,10 @@ virStorageBackendProbeTarget(virStorageVolTargetPtr target,
...
@@ -180,10 +180,10 @@ virStorageBackendProbeTarget(virStorageVolTargetPtr target,
goto
cleanup
;
goto
cleanup
;
error:
error:
VIR_FORCE_CLOSE
(
fd
);
VIR_FORCE_CLOSE
(
fd
);
cleanup:
cleanup:
virStorageFileFreeMetadata
(
meta
);
virStorageFileFreeMetadata
(
meta
);
VIR_FREE
(
header
);
VIR_FREE
(
header
);
return
ret
;
return
ret
;
...
@@ -237,7 +237,7 @@ virStorageBackendFileSystemNetFindPoolSourcesFunc(char **const groups,
...
@@ -237,7 +237,7 @@ virStorageBackendFileSystemNetFindPoolSourcesFunc(char **const groups,
src
->
format
=
VIR_STORAGE_POOL_NETFS_NFS
;
src
->
format
=
VIR_STORAGE_POOL_NETFS_NFS
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
return
ret
;
return
ret
;
}
}
...
@@ -452,7 +452,7 @@ virStorageBackendFileSystemMount(virStoragePoolObjPtr pool)
...
@@ -452,7 +452,7 @@ virStorageBackendFileSystemMount(virStoragePoolObjPtr pool)
goto
cleanup
;
goto
cleanup
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
virCommandFree
(
cmd
);
virCommandFree
(
cmd
);
VIR_FREE
(
src
);
VIR_FREE
(
src
);
return
ret
;
return
ret
;
...
@@ -510,7 +510,7 @@ virStorageBackendFileSystemUnmount(virStoragePoolObjPtr pool)
...
@@ -510,7 +510,7 @@ virStorageBackendFileSystemUnmount(virStoragePoolObjPtr pool)
goto
cleanup
;
goto
cleanup
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
virCommandFree
(
cmd
);
virCommandFree
(
cmd
);
return
ret
;
return
ret
;
}
}
...
@@ -621,7 +621,7 @@ virStorageBackendFileSystemProbe(const char *device,
...
@@ -621,7 +621,7 @@ virStorageBackendFileSystemProbe(const char *device,
ret
=
FILESYSTEM_PROBE_ERROR
;
ret
=
FILESYSTEM_PROBE_ERROR
;
}
}
error:
error:
VIR_FREE
(
libblkid_format
);
VIR_FREE
(
libblkid_format
);
if
(
probe
!=
NULL
)
{
if
(
probe
!=
NULL
)
{
...
@@ -724,7 +724,7 @@ virStorageBackendMakeFileSystem(virStoragePoolObjPtr pool,
...
@@ -724,7 +724,7 @@ virStorageBackendMakeFileSystem(virStoragePoolObjPtr pool,
ret
=
virStorageBackendExecuteMKFS
(
device
,
format
);
ret
=
virStorageBackendExecuteMKFS
(
device
,
format
);
}
}
error:
error:
return
ret
;
return
ret
;
}
}
...
@@ -816,7 +816,7 @@ virStorageBackendFileSystemBuild(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -816,7 +816,7 @@ virStorageBackendFileSystemBuild(virConnectPtr conn ATTRIBUTE_UNUSED,
ret
=
0
;
ret
=
0
;
}
}
error:
error:
VIR_FREE
(
parent
);
VIR_FREE
(
parent
);
return
ret
;
return
ret
;
}
}
...
...
src/storage/storage_backend_gluster.c
浏览文件 @
3eda88e9
...
@@ -143,7 +143,7 @@ virStorageBackendGlusterOpen(virStoragePoolObjPtr pool)
...
@@ -143,7 +143,7 @@ virStorageBackendGlusterOpen(virStoragePoolObjPtr pool)
return
ret
;
return
ret
;
error:
error:
virStorageBackendGlusterClose
(
ret
);
virStorageBackendGlusterClose
(
ret
);
return
NULL
;
return
NULL
;
}
}
...
@@ -220,7 +220,7 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state,
...
@@ -220,7 +220,7 @@ virStorageBackendGlusterSetMetadata(virStorageBackendGlusterStatePtr state,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
return
ret
;
return
ret
;
}
}
...
@@ -321,7 +321,7 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state,
...
@@ -321,7 +321,7 @@ virStorageBackendGlusterRefreshVol(virStorageBackendGlusterStatePtr state,
*
volptr
=
vol
;
*
volptr
=
vol
;
vol
=
NULL
;
vol
=
NULL
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
virStorageFileFreeMetadata
(
meta
);
virStorageFileFreeMetadata
(
meta
);
virStorageVolDefFree
(
vol
);
virStorageVolDefFree
(
vol
);
if
(
fd
)
if
(
fd
)
...
@@ -401,7 +401,7 @@ virStorageBackendGlusterRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -401,7 +401,7 @@ virStorageBackendGlusterRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED,
pool
->
def
->
allocation
=
pool
->
def
->
capacity
-
pool
->
def
->
available
;
pool
->
def
->
allocation
=
pool
->
def
->
capacity
-
pool
->
def
->
available
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
dir
)
if
(
dir
)
glfs_closedir
(
dir
);
glfs_closedir
(
dir
);
virStorageBackendGlusterClose
(
state
);
virStorageBackendGlusterClose
(
state
);
...
@@ -466,7 +466,7 @@ virStorageBackendGlusterVolDelete(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -466,7 +466,7 @@ virStorageBackendGlusterVolDelete(virConnectPtr conn ATTRIBUTE_UNUSED,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
virStorageBackendGlusterClose
(
state
);
virStorageBackendGlusterClose
(
state
);
return
ret
;
return
ret
;
}
}
...
@@ -569,7 +569,7 @@ virStorageFileBackendGlusterInit(virStorageFilePtr file)
...
@@ -569,7 +569,7 @@ virStorageFileBackendGlusterInit(virStorageFilePtr file)
return
0
;
return
0
;
error:
error:
VIR_FREE
(
priv
->
volname
);
VIR_FREE
(
priv
->
volname
);
glfs_fini
(
priv
->
vol
);
glfs_fini
(
priv
->
vol
);
VIR_FREE
(
priv
);
VIR_FREE
(
priv
);
...
...
src/storage/storage_backend_iscsi.c
浏览文件 @
3eda88e9
...
@@ -119,7 +119,7 @@ virStorageBackendISCSIGetHostNumber(const char *sysfs_path,
...
@@ -119,7 +119,7 @@ virStorageBackendISCSIGetHostNumber(const char *sysfs_path,
}
}
closedir
(
sysdir
);
closedir
(
sysdir
);
out:
out:
return
retval
;
return
retval
;
}
}
...
@@ -217,7 +217,7 @@ virStorageBackendISCSIFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -217,7 +217,7 @@ virStorageBackendISCSIFindPoolSources(virConnectPtr conn ATTRIBUTE_UNUSED,
if
(
!
(
ret
=
virStoragePoolSourceListFormat
(
&
list
)))
if
(
!
(
ret
=
virStoragePoolSourceListFormat
(
&
list
)))
goto
cleanup
;
goto
cleanup
;
cleanup:
cleanup:
if
(
list
.
sources
)
{
if
(
list
.
sources
)
{
for
(
i
=
0
;
i
<
ntargets
;
i
++
)
{
for
(
i
=
0
;
i
<
ntargets
;
i
++
)
{
VIR_FREE
(
list
.
sources
[
i
].
hosts
);
VIR_FREE
(
list
.
sources
[
i
].
hosts
);
...
@@ -356,7 +356,7 @@ virStorageBackendISCSISetAuth(const char *portal,
...
@@ -356,7 +356,7 @@ virStorageBackendISCSISetAuth(const char *portal,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
virObjectUnref
(
secret
);
virObjectUnref
(
secret
);
VIR_FREE
(
secret_value
);
VIR_FREE
(
secret_value
);
return
ret
;
return
ret
;
...
@@ -411,7 +411,7 @@ virStorageBackendISCSIStartPool(virConnectPtr conn,
...
@@ -411,7 +411,7 @@ virStorageBackendISCSIStartPool(virConnectPtr conn,
}
}
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
VIR_FREE
(
portal
);
VIR_FREE
(
portal
);
VIR_FREE
(
session
);
VIR_FREE
(
session
);
return
ret
;
return
ret
;
...
@@ -435,7 +435,7 @@ virStorageBackendISCSIRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -435,7 +435,7 @@ virStorageBackendISCSIRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED,
return
0
;
return
0
;
cleanup:
cleanup:
VIR_FREE
(
session
);
VIR_FREE
(
session
);
return
-
1
;
return
-
1
;
}
}
...
@@ -457,7 +457,7 @@ virStorageBackendISCSIStopPool(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -457,7 +457,7 @@ virStorageBackendISCSIStopPool(virConnectPtr conn ATTRIBUTE_UNUSED,
goto
cleanup
;
goto
cleanup
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
VIR_FREE
(
portal
);
VIR_FREE
(
portal
);
return
ret
;
return
ret
;
}
}
...
...
src/storage/storage_backend_logical.c
浏览文件 @
3eda88e9
...
@@ -262,7 +262,7 @@ virStorageBackendLogicalMakeVol(char **const groups,
...
@@ -262,7 +262,7 @@ virStorageBackendLogicalMakeVol(char **const groups,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
VIR_FREE
(
regex
);
VIR_FREE
(
regex
);
VIR_FREE
(
reg
);
VIR_FREE
(
reg
);
VIR_FREE
(
vars
);
VIR_FREE
(
vars
);
...
@@ -330,7 +330,7 @@ virStorageBackendLogicalFindLVs(virStoragePoolObjPtr pool,
...
@@ -330,7 +330,7 @@ virStorageBackendLogicalFindLVs(virStoragePoolObjPtr pool,
goto
cleanup
;
goto
cleanup
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
virCommandFree
(
cmd
);
virCommandFree
(
cmd
);
return
ret
;
return
ret
;
}
}
...
@@ -394,7 +394,7 @@ virStorageBackendLogicalFindPoolSourcesFunc(char **const groups,
...
@@ -394,7 +394,7 @@ virStorageBackendLogicalFindPoolSourcesFunc(char **const groups,
return
0
;
return
0
;
error:
error:
VIR_FREE
(
pvname
);
VIR_FREE
(
pvname
);
VIR_FREE
(
vgname
);
VIR_FREE
(
vgname
);
...
@@ -558,7 +558,7 @@ virStorageBackendLogicalBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -558,7 +558,7 @@ virStorageBackendLogicalBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
virCommandFree
(
vgcmd
);
virCommandFree
(
vgcmd
);
return
ret
;
return
ret
;
}
}
...
@@ -613,7 +613,7 @@ virStorageBackendLogicalRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -613,7 +613,7 @@ virStorageBackendLogicalRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
virCommandFree
(
cmd
);
virCommandFree
(
cmd
);
if
(
ret
<
0
)
if
(
ret
<
0
)
virStoragePoolObjClearVols
(
pool
);
virStoragePoolObjClearVols
(
pool
);
...
@@ -669,7 +669,7 @@ virStorageBackendLogicalDeletePool(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -669,7 +669,7 @@ virStorageBackendLogicalDeletePool(virConnectPtr conn ATTRIBUTE_UNUSED,
cmd
=
NULL
;
cmd
=
NULL
;
}
}
cleanup:
cleanup:
virCommandFree
(
cmd
);
virCommandFree
(
cmd
);
return
ret
;
return
ret
;
}
}
...
@@ -703,7 +703,7 @@ virStorageBackendLogicalDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -703,7 +703,7 @@ virStorageBackendLogicalDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED,
}
}
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
virCommandFree
(
lvchange_cmd
);
virCommandFree
(
lvchange_cmd
);
virCommandFree
(
lvremove_cmd
);
virCommandFree
(
lvremove_cmd
);
return
ret
;
return
ret
;
...
...
src/storage/storage_backend_mpath.c
浏览文件 @
3eda88e9
...
@@ -66,7 +66,7 @@ virStorageBackendMpathUpdateVolTargetInfo(virStorageVolTargetPtr target,
...
@@ -66,7 +66,7 @@ virStorageBackendMpathUpdateVolTargetInfo(virStorageVolTargetPtr target,
goto
out
;
goto
out
;
ret
=
0
;
ret
=
0
;
out:
out:
VIR_FORCE_CLOSE
(
fd
);
VIR_FORCE_CLOSE
(
fd
);
return
ret
;
return
ret
;
}
}
...
@@ -107,7 +107,7 @@ virStorageBackendMpathNewVol(virStoragePoolObjPtr pool,
...
@@ -107,7 +107,7 @@ virStorageBackendMpathNewVol(virStoragePoolObjPtr pool,
pool
->
def
->
allocation
+=
vol
->
allocation
;
pool
->
def
->
allocation
+=
vol
->
allocation
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
ret
!=
0
)
if
(
ret
!=
0
)
virStorageVolDefFree
(
vol
);
virStorageVolDefFree
(
vol
);
...
@@ -155,7 +155,7 @@ virStorageBackendIsMultipath(const char *dev_name)
...
@@ -155,7 +155,7 @@ virStorageBackendIsMultipath(const char *dev_name)
ret
=
1
;
ret
=
1
;
}
}
out:
out:
if
(
dmt
!=
NULL
)
{
if
(
dmt
!=
NULL
)
{
dm_task_destroy
(
dmt
);
dm_task_destroy
(
dmt
);
}
}
...
@@ -189,7 +189,7 @@ virStorageBackendGetMinorNumber(const char *dev_name, uint32_t *minor)
...
@@ -189,7 +189,7 @@ virStorageBackendGetMinorNumber(const char *dev_name, uint32_t *minor)
*
minor
=
info
.
minor
;
*
minor
=
info
.
minor
;
ret
=
0
;
ret
=
0
;
out:
out:
if
(
dmt
!=
NULL
)
if
(
dmt
!=
NULL
)
dm_task_destroy
(
dmt
);
dm_task_destroy
(
dmt
);
...
@@ -242,7 +242,7 @@ virStorageBackendCreateVols(virStoragePoolObjPtr pool,
...
@@ -242,7 +242,7 @@ virStorageBackendCreateVols(virStoragePoolObjPtr pool,
}
while
(
next
);
}
while
(
next
);
retval
=
0
;
retval
=
0
;
out:
out:
return
retval
;
return
retval
;
}
}
...
@@ -278,7 +278,7 @@ virStorageBackendGetMaps(virStoragePoolObjPtr pool)
...
@@ -278,7 +278,7 @@ virStorageBackendGetMaps(virStoragePoolObjPtr pool)
virStorageBackendCreateVols
(
pool
,
names
);
virStorageBackendCreateVols
(
pool
,
names
);
out:
out:
if
(
dmt
!=
NULL
)
{
if
(
dmt
!=
NULL
)
{
dm_task_destroy
(
dmt
);
dm_task_destroy
(
dmt
);
}
}
...
...
src/storage/storage_backend_rbd.c
浏览文件 @
3eda88e9
...
@@ -226,7 +226,7 @@ static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr,
...
@@ -226,7 +226,7 @@ static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
VIR_FREE
(
secret_value
);
VIR_FREE
(
secret_value
);
VIR_FREE
(
rados_key
);
VIR_FREE
(
rados_key
);
...
@@ -318,7 +318,7 @@ static int volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol,
...
@@ -318,7 +318,7 @@ static int volStorageBackendRBDRefreshVolInfo(virStorageVolDefPtr vol,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
rbd_close
(
image
);
rbd_close
(
image
);
return
ret
;
return
ret
;
}
}
...
@@ -414,7 +414,7 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn,
...
@@ -414,7 +414,7 @@ static int virStorageBackendRBDRefreshPool(virConnectPtr conn,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
VIR_FREE
(
names
);
VIR_FREE
(
names
);
virStorageBackendRBDCloseRADOSConn
(
&
ptr
);
virStorageBackendRBDCloseRADOSConn
(
&
ptr
);
return
ret
;
return
ret
;
...
@@ -454,7 +454,7 @@ static int virStorageBackendRBDDeleteVol(virConnectPtr conn,
...
@@ -454,7 +454,7 @@ static int virStorageBackendRBDDeleteVol(virConnectPtr conn,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
virStorageBackendRBDCloseRADOSConn
(
&
ptr
);
virStorageBackendRBDCloseRADOSConn
(
&
ptr
);
return
ret
;
return
ret
;
}
}
...
@@ -545,7 +545,7 @@ virStorageBackendRBDBuildVol(virConnectPtr conn,
...
@@ -545,7 +545,7 @@ virStorageBackendRBDBuildVol(virConnectPtr conn,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
virStorageBackendRBDCloseRADOSConn
(
&
ptr
);
virStorageBackendRBDCloseRADOSConn
(
&
ptr
);
return
ret
;
return
ret
;
}
}
...
@@ -573,7 +573,7 @@ static int virStorageBackendRBDRefreshVol(virConnectPtr conn,
...
@@ -573,7 +573,7 @@ static int virStorageBackendRBDRefreshVol(virConnectPtr conn,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
virStorageBackendRBDCloseRADOSConn
(
&
ptr
);
virStorageBackendRBDCloseRADOSConn
(
&
ptr
);
return
ret
;
return
ret
;
}
}
...
@@ -617,7 +617,7 @@ static int virStorageBackendRBDResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -617,7 +617,7 @@ static int virStorageBackendRBDResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
image
!=
NULL
)
if
(
image
!=
NULL
)
rbd_close
(
image
);
rbd_close
(
image
);
virStorageBackendRBDCloseRADOSConn
(
&
ptr
);
virStorageBackendRBDCloseRADOSConn
(
&
ptr
);
...
...
src/storage/storage_backend_scsi.c
浏览文件 @
3eda88e9
...
@@ -97,7 +97,7 @@ getDeviceType(uint32_t host,
...
@@ -97,7 +97,7 @@ getDeviceType(uint32_t host,
VIR_DEBUG
(
"Device type is %d"
,
*
type
);
VIR_DEBUG
(
"Device type is %d"
,
*
type
);
out:
out:
VIR_FREE
(
type_path
);
VIR_FREE
(
type_path
);
return
retval
;
return
retval
;
}
}
...
@@ -128,7 +128,7 @@ virStorageBackendSCSIUpdateVolTargetInfo(virStorageVolTargetPtr target,
...
@@ -128,7 +128,7 @@ virStorageBackendSCSIUpdateVolTargetInfo(virStorageVolTargetPtr target,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
VIR_FORCE_CLOSE
(
fd
);
VIR_FORCE_CLOSE
(
fd
);
return
ret
;
return
ret
;
...
@@ -164,7 +164,7 @@ virStorageBackendSCSISerial(const char *dev)
...
@@ -164,7 +164,7 @@ virStorageBackendSCSISerial(const char *dev)
}
}
#ifdef WITH_UDEV
#ifdef WITH_UDEV
cleanup:
cleanup:
virCommandFree
(
cmd
);
virCommandFree
(
cmd
);
#endif
#endif
...
@@ -258,9 +258,9 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr pool,
...
@@ -258,9 +258,9 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr pool,
goto
out
;
goto
out
;
free_vol:
free_vol:
virStorageVolDefFree
(
vol
);
virStorageVolDefFree
(
vol
);
out:
out:
VIR_FREE
(
devpath
);
VIR_FREE
(
devpath
);
return
retval
;
return
retval
;
}
}
...
@@ -309,7 +309,7 @@ getNewStyleBlockDevice(const char *lun_path,
...
@@ -309,7 +309,7 @@ getNewStyleBlockDevice(const char *lun_path,
closedir
(
block_dir
);
closedir
(
block_dir
);
out:
out:
VIR_FREE
(
block_path
);
VIR_FREE
(
block_path
);
return
retval
;
return
retval
;
}
}
...
@@ -341,7 +341,7 @@ getOldStyleBlockDevice(const char *lun_path ATTRIBUTE_UNUSED,
...
@@ -341,7 +341,7 @@ getOldStyleBlockDevice(const char *lun_path ATTRIBUTE_UNUSED,
VIR_DEBUG
(
"Block device is '%s'"
,
*
block_device
);
VIR_DEBUG
(
"Block device is '%s'"
,
*
block_device
);
}
}
out:
out:
return
retval
;
return
retval
;
}
}
...
@@ -388,7 +388,7 @@ getBlockDevice(uint32_t host,
...
@@ -388,7 +388,7 @@ getBlockDevice(uint32_t host,
closedir
(
lun_dir
);
closedir
(
lun_dir
);
out:
out:
VIR_FREE
(
lun_path
);
VIR_FREE
(
lun_path
);
return
retval
;
return
retval
;
}
}
...
@@ -448,7 +448,7 @@ processLU(virStoragePoolObjPtr pool,
...
@@ -448,7 +448,7 @@ processLU(virStoragePoolObjPtr pool,
VIR_FREE
(
type_path
);
VIR_FREE
(
type_path
);
out:
out:
VIR_FREE
(
block_device
);
VIR_FREE
(
block_device
);
return
retval
;
return
retval
;
}
}
...
@@ -537,9 +537,9 @@ virStorageBackendSCSITriggerRescan(uint32_t host)
...
@@ -537,9 +537,9 @@ virStorageBackendSCSITriggerRescan(uint32_t host)
}
}
VIR_FORCE_CLOSE
(
fd
);
VIR_FORCE_CLOSE
(
fd
);
free_path:
free_path:
VIR_FREE
(
path
);
VIR_FREE
(
path
);
out:
out:
VIR_DEBUG
(
"Rescan of host %d complete"
,
host
);
VIR_DEBUG
(
"Rescan of host %d complete"
,
host
);
return
retval
;
return
retval
;
}
}
...
@@ -663,7 +663,7 @@ deleteVport(virStoragePoolSourceAdapter adapter)
...
@@ -663,7 +663,7 @@ deleteVport(virStoragePoolSourceAdapter adapter)
goto
cleanup
;
goto
cleanup
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
VIR_FREE
(
name
);
VIR_FREE
(
name
);
return
ret
;
return
ret
;
}
}
...
@@ -704,7 +704,7 @@ virStorageBackendSCSICheckPool(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -704,7 +704,7 @@ virStorageBackendSCSICheckPool(virConnectPtr conn ATTRIBUTE_UNUSED,
*
isActive
=
virFileExists
(
path
);
*
isActive
=
virFileExists
(
path
);
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
VIR_FREE
(
path
);
VIR_FREE
(
path
);
VIR_FREE
(
name
);
VIR_FREE
(
name
);
return
ret
;
return
ret
;
...
@@ -734,7 +734,7 @@ virStorageBackendSCSIRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -734,7 +734,7 @@ virStorageBackendSCSIRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED,
virStorageBackendSCSIFindLUs
(
pool
,
host
);
virStorageBackendSCSIFindLUs
(
pool
,
host
);
ret
=
0
;
ret
=
0
;
out:
out:
VIR_FREE
(
name
);
VIR_FREE
(
name
);
return
ret
;
return
ret
;
}
}
...
...
src/storage/storage_backend_sheepdog.c
浏览文件 @
3eda88e9
...
@@ -135,7 +135,7 @@ virStorageBackendSheepdogAddVolume(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -135,7 +135,7 @@ virStorageBackendSheepdogAddVolume(virConnectPtr conn ATTRIBUTE_UNUSED,
return
0
;
return
0
;
error:
error:
virStorageVolDefFree
(
vol
);
virStorageVolDefFree
(
vol
);
return
-
1
;
return
-
1
;
}
}
...
@@ -178,7 +178,7 @@ virStorageBackendSheepdogRefreshAllVol(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -178,7 +178,7 @@ virStorageBackendSheepdogRefreshAllVol(virConnectPtr conn ATTRIBUTE_UNUSED,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
virCommandFree
(
cmd
);
virCommandFree
(
cmd
);
virStringFreeList
(
lines
);
virStringFreeList
(
lines
);
virStringFreeList
(
cells
);
virStringFreeList
(
cells
);
...
@@ -205,7 +205,7 @@ virStorageBackendSheepdogRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -205,7 +205,7 @@ virStorageBackendSheepdogRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED,
goto
cleanup
;
goto
cleanup
;
ret
=
virStorageBackendSheepdogRefreshAllVol
(
conn
,
pool
);
ret
=
virStorageBackendSheepdogRefreshAllVol
(
conn
,
pool
);
cleanup:
cleanup:
virCommandFree
(
cmd
);
virCommandFree
(
cmd
);
VIR_FREE
(
output
);
VIR_FREE
(
output
);
return
ret
;
return
ret
;
...
@@ -276,7 +276,7 @@ virStorageBackendSheepdogBuildVol(virConnectPtr conn,
...
@@ -276,7 +276,7 @@ virStorageBackendSheepdogBuildVol(virConnectPtr conn,
goto
cleanup
;
goto
cleanup
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
virCommandFree
(
cmd
);
virCommandFree
(
cmd
);
return
ret
;
return
ret
;
}
}
...
@@ -371,7 +371,7 @@ virStorageBackendSheepdogRefreshVol(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -371,7 +371,7 @@ virStorageBackendSheepdogRefreshVol(virConnectPtr conn ATTRIBUTE_UNUSED,
VIR_FREE
(
vol
->
target
.
path
);
VIR_FREE
(
vol
->
target
.
path
);
ignore_value
(
VIR_STRDUP
(
vol
->
target
.
path
,
vol
->
name
));
ignore_value
(
VIR_STRDUP
(
vol
->
target
.
path
,
vol
->
name
));
cleanup:
cleanup:
virCommandFree
(
cmd
);
virCommandFree
(
cmd
);
return
ret
;
return
ret
;
}
}
...
...
src/storage/storage_driver.c
浏览文件 @
3eda88e9
...
@@ -188,7 +188,7 @@ storageStateInitialize(bool privileged,
...
@@ -188,7 +188,7 @@ storageStateInitialize(bool privileged,
storageDriverUnlock
(
driverState
);
storageDriverUnlock
(
driverState
);
return
0
;
return
0
;
error:
error:
VIR_FREE
(
base
);
VIR_FREE
(
base
);
storageDriverUnlock
(
driverState
);
storageDriverUnlock
(
driverState
);
storageStateCleanup
();
storageStateCleanup
();
...
@@ -285,7 +285,7 @@ storagePoolLookupByUUID(virConnectPtr conn,
...
@@ -285,7 +285,7 @@ storagePoolLookupByUUID(virConnectPtr conn,
ret
=
virGetStoragePool
(
conn
,
pool
->
def
->
name
,
pool
->
def
->
uuid
,
ret
=
virGetStoragePool
(
conn
,
pool
->
def
->
name
,
pool
->
def
->
uuid
,
NULL
,
NULL
);
NULL
,
NULL
);
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
return
ret
;
return
ret
;
...
@@ -315,7 +315,7 @@ storagePoolLookupByName(virConnectPtr conn,
...
@@ -315,7 +315,7 @@ storagePoolLookupByName(virConnectPtr conn,
ret
=
virGetStoragePool
(
conn
,
pool
->
def
->
name
,
pool
->
def
->
uuid
,
ret
=
virGetStoragePool
(
conn
,
pool
->
def
->
name
,
pool
->
def
->
uuid
,
NULL
,
NULL
);
NULL
,
NULL
);
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
return
ret
;
return
ret
;
...
@@ -344,7 +344,7 @@ storagePoolLookupByVolume(virStorageVolPtr vol)
...
@@ -344,7 +344,7 @@ storagePoolLookupByVolume(virStorageVolPtr vol)
ret
=
virGetStoragePool
(
vol
->
conn
,
pool
->
def
->
name
,
pool
->
def
->
uuid
,
ret
=
virGetStoragePool
(
vol
->
conn
,
pool
->
def
->
name
,
pool
->
def
->
uuid
,
NULL
,
NULL
);
NULL
,
NULL
);
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
return
ret
;
return
ret
;
...
@@ -529,7 +529,7 @@ storageConnectFindStoragePoolSources(virConnectPtr conn,
...
@@ -529,7 +529,7 @@ storageConnectFindStoragePoolSources(virConnectPtr conn,
ret
=
backend
->
findPoolSources
(
conn
,
srcSpec
,
flags
);
ret
=
backend
->
findPoolSources
(
conn
,
srcSpec
,
flags
);
cleanup:
cleanup:
return
ret
;
return
ret
;
}
}
...
@@ -553,7 +553,7 @@ static int storagePoolIsActive(virStoragePoolPtr pool)
...
@@ -553,7 +553,7 @@ static int storagePoolIsActive(virStoragePoolPtr pool)
ret
=
virStoragePoolObjIsActive
(
obj
);
ret
=
virStoragePoolObjIsActive
(
obj
);
cleanup:
cleanup:
if
(
obj
)
if
(
obj
)
virStoragePoolObjUnlock
(
obj
);
virStoragePoolObjUnlock
(
obj
);
return
ret
;
return
ret
;
...
@@ -578,7 +578,7 @@ static int storagePoolIsPersistent(virStoragePoolPtr pool)
...
@@ -578,7 +578,7 @@ static int storagePoolIsPersistent(virStoragePoolPtr pool)
ret
=
obj
->
configFile
?
1
:
0
;
ret
=
obj
->
configFile
?
1
:
0
;
cleanup:
cleanup:
if
(
obj
)
if
(
obj
)
virStoragePoolObjUnlock
(
obj
);
virStoragePoolObjUnlock
(
obj
);
return
ret
;
return
ret
;
...
@@ -638,7 +638,7 @@ storagePoolCreateXML(virConnectPtr conn,
...
@@ -638,7 +638,7 @@ storagePoolCreateXML(virConnectPtr conn,
ret
=
virGetStoragePool
(
conn
,
pool
->
def
->
name
,
pool
->
def
->
uuid
,
ret
=
virGetStoragePool
(
conn
,
pool
->
def
->
name
,
pool
->
def
->
uuid
,
NULL
,
NULL
);
NULL
,
NULL
);
cleanup:
cleanup:
virStoragePoolDefFree
(
def
);
virStoragePoolDefFree
(
def
);
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
...
@@ -688,7 +688,7 @@ storagePoolDefineXML(virConnectPtr conn,
...
@@ -688,7 +688,7 @@ storagePoolDefineXML(virConnectPtr conn,
ret
=
virGetStoragePool
(
conn
,
pool
->
def
->
name
,
pool
->
def
->
uuid
,
ret
=
virGetStoragePool
(
conn
,
pool
->
def
->
name
,
pool
->
def
->
uuid
,
NULL
,
NULL
);
NULL
,
NULL
);
cleanup:
cleanup:
virStoragePoolDefFree
(
def
);
virStoragePoolDefFree
(
def
);
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
...
@@ -745,7 +745,7 @@ storagePoolUndefine(virStoragePoolPtr obj)
...
@@ -745,7 +745,7 @@ storagePoolUndefine(virStoragePoolPtr obj)
pool
=
NULL
;
pool
=
NULL
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
storageDriverUnlock
(
driver
);
storageDriverUnlock
(
driver
);
...
@@ -799,7 +799,7 @@ storagePoolCreate(virStoragePoolPtr obj,
...
@@ -799,7 +799,7 @@ storagePoolCreate(virStoragePoolPtr obj,
pool
->
active
=
1
;
pool
->
active
=
1
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
return
ret
;
return
ret
;
...
@@ -842,7 +842,7 @@ storagePoolBuild(virStoragePoolPtr obj,
...
@@ -842,7 +842,7 @@ storagePoolBuild(virStoragePoolPtr obj,
goto
cleanup
;
goto
cleanup
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
return
ret
;
return
ret
;
...
@@ -904,7 +904,7 @@ storagePoolDestroy(virStoragePoolPtr obj)
...
@@ -904,7 +904,7 @@ storagePoolDestroy(virStoragePoolPtr obj)
}
}
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
storageDriverUnlock
(
driver
);
storageDriverUnlock
(
driver
);
...
@@ -960,7 +960,7 @@ storagePoolDelete(virStoragePoolPtr obj,
...
@@ -960,7 +960,7 @@ storagePoolDelete(virStoragePoolPtr obj,
VIR_INFO
(
"Deleting storage pool '%s'"
,
pool
->
def
->
name
);
VIR_INFO
(
"Deleting storage pool '%s'"
,
pool
->
def
->
name
);
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
return
ret
;
return
ret
;
...
@@ -1021,7 +1021,7 @@ storagePoolRefresh(virStoragePoolPtr obj,
...
@@ -1021,7 +1021,7 @@ storagePoolRefresh(virStoragePoolPtr obj,
}
}
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
storageDriverUnlock
(
driver
);
storageDriverUnlock
(
driver
);
...
@@ -1063,7 +1063,7 @@ storagePoolGetInfo(virStoragePoolPtr obj,
...
@@ -1063,7 +1063,7 @@ storagePoolGetInfo(virStoragePoolPtr obj,
info
->
available
=
pool
->
def
->
available
;
info
->
available
=
pool
->
def
->
available
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
return
ret
;
return
ret
;
...
@@ -1100,7 +1100,7 @@ storagePoolGetXMLDesc(virStoragePoolPtr obj,
...
@@ -1100,7 +1100,7 @@ storagePoolGetXMLDesc(virStoragePoolPtr obj,
ret
=
virStoragePoolDefFormat
(
def
);
ret
=
virStoragePoolDefFormat
(
def
);
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
return
ret
;
return
ret
;
...
@@ -1134,7 +1134,7 @@ storagePoolGetAutostart(virStoragePoolPtr obj,
...
@@ -1134,7 +1134,7 @@ storagePoolGetAutostart(virStoragePoolPtr obj,
}
}
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
return
ret
;
return
ret
;
...
@@ -1196,7 +1196,7 @@ storagePoolSetAutostart(virStoragePoolPtr obj,
...
@@ -1196,7 +1196,7 @@ storagePoolSetAutostart(virStoragePoolPtr obj,
}
}
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
storageDriverUnlock
(
driver
);
storageDriverUnlock
(
driver
);
...
@@ -1237,7 +1237,7 @@ storagePoolNumOfVolumes(virStoragePoolPtr obj)
...
@@ -1237,7 +1237,7 @@ storagePoolNumOfVolumes(virStoragePoolPtr obj)
ret
++
;
ret
++
;
}
}
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
return
ret
;
return
ret
;
...
@@ -1410,7 +1410,7 @@ storageVolLookupByName(virStoragePoolPtr obj,
...
@@ -1410,7 +1410,7 @@ storageVolLookupByName(virStoragePoolPtr obj,
ret
=
virGetStorageVol
(
obj
->
conn
,
pool
->
def
->
name
,
vol
->
name
,
vol
->
key
,
ret
=
virGetStorageVol
(
obj
->
conn
,
pool
->
def
->
name
,
vol
->
name
,
vol
->
key
,
NULL
,
NULL
);
NULL
,
NULL
);
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
return
ret
;
return
ret
;
...
@@ -1452,7 +1452,7 @@ storageVolLookupByKey(virConnectPtr conn,
...
@@ -1452,7 +1452,7 @@ storageVolLookupByKey(virConnectPtr conn,
virReportError
(
VIR_ERR_NO_STORAGE_VOL
,
virReportError
(
VIR_ERR_NO_STORAGE_VOL
,
_
(
"no storage vol with matching key %s"
),
key
);
_
(
"no storage vol with matching key %s"
),
key
);
cleanup:
cleanup:
storageDriverUnlock
(
driver
);
storageDriverUnlock
(
driver
);
return
ret
;
return
ret
;
}
}
...
@@ -1545,7 +1545,7 @@ storageVolLookupByPath(virConnectPtr conn,
...
@@ -1545,7 +1545,7 @@ storageVolLookupByPath(virConnectPtr conn,
}
}
}
}
cleanup:
cleanup:
VIR_FREE
(
cleanpath
);
VIR_FREE
(
cleanpath
);
storageDriverUnlock
(
driver
);
storageDriverUnlock
(
driver
);
return
ret
;
return
ret
;
...
@@ -1628,7 +1628,7 @@ storageVolDelete(virStorageVolPtr obj,
...
@@ -1628,7 +1628,7 @@ storageVolDelete(virStorageVolPtr obj,
}
}
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
return
ret
;
return
ret
;
...
@@ -1756,7 +1756,7 @@ storageVolCreateXML(virStoragePoolPtr obj,
...
@@ -1756,7 +1756,7 @@ storageVolCreateXML(virStoragePoolPtr obj,
volobj
=
NULL
;
volobj
=
NULL
;
voldef
=
NULL
;
voldef
=
NULL
;
cleanup:
cleanup:
virObjectUnref
(
volobj
);
virObjectUnref
(
volobj
);
virStorageVolDefFree
(
voldef
);
virStorageVolDefFree
(
voldef
);
VIR_FREE
(
buildvoldef
);
VIR_FREE
(
buildvoldef
);
...
@@ -1933,7 +1933,7 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj,
...
@@ -1933,7 +1933,7 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj,
ret
=
volobj
;
ret
=
volobj
;
volobj
=
NULL
;
volobj
=
NULL
;
cleanup:
cleanup:
virObjectUnref
(
volobj
);
virObjectUnref
(
volobj
);
virStorageVolDefFree
(
newvol
);
virStorageVolDefFree
(
newvol
);
if
(
pool
)
if
(
pool
)
...
@@ -2002,7 +2002,7 @@ storageVolDownload(virStorageVolPtr obj,
...
@@ -2002,7 +2002,7 @@ storageVolDownload(virStorageVolPtr obj,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
...
@@ -2089,7 +2089,7 @@ storageVolUpload(virStorageVolPtr obj,
...
@@ -2089,7 +2089,7 @@ storageVolUpload(virStorageVolPtr obj,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
...
@@ -2199,7 +2199,7 @@ storageVolResize(virStorageVolPtr obj,
...
@@ -2199,7 +2199,7 @@ storageVolResize(virStorageVolPtr obj,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
...
@@ -2303,7 +2303,7 @@ storageWipeExtent(virStorageVolDefPtr vol,
...
@@ -2303,7 +2303,7 @@ storageWipeExtent(virStorageVolDefPtr vol,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
return
ret
;
return
ret
;
}
}
...
@@ -2395,7 +2395,7 @@ storageVolWipeInternal(virStorageVolDefPtr def,
...
@@ -2395,7 +2395,7 @@ storageVolWipeInternal(virStorageVolDefPtr def,
}
}
}
}
cleanup:
cleanup:
virCommandFree
(
cmd
);
virCommandFree
(
cmd
);
VIR_FREE
(
writebuf
);
VIR_FREE
(
writebuf
);
VIR_FORCE_CLOSE
(
fd
);
VIR_FORCE_CLOSE
(
fd
);
...
@@ -2464,7 +2464,7 @@ storageVolWipePattern(virStorageVolPtr obj,
...
@@ -2464,7 +2464,7 @@ storageVolWipePattern(virStorageVolPtr obj,
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
pool
)
{
if
(
pool
)
{
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
}
}
...
@@ -2533,7 +2533,7 @@ storageVolGetInfo(virStorageVolPtr obj,
...
@@ -2533,7 +2533,7 @@ storageVolGetInfo(virStorageVolPtr obj,
info
->
allocation
=
vol
->
allocation
;
info
->
allocation
=
vol
->
allocation
;
ret
=
0
;
ret
=
0
;
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
return
ret
;
return
ret
;
...
@@ -2589,7 +2589,7 @@ storageVolGetXMLDesc(virStorageVolPtr obj,
...
@@ -2589,7 +2589,7 @@ storageVolGetXMLDesc(virStorageVolPtr obj,
ret
=
virStorageVolDefFormat
(
pool
->
def
,
vol
);
ret
=
virStorageVolDefFormat
(
pool
->
def
,
vol
);
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
...
@@ -2634,7 +2634,7 @@ storageVolGetPath(virStorageVolPtr obj)
...
@@ -2634,7 +2634,7 @@ storageVolGetPath(virStorageVolPtr obj)
ignore_value
(
VIR_STRDUP
(
ret
,
vol
->
target
.
path
));
ignore_value
(
VIR_STRDUP
(
ret
,
vol
->
target
.
path
));
cleanup:
cleanup:
if
(
pool
)
if
(
pool
)
virStoragePoolObjUnlock
(
pool
);
virStoragePoolObjUnlock
(
pool
);
return
ret
;
return
ret
;
...
@@ -2658,7 +2658,7 @@ storageConnectListAllStoragePools(virConnectPtr conn,
...
@@ -2658,7 +2658,7 @@ storageConnectListAllStoragePools(virConnectPtr conn,
virConnectListAllStoragePoolsCheckACL
,
flags
);
virConnectListAllStoragePoolsCheckACL
,
flags
);
storageDriverUnlock
(
driver
);
storageDriverUnlock
(
driver
);
cleanup:
cleanup:
return
ret
;
return
ret
;
}
}
...
@@ -2779,7 +2779,7 @@ virStorageFileInitInternal(int type,
...
@@ -2779,7 +2779,7 @@ virStorageFileInitInternal(int type,
return
file
;
return
file
;
error:
error:
VIR_FREE
(
file
->
path
);
VIR_FREE
(
file
->
path
);
virDomainDiskHostDefFree
(
file
->
nhosts
,
file
->
hosts
);
virDomainDiskHostDefFree
(
file
->
nhosts
,
file
->
hosts
);
VIR_FREE
(
file
);
VIR_FREE
(
file
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录