Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
a8fca0da
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,发现更多精彩内容 >>
提交
a8fca0da
编写于
1月 16, 2013
作者:
J
Jiri Denemark
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
virsh: Use virTypedParams* APIs in blkdeviotune
上级
54dd75fd
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
45 addition
and
89 deletion
+45
-89
tools/virsh-domain.c
tools/virsh-domain.c
+45
-89
未找到文件。
tools/virsh-domain.c
浏览文件 @
a8fca0da
...
...
@@ -1043,9 +1043,9 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd)
{
virDomainPtr
dom
=
NULL
;
const
char
*
name
,
*
disk
;
unsigned
long
long
total_bytes_sec
=
0
,
read_bytes_sec
=
0
,
write_bytes_sec
=
0
;
unsigned
long
long
total_iops_sec
=
0
,
read_iops_sec
=
0
,
write_iops_sec
=
0
;
unsigned
long
long
value
;
int
nparams
=
0
;
int
maxparams
=
0
;
virTypedParameterPtr
params
=
NULL
;
unsigned
int
flags
=
0
,
i
=
0
;
int
rv
=
0
;
...
...
@@ -1073,62 +1073,61 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd)
if
(
vshCommandOptString
(
cmd
,
"device"
,
&
disk
)
<
0
)
goto
cleanup
;
if
((
rv
=
vshCommandOptULongLong
(
cmd
,
"total-bytes-sec"
,
&
total_bytes_sec
))
<
0
)
{
vshError
(
ctl
,
"%s"
,
_
(
"Unable to parse integer parameter"
));
goto
cleanup
;
if
((
rv
=
vshCommandOptULongLong
(
cmd
,
"total-bytes-sec"
,
&
value
))
<
0
)
{
goto
interror
;
}
else
if
(
rv
>
0
)
{
nparams
++
;
if
(
virTypedParamsAddULLong
(
&
params
,
&
nparams
,
&
maxparams
,
VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC
,
value
)
<
0
)
goto
save_error
;
}
if
((
rv
=
vshCommandOptULongLong
(
cmd
,
"read-bytes-sec"
,
&
read_bytes_sec
))
<
0
)
{
vshError
(
ctl
,
"%s"
,
_
(
"Unable to parse integer parameter"
));
goto
cleanup
;
if
((
rv
=
vshCommandOptULongLong
(
cmd
,
"read-bytes-sec"
,
&
value
))
<
0
)
{
goto
interror
;
}
else
if
(
rv
>
0
)
{
nparams
++
;
if
(
virTypedParamsAddULLong
(
&
params
,
&
nparams
,
&
maxparams
,
VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC
,
value
)
<
0
)
goto
save_error
;
}
if
((
rv
=
vshCommandOptULongLong
(
cmd
,
"write-bytes-sec"
,
&
write_bytes_sec
))
<
0
)
{
vshError
(
ctl
,
"%s"
,
_
(
"Unable to parse integer parameter"
));
goto
cleanup
;
if
((
rv
=
vshCommandOptULongLong
(
cmd
,
"write-bytes-sec"
,
&
value
))
<
0
)
{
goto
interror
;
}
else
if
(
rv
>
0
)
{
nparams
++
;
if
(
virTypedParamsAddULLong
(
&
params
,
&
nparams
,
&
maxparams
,
VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC
,
value
)
<
0
)
goto
save_error
;
}
if
((
rv
=
vshCommandOptULongLong
(
cmd
,
"total-iops-sec"
,
&
total_iops_sec
))
<
0
)
{
vshError
(
ctl
,
"%s"
,
_
(
"Unable to parse integer parameter"
));
goto
cleanup
;
if
((
rv
=
vshCommandOptULongLong
(
cmd
,
"total-iops-sec"
,
&
value
))
<
0
)
{
goto
interror
;
}
else
if
(
rv
>
0
)
{
nparams
++
;
if
(
virTypedParamsAddULLong
(
&
params
,
&
nparams
,
&
maxparams
,
VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC
,
value
)
<
0
)
goto
save_error
;
}
if
((
rv
=
vshCommandOptULongLong
(
cmd
,
"read-iops-sec"
,
&
read_iops_sec
))
<
0
)
{
vshError
(
ctl
,
"%s"
,
_
(
"Unable to parse integer parameter"
));
goto
cleanup
;
if
((
rv
=
vshCommandOptULongLong
(
cmd
,
"read-iops-sec"
,
&
value
))
<
0
)
{
goto
interror
;
}
else
if
(
rv
>
0
)
{
nparams
++
;
if
(
virTypedParamsAddULLong
(
&
params
,
&
nparams
,
&
maxparams
,
VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC
,
value
)
<
0
)
goto
save_error
;
}
if
((
rv
=
vshCommandOptULongLong
(
cmd
,
"write-iops-sec"
,
&
write_iops_sec
))
<
0
)
{
vshError
(
ctl
,
"%s"
,
_
(
"Unable to parse integer parameter"
));
goto
cleanup
;
if
((
rv
=
vshCommandOptULongLong
(
cmd
,
"write-iops-sec"
,
&
value
))
<
0
)
{
goto
interror
;
}
else
if
(
rv
>
0
)
{
nparams
++
;
if
(
virTypedParamsAddULLong
(
&
params
,
&
nparams
,
&
maxparams
,
VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC
,
value
)
<
0
)
goto
save_error
;
}
if
(
nparams
==
0
)
{
if
(
virDomainGetBlockIoTune
(
dom
,
NULL
,
NULL
,
&
nparams
,
flags
)
!=
0
)
{
vshError
(
ctl
,
"%s"
,
_
(
"Unable to get number of block I/O throttle parameters"
));
...
...
@@ -1153,56 +1152,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd)
vshPrint
(
ctl
,
"%-15s: %s
\n
"
,
params
[
i
].
field
,
str
);
VIR_FREE
(
str
);
}
ret
=
true
;
goto
cleanup
;
}
else
{
/* Set the block I/O throttle, match by opt since parameters can be 0 */
params
=
vshCalloc
(
ctl
,
nparams
,
sizeof
(
*
params
));
i
=
0
;
if
(
i
<
nparams
&&
vshCommandOptBool
(
cmd
,
"total-bytes-sec"
)
&&
virTypedParameterAssign
(
&
params
[
i
++
],
VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_BYTES_SEC
,
VIR_TYPED_PARAM_ULLONG
,
total_bytes_sec
)
<
0
)
goto
error
;
if
(
i
<
nparams
&&
vshCommandOptBool
(
cmd
,
"read-bytes-sec"
)
&&
virTypedParameterAssign
(
&
params
[
i
++
],
VIR_DOMAIN_BLOCK_IOTUNE_READ_BYTES_SEC
,
VIR_TYPED_PARAM_ULLONG
,
read_bytes_sec
)
<
0
)
goto
error
;
if
(
i
<
nparams
&&
vshCommandOptBool
(
cmd
,
"write-bytes-sec"
)
&&
virTypedParameterAssign
(
&
params
[
i
++
],
VIR_DOMAIN_BLOCK_IOTUNE_WRITE_BYTES_SEC
,
VIR_TYPED_PARAM_ULLONG
,
write_bytes_sec
)
<
0
)
goto
error
;
if
(
i
<
nparams
&&
vshCommandOptBool
(
cmd
,
"total-iops-sec"
)
&&
virTypedParameterAssign
(
&
params
[
i
++
],
VIR_DOMAIN_BLOCK_IOTUNE_TOTAL_IOPS_SEC
,
VIR_TYPED_PARAM_ULLONG
,
total_iops_sec
)
<
0
)
goto
error
;
if
(
i
<
nparams
&&
vshCommandOptBool
(
cmd
,
"read-iops-sec"
)
&&
virTypedParameterAssign
(
&
params
[
i
++
],
VIR_DOMAIN_BLOCK_IOTUNE_READ_IOPS_SEC
,
VIR_TYPED_PARAM_ULLONG
,
read_iops_sec
)
<
0
)
goto
error
;
if
(
i
<
nparams
&&
vshCommandOptBool
(
cmd
,
"write-iops-sec"
)
&&
virTypedParameterAssign
(
&
params
[
i
++
],
VIR_DOMAIN_BLOCK_IOTUNE_WRITE_IOPS_SEC
,
VIR_TYPED_PARAM_ULLONG
,
write_iops_sec
)
<
0
)
goto
error
;
if
(
virDomainSetBlockIoTune
(
dom
,
disk
,
params
,
nparams
,
flags
)
<
0
)
goto
error
;
}
...
...
@@ -1210,13 +1160,19 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd)
ret
=
true
;
cleanup:
VIR_FREE
(
params
);
virTypedParamsFree
(
params
,
n
params
);
virDomainFree
(
dom
);
return
ret
;
save_error:
vshSaveLibvirtError
();
error:
vshError
(
ctl
,
"%s"
,
_
(
"Unable to change block I/O throttle"
));
goto
cleanup
;
interror:
vshError
(
ctl
,
"%s"
,
_
(
"Unable to parse integer parameter"
));
goto
cleanup
;
}
/*
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录