Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
2bbb66c4
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看板
提交
2bbb66c4
编写于
7月 26, 2017
作者:
J
John Ferlan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
storage: Use virStoragePoolObjGetDef accessor for Sheepdog backend
In preparation for privatizing the object, use the accessor.
上级
7920d97a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
14 addition
and
9 deletion
+14
-9
src/storage/storage_backend_sheepdog.c
src/storage/storage_backend_sheepdog.c
+14
-9
未找到文件。
src/storage/storage_backend_sheepdog.c
浏览文件 @
2bbb66c4
...
@@ -96,13 +96,14 @@ void
...
@@ -96,13 +96,14 @@ void
virStorageBackendSheepdogAddHostArg
(
virCommandPtr
cmd
,
virStorageBackendSheepdogAddHostArg
(
virCommandPtr
cmd
,
virStoragePoolObjPtr
pool
)
virStoragePoolObjPtr
pool
)
{
{
virStoragePoolDefPtr
def
=
virStoragePoolObjGetDef
(
pool
);
const
char
*
address
=
"localhost"
;
const
char
*
address
=
"localhost"
;
int
port
=
7000
;
int
port
=
7000
;
if
(
pool
->
def
->
source
.
nhost
>
0
)
{
if
(
def
->
source
.
nhost
>
0
)
{
if
(
pool
->
def
->
source
.
hosts
[
0
].
name
!=
NULL
)
if
(
def
->
source
.
hosts
[
0
].
name
!=
NULL
)
address
=
pool
->
def
->
source
.
hosts
[
0
].
name
;
address
=
def
->
source
.
hosts
[
0
].
name
;
if
(
pool
->
def
->
source
.
hosts
[
0
].
port
)
if
(
def
->
source
.
hosts
[
0
].
port
)
port
=
pool
->
def
->
source
.
hosts
[
0
].
port
;
port
=
def
->
source
.
hosts
[
0
].
port
;
}
}
virCommandAddArg
(
cmd
,
"-a"
);
virCommandAddArg
(
cmd
,
"-a"
);
virCommandAddArgFormat
(
cmd
,
"%s"
,
address
);
virCommandAddArgFormat
(
cmd
,
"%s"
,
address
);
...
@@ -202,7 +203,8 @@ virStorageBackendSheepdogRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -202,7 +203,8 @@ virStorageBackendSheepdogRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED,
if
(
virCommandRun
(
cmd
,
NULL
)
<
0
)
if
(
virCommandRun
(
cmd
,
NULL
)
<
0
)
goto
cleanup
;
goto
cleanup
;
if
(
virStorageBackendSheepdogParseNodeInfo
(
pool
->
def
,
output
)
<
0
)
if
(
virStorageBackendSheepdogParseNodeInfo
(
virStoragePoolObjGetDef
(
pool
),
output
)
<
0
)
goto
cleanup
;
goto
cleanup
;
ret
=
virStorageBackendSheepdogRefreshAllVol
(
conn
,
pool
);
ret
=
virStorageBackendSheepdogRefreshAllVol
(
conn
,
pool
);
...
@@ -236,6 +238,8 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -236,6 +238,8 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED,
virStoragePoolObjPtr
pool
,
virStoragePoolObjPtr
pool
,
virStorageVolDefPtr
vol
)
virStorageVolDefPtr
vol
)
{
{
virStoragePoolDefPtr
def
=
virStoragePoolObjGetDef
(
pool
);
if
(
vol
->
target
.
encryption
!=
NULL
)
{
if
(
vol
->
target
.
encryption
!=
NULL
)
{
virReportError
(
VIR_ERR_CONFIG_UNSUPPORTED
,
virReportError
(
VIR_ERR_CONFIG_UNSUPPORTED
,
"%s"
,
_
(
"storage pool does not support encrypted "
"%s"
,
_
(
"storage pool does not support encrypted "
...
@@ -247,7 +251,7 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -247,7 +251,7 @@ virStorageBackendSheepdogCreateVol(virConnectPtr conn ATTRIBUTE_UNUSED,
VIR_FREE
(
vol
->
key
);
VIR_FREE
(
vol
->
key
);
if
(
virAsprintf
(
&
vol
->
key
,
"%s/%s"
,
if
(
virAsprintf
(
&
vol
->
key
,
"%s/%s"
,
pool
->
def
->
source
.
name
,
vol
->
name
)
<
0
)
def
->
source
.
name
,
vol
->
name
)
<
0
)
return
-
1
;
return
-
1
;
VIR_FREE
(
vol
->
target
.
path
);
VIR_FREE
(
vol
->
target
.
path
);
...
@@ -356,8 +360,9 @@ virStorageBackendSheepdogRefreshVol(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -356,8 +360,9 @@ virStorageBackendSheepdogRefreshVol(virConnectPtr conn ATTRIBUTE_UNUSED,
{
{
int
ret
;
int
ret
;
char
*
output
=
NULL
;
char
*
output
=
NULL
;
virStoragePoolDefPtr
def
=
virStoragePoolObjGetDef
(
pool
);
virCommandPtr
cmd
=
virCommandNewArgList
(
SHEEPDOGCLI
,
"vdi"
,
"list"
,
vol
->
name
,
"-r"
,
NULL
);
virCommandPtr
cmd
=
virCommandNewArgList
(
SHEEPDOGCLI
,
"vdi"
,
"list"
,
vol
->
name
,
"-r"
,
NULL
);
virStorageBackendSheepdogAddHostArg
(
cmd
,
pool
);
virStorageBackendSheepdogAddHostArg
(
cmd
,
pool
);
virCommandSetOutputBuffer
(
cmd
,
&
output
);
virCommandSetOutputBuffer
(
cmd
,
&
output
);
ret
=
virCommandRun
(
cmd
,
NULL
);
ret
=
virCommandRun
(
cmd
,
NULL
);
...
@@ -372,7 +377,7 @@ virStorageBackendSheepdogRefreshVol(virConnectPtr conn ATTRIBUTE_UNUSED,
...
@@ -372,7 +377,7 @@ virStorageBackendSheepdogRefreshVol(virConnectPtr conn ATTRIBUTE_UNUSED,
VIR_FREE
(
vol
->
key
);
VIR_FREE
(
vol
->
key
);
if
(
virAsprintf
(
&
vol
->
key
,
"%s/%s"
,
if
(
virAsprintf
(
&
vol
->
key
,
"%s/%s"
,
pool
->
def
->
source
.
name
,
vol
->
name
)
<
0
)
def
->
source
.
name
,
vol
->
name
)
<
0
)
goto
cleanup
;
goto
cleanup
;
VIR_FREE
(
vol
->
target
.
path
);
VIR_FREE
(
vol
->
target
.
path
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录